expose query executor and remove default config

cmd/execution_builder.go

@@ -47,7 +47,6 @@ import (
 	"github.com/onflow/flow-go/engine/execution/checker"
 	"github.com/onflow/flow-go/engine/execution/computation"
 	"github.com/onflow/flow-go/engine/execution/computation/committer"
-	"github.com/onflow/flow-go/engine/execution/computation/query"
 	"github.com/onflow/flow-go/engine/execution/ingestion"
 	"github.com/onflow/flow-go/engine/execution/ingestion/stop"
 	"github.com/onflow/flow-go/engine/execution/ingestion/uploader"
@@ -57,7 +56,6 @@ import (
 	"github.com/onflow/flow-go/engine/execution/state"
 	"github.com/onflow/flow-go/engine/execution/state/bootstrap"
 	"github.com/onflow/flow-go/fvm"
-	"github.com/onflow/flow-go/fvm/storage/derived"
 	"github.com/onflow/flow-go/fvm/storage/snapshot"
 	"github.com/onflow/flow-go/fvm/systemcontracts"
 	"github.com/onflow/flow-go/ledger/common/pathfinder"
@@ -903,30 +901,11 @@ func (exeNode *ExecutionNode) LoadIngestionEngine(
 
 // create scripts engine for handling script execution
 func (exeNode *ExecutionNode) LoadScriptsEngine(node *NodeConfig) (module.ReadyDoneAware, error) {
-	// for RPC to load it
-	vm := fvm.NewVirtualMachine()
-
-	options := computation.DefaultFVMOptions(node.RootChainID, false, false)
-	vmCtx := fvm.NewContext(options...)
-
-	derivedChainData, err := derived.NewDerivedChainData(derived.DefaultDerivedDataCacheSize)
-	if err != nil {
-		return nil, err
-	}
-
-	queryExecutor := query.NewQueryExecutor(
-		exeNode.exeConf.computationConfig.QueryConfig,
-		node.Logger,
-		metrics.NewExecutionCollector(node.Tracer),
-		vm,
-		vmCtx,
-		derivedChainData,
-	)
 
 	exeNode.scriptsEng = scripts.New(
 		node.Logger,
 		node.State,
-		queryExecutor,
+		exeNode.computationManager.QueryExecutor(),
 		exeNode.executionState,
 	)
 

engine/execution/computation/manager.go

@@ -106,7 +106,25 @@ func New(
 	}
 
 	chainID := vmCtx.Chain.ChainID()
-	options := DefaultFVMOptions(chainID, params.CadenceTracing, params.ExtensiveTracing)
+	options := []fvm.Option{
+		fvm.WithReusableCadenceRuntimePool(
+			reusableRuntime.NewReusableCadenceRuntimePool(
+				ReusableCadenceRuntimePoolSize,
+				runtime.Config{
+					TracingEnabled:        params.CadenceTracing,
+					AccountLinkingEnabled: true,
+					// Attachments are enabled everywhere except for Mainnet
+					AttachmentsEnabled: chainID != flow.Mainnet,
+					// Capability Controllers are enabled everywhere except for Mainnet
+					CapabilityControllersEnabled: chainID != flow.Mainnet,
+				},
+			)),
+	}
+
+	if params.ExtensiveTracing {
+		options = append(options, fvm.WithExtensiveTracing())
+	}
+
 	vmCtx = fvm.NewContextFromParent(vmCtx, options...)
 
 	blockComputer, err := computer.NewBlockComputer(
@@ -222,25 +240,6 @@ func (e *Manager) GetAccount(
 		snapshot)
 }
 
-func DefaultFVMOptions(chainID flow.ChainID, cadenceTracing bool, extensiveTracing bool) []fvm.Option {
-	options := []fvm.Option{
-		fvm.WithReusableCadenceRuntimePool(
-			reusableRuntime.NewReusableCadenceRuntimePool(
-				ReusableCadenceRuntimePoolSize,
-				runtime.Config{
-					TracingEnabled:        cadenceTracing,
-					AccountLinkingEnabled: true,
-					// Attachments are enabled everywhere except for Mainnet
-					AttachmentsEnabled: chainID != flow.Mainnet,
-					// Capability Controllers are enabled everywhere except for Mainnet
-					CapabilityControllersEnabled: chainID != flow.Mainnet,
-				},
-			)),
-	}
-
-	if extensiveTracing {
-		options = append(options, fvm.WithExtensiveTracing())
-	}
-
-	return options
+func (e *Manager) QueryExecutor() query.Executor {
+	return e.queryExecutor
 }