Merge pull request #8191 from onflow/bastian/cadence-vm-merge-master

[Cadence VM] Update feature branch

Author: j1010001

.github/workflows/ci.yml

@@ -62,8 +62,6 @@ jobs:
         uses: golangci/golangci-lint-action@v6
         continue-on-error: true # after installation (what we care about), this step will fail - this line allows workflow to continue
         with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.63
           args: "--no-config --disable-all" # set args so that no linters are actually run
       - name: Build custom linter binary
         if: steps.cache-linter.outputs.cache-hit != 'true'

.mockery.yaml

@@ -22,6 +22,7 @@ packages:
     config:
       dir: "consensus/hotstuff/mocks"
       outpkg: "mocks"
+  github.com/onflow/flow-go/engine/access/ingestion/collections:
   github.com/onflow/flow-go/engine/access/ingestion/tx_error_messages:
   github.com/onflow/flow-go/engine/access/rest/common/models:
   github.com/onflow/flow-go/engine/access/rest/websockets:
@@ -31,7 +32,6 @@ packages:
   github.com/onflow/flow-go/engine/access/rpc/backend/node_communicator:
   github.com/onflow/flow-go/engine/access/rpc/backend/transactions/error_messages:
   github.com/onflow/flow-go/engine/access/rpc/backend/transactions/provider:
-  github.com/onflow/flow-go/engine/access/rpc/backend/transactions/retrier:
   github.com/onflow/flow-go/engine/access/rpc/connection:
   github.com/onflow/flow-go/engine/access/state_stream:
   github.com/onflow/flow-go/engine/access/subscription:

access/api.go

@@ -59,6 +59,9 @@ type TransactionsAPI interface {
 
 	GetSystemTransaction(ctx context.Context, txID flow.Identifier, blockID flow.Identifier) (*flow.TransactionBody, error)
 	GetSystemTransactionResult(ctx context.Context, txID flow.Identifier, blockID flow.Identifier, encodingVersion entities.EventEncodingVersion) (*accessmodel.TransactionResult, error)
+
+	GetScheduledTransaction(ctx context.Context, scheduledTxID uint64) (*flow.TransactionBody, error)
+	GetScheduledTransactionResult(ctx context.Context, scheduledTxID uint64, encodingVersion entities.EventEncodingVersion) (*accessmodel.TransactionResult, error)
 }
 
 type TransactionStreamAPI interface {