Merge #4130

4130: Clean up script query executor delta usage r=pattyshack a=pattyshack



Co-authored-by: Patrick Lee <[email protected]>

Author: bors[bot]

engine/execution/computation/manager_test.go

@@ -551,7 +551,9 @@ func (l *LongRunningVM) RunV2(
 	time.Sleep(l.duration)
 
 	snapshot := &state.ExecutionSnapshot{}
-	output := fvm.ProcedureOutput{}
+	output := fvm.ProcedureOutput{
+		Value: cadence.NewVoid(),
+	}
 	return snapshot, output, nil
 }
 

engine/execution/computation/query/executor.go

@@ -12,7 +12,6 @@ import (
 	jsoncdc "github.com/onflow/cadence/encoding/json"
 	"github.com/rs/zerolog"
 
-	"github.com/onflow/flow-go/engine/execution/state/delta"
 	"github.com/onflow/flow-go/fvm"
 	"github.com/onflow/flow-go/fvm/derived"
 	"github.com/onflow/flow-go/fvm/state"
@@ -105,7 +104,10 @@ func (e *QueryExecutor) ExecuteScript(
 	blockHeader *flow.Header,
 	derivedBlockData *derived.DerivedBlockData,
 	snapshot state.StorageSnapshot,
-) ([]byte, error) {
+) (
+	encodedValue []byte,
+	err error,
+) {
 
 	startedAt := time.Now()
 	memAllocBefore := debug.GetHeapAllocsBytes()
@@ -128,67 +130,64 @@ func (e *QueryExecutor) ExecuteScript(
 	requestCtx, cancel := context.WithTimeout(ctx, e.config.ExecutionTimeLimit)
 	defer cancel()
 
-	scriptInContext := fvm.NewScriptWithContextAndArgs(script, requestCtx, arguments...)
-	blockCtx := fvm.NewContextFromParent(
-		e.vmCtx,
-		fvm.WithBlockHeader(blockHeader),
-		fvm.WithDerivedBlockData(derivedBlockData))
-
-	err := func() (err error) {
-
-		start := time.Now()
-
-		defer func() {
-
-			prepareLog := func() *zerolog.Event {
-
-				args := make([]string, 0, len(arguments))
-				for _, a := range arguments {
-					args = append(args, hex.EncodeToString(a))
-				}
-				return e.logger.Error().
-					Hex("script_hex", script).
-					Str("args", strings.Join(args, ","))
-			}
-
-			elapsed := time.Since(start)
-
-			if r := recover(); r != nil {
-				prepareLog().
-					Interface("recovered", r).
-					Msg("script execution caused runtime panic")
-
-				err = fmt.Errorf("cadence runtime error: %s", r)
-				return
+	defer func() {
+		prepareLog := func() *zerolog.Event {
+			args := make([]string, 0, len(arguments))
+			for _, a := range arguments {
+				args = append(args, hex.EncodeToString(a))
 			}
-			if elapsed >= e.config.LogTimeThreshold {
-				prepareLog().
-					Dur("duration", elapsed).
-					Msg("script execution exceeded threshold")
-			}
-		}()
-
-		view := delta.NewDeltaView(snapshot)
-		return e.vm.Run(blockCtx, scriptInContext, view)
+			return e.logger.Error().
+				Hex("script_hex", script).
+				Str("args", strings.Join(args, ","))
+		}
+
+		elapsed := time.Since(startedAt)
+
+		if r := recover(); r != nil {
+			prepareLog().
+				Interface("recovered", r).
+				Msg("script execution caused runtime panic")
+
+			err = fmt.Errorf("cadence runtime error: %s", r)
+			return
+		}
+		if elapsed >= e.config.LogTimeThreshold {
+			prepareLog().
+				Dur("duration", elapsed).
+				Msg("script execution exceeded threshold")
+		}
 	}()
+
+	var output fvm.ProcedureOutput
+	_, output, err = e.vm.RunV2(
+		fvm.NewContextFromParent(
+			e.vmCtx,
+			fvm.WithBlockHeader(blockHeader),
+			fvm.WithDerivedBlockData(derivedBlockData)),
+		fvm.NewScriptWithContextAndArgs(script, requestCtx, arguments...),
+		snapshot)
 	if err != nil {
 		return nil, fmt.Errorf("failed to execute script (internal error): %w", err)
 	}
 
-	if scriptInContext.Err != nil {
+	if output.Err != nil {
 		return nil, fmt.Errorf("failed to execute script at block (%s): %s",
 			blockHeader.ID(),
-			summarizeLog(scriptInContext.Err.Error(),
+			summarizeLog(output.Err.Error(),
 				e.config.MaxErrorMessageSize))
 	}
 
-	encodedValue, err := jsoncdc.Encode(scriptInContext.Value)
+	encodedValue, err = jsoncdc.Encode(output.Value)
 	if err != nil {
 		return nil, fmt.Errorf("failed to encode runtime value: %w", err)
 	}
 
 	memAllocAfter := debug.GetHeapAllocsBytes()
-	e.metrics.ExecutionScriptExecuted(time.Since(startedAt), scriptInContext.GasUsed, memAllocAfter-memAllocBefore, scriptInContext.MemoryEstimate)
+	e.metrics.ExecutionScriptExecuted(
+		time.Since(startedAt),
+		output.ComputationUsed,
+		memAllocAfter-memAllocBefore,
+		output.MemoryEstimate)
 
 	return encodedValue, nil
 }
@@ -221,7 +220,6 @@ func (e *QueryExecutor) GetAccount(
 		fvm.WithDerivedBlockData(
 			e.derivedChainData.NewDerivedBlockDataForScript(blockHeader.ID())))
 
-	delta.NewDeltaView(snapshot)
 	account, err := e.vm.GetAccount(
 		blockCtx,
 		address,