Merge #4127

4127: Add FinalizeMainTransaction method to TransactionState r=pattyshack a=pattyshack

This also include fixes to script execution (to ensure the returned execution snapshot reflects all changes) and a bunch of renaming within TransactionState

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

Author: bors[bot]

fvm/fvm.go

@@ -176,9 +176,8 @@ func (vm *VirtualMachine) RunV2(
 	}
 
 	// TODO(patrick): initialize view inside TransactionState
-	view := delta.NewDeltaView(storageSnapshot)
 	nestedTxn := state.NewTransactionState(
-		view,
+		delta.NewDeltaView(storageSnapshot),
 		state.DefaultParameters().
 			WithMeterParameters(getBasicMeterParameters(ctx, proc)).
 			WithMaxKeySizeAllowed(ctx.MaxStateKeySize).
@@ -207,7 +206,12 @@ func (vm *VirtualMachine) RunV2(
 		}
 	}
 
-	return view.Finalize(), executor.Output(), nil
+	executionSnapshot, err := txnState.FinalizeMainTransaction()
+	if err != nil {
+		return nil, ProcedureOutput{}, err
+	}
+
+	return executionSnapshot, executor.Output(), nil
 }
 
 func (vm *VirtualMachine) Run(

fvm/script.go

@@ -187,6 +187,16 @@ func (executor *scriptExecutor) execute() error {
 		return err
 	}
 
+	errs := errors.NewErrorsCollector()
+	errs.Collect(executor.executeScript())
+
+	_, err = executor.txnState.CommitNestedTransaction(txnId)
+	errs.Collect(err)
+
+	return errs.ErrorOrNil()
+}
+
+func (executor *scriptExecutor) executeScript() error {
 	rt := executor.env.BorrowCadenceRuntime()
 	defer executor.env.ReturnCadenceRuntime(rt)
 
@@ -196,17 +206,10 @@ func (executor *scriptExecutor) execute() error {
 			Arguments: executor.proc.Arguments,
 		},
 		common.ScriptLocation(executor.proc.ID))
-
 	if err != nil {
 		return err
 	}
 
 	executor.output.Value = value
-	err = executor.output.PopulateEnvironmentValues(executor.env)
-	if err != nil {
-		return err
-	}
-
-	_, err = executor.txnState.CommitNestedTransaction(txnId)
-	return err
+	return executor.output.PopulateEnvironmentValues(executor.env)
 }