fix setup for AccountV2Migration contract

onflow · turbolent · Nov 26, 2024 · Nov 26, 2024 · Nov 26, 2024 · Nov 27, 2024
commit 579414020c91c80b1e4b90f51afdf625d72f22d7
@@ -701,7  701,6 @@ func TestBlockExecutor_ExecuteBlock(t *testing.T) {
 					reusableRuntime.NewCustomReusableCadenceRuntimePool(
 						0,
 						runtime.Config{},
-						chainID,
 						func(_ runtime.Config) runtime.Runtime {
 							return emittingRuntime
 						},
@@ -817,7  816,6 @@ func TestBlockExecutor_ExecuteBlock(t *testing.T) {
 				reusableRuntime.NewCustomReusableCadenceRuntimePool(
 					0,
 					runtime.Config{},
-					execCtx.Chain.ChainID(),
 					func(_ runtime.Config) runtime.Runtime {
 						return rt
 					})),
@@ -933,7  931,6 @@ func TestBlockExecutor_ExecuteBlock(t *testing.T) {
 				reusableRuntime.NewCustomReusableCadenceRuntimePool(
 					0,
 					runtime.Config{},
-					execCtx.Chain.ChainID(),
 					func(_ runtime.Config) runtime.Runtime {
 						return rt
 					})),

diff --git a/engine/execution/computation/manager.go b/engine/execution/computation/manager.go
@@ -233,7  233,6 @@ func DefaultFVMOptions(chainID flow.ChainID, cadenceTracing bool, extensiveTraci
 				runtime.Config{
 					TracingEnabled: cadenceTracing,
 				},
-				chainID,
 			)),
 		fvm.WithEVMEnabled(true),
 	}

diff --git a/engine/execution/computation/manager_benchmark_test.go b/engine/execution/computation/manager_benchmark_test.go
@@ -160,7  160,6 @@ func benchmarkComputeBlock(
 			reusableRuntime.NewReusableCadenceRuntimePool(
 				ReusableCadenceRuntimePoolSize,
 				runtime.Config{},
-				chainID,
 			)),
 	)
 	snapshotTree := testutil.RootBootstrappedLedger(

@@ -11,6  11,7 @@ import (
 	"github.com/onflow/cadence/stdlib"
 
 	"github.com/onflow/flow-go/fvm/errors"
 	"github.com/onflow/flow-go/fvm/systemcontracts"
 	"github.com/onflow/flow-go/model/flow"
 )
 
@@ -39,7  40,7 @@ var scheduleAccountV2MigrationType = &sema.FunctionType{
 
 func DeclareFunctions(environment runtime.Environment, chainID flow.ChainID) {
 	declareScheduleAccountV2MigrationFunction(environment, chainID)
-	declareGetAccountStorageFormatFunction(environment)
 	declareGetAccountStorageFormatFunction(environment, chainID)
 }
 
 func declareScheduleAccountV2MigrationFunction(environment runtime.Environment, chainID flow.ChainID) {
@@ -122,19  123,17 @@ func declareScheduleAccountV2MigrationFunction(environment runtime.Environment,
 		),
 	}
 
-	// TODO: restrict, but requires to be set during bootstrapping
-	//sc := systemcontracts.SystemContractsForChain(chainID)
-	//
-	//accountV2MigrationLocation := common.NewAddressLocation(
-	//	nil,
-	//	common.Address(sc.AccountV2Migration.Address),
-	//	ContractName,
-	//)
 	sc := systemcontracts.SystemContractsForChain(chainID)
 
 	accountV2MigrationLocation := common.NewAddressLocation(
 		nil,
 		common.Address(sc.AccountV2Migration.Address),
 		ContractName,
 	)
 
 	environment.DeclareValue(
 		functionValue,
-		// TODO: accountV2MigrationLocation,
-		nil,
 		accountV2MigrationLocation,
 	)
 }
 
@@ -152,7  151,7 @@ var getAccountStorageFormatType = &sema.FunctionType{
 	ReturnTypeAnnotation: sema.NewTypeAnnotation(sema.UInt8Type),
 }
 
-func declareGetAccountStorageFormatFunction(environment runtime.Environment) {
 func declareGetAccountStorageFormatFunction(environment runtime.Environment, chainID flow.ChainID) {
 
 	functionType := getAccountStorageFormatType
 
@@ -207,18  206,16 @@ func declareGetAccountStorageFormatFunction(environment runtime.Environment) {
 		),
 	}
 
-	// TODO: restrict, but requires to be set during bootstrapping
-	//sc := systemcontracts.SystemContractsForChain(chainID)
-	//
-	//accountV2MigrationLocation := common.NewAddressLocation(
-	//	nil,
-	//	common.Address(sc.AccountV2Migration.Address),
-	//	ContractName,
-	//)
 	sc := systemcontracts.SystemContractsForChain(chainID)
 
 	accountV2MigrationLocation := common.NewAddressLocation(
 		nil,
 		common.Address(sc.AccountV2Migration.Address),
 		ContractName,
 	)
 
 	environment.DeclareValue(
 		functionValue,
-		// TODO: accountV2MigrationLocation,
-		nil,
 		accountV2MigrationLocation,
 	)
 }
@@ -117,7  117,7 @@ func DefaultEnvironmentParams() EnvironmentParams {
 	return EnvironmentParams{
 		Chain:                 chainID.Chain(),
 		ServiceAccountEnabled: true,
-		RuntimeParams:         DefaultRuntimeParams(chainID),
 		RuntimeParams:         DefaultRuntimeParams(),
 		ProgramLoggerParams:   DefaultProgramLoggerParams(),
 		EventEmitterParams:    DefaultEventEmitterParams(),
 		BlockInfoParams:       DefaultBlockInfoParams(),

diff --git a/fvm/environment/runtime.go b/fvm/environment/runtime.go
@@ -4,19  4,17 @@ import (
 	cadenceRuntime "github.com/onflow/cadence/runtime"
 
 	"github.com/onflow/flow-go/fvm/runtime"
-	"github.com/onflow/flow-go/model/flow"
 )
 
 type RuntimeParams struct {
 	runtime.ReusableCadenceRuntimePool
 }
 
-func DefaultRuntimeParams(chainID flow.ChainID) RuntimeParams {
 func DefaultRuntimeParams() RuntimeParams {
 	return RuntimeParams{
 		ReusableCadenceRuntimePool: runtime.NewReusableCadenceRuntimePool(
 			0,
 			cadenceRuntime.Config{},
-			chainID,
 		),
 	}
 }

diff --git a/fvm/executionParameters_test.go b/fvm/executionParameters_test.go
@@ -19,7  19,6 @@ import (
 	"github.com/onflow/flow-go/fvm/meter"
 	reusableRuntime "github.com/onflow/flow-go/fvm/runtime"
 	"github.com/onflow/flow-go/fvm/runtime/testutil"
-	"github.com/onflow/flow-go/model/flow"
 )
 
 func TestGetExecutionMemoryWeights(t *testing.T) {
@@ -37,7  36,6 @@ func TestGetExecutionMemoryWeights(t *testing.T) {
 					ReadStoredFunc: readStored,
 				},
 				runtime.Config{},
-				flow.Emulator,
 			),
 		)
 		envMock.On("ReturnCadenceRuntime", mock.Anything).Return()
@@ -168,7  166,6 @@ func TestGetExecutionEffortWeights(t *testing.T) {
 					ReadStoredFunc: readStored,
 				},
 				runtime.Config{},
-				flow.Emulator,
 			),
 		)
 		envMock.On("ReturnCadenceRuntime", mock.Anything).Return()

diff --git a/fvm/fvm_bench_test.go b/fvm/fvm_bench_test.go
@@ -165,7  165,6 @@ func NewBasicBlockExecutor(tb testing.TB, chain flow.Chain, logger zerolog.Logge
 			reusableRuntime.NewReusableCadenceRuntimePool(
 				computation.ReusableCadenceRuntimePoolSize,
 				runtime.Config{},
-				chain.ChainID(),
 			),
 		),
 		fvm.WithEVMEnabled(true),

diff --git a/fvm/fvm_test.go b/fvm/fvm_test.go
@@ -2451,7  2451,6 @@ func TestCapabilityControllers(t *testing.T) {
 					reusableRuntime.NewReusableCadenceRuntimePool(
 						1,
 						runtime.Config{},
-						flow.Emulator,
 					),
 				),
 			).
@@ -2506,7  2505,6 @@ func TestStorageIterationWithBrokenValues(t *testing.T) {
 				reusableRuntime.NewReusableCadenceRuntimePool(
 					1,
 					runtime.Config{},
-					flow.Emulator,
 				),
 			),
 			fvm.WithContractDeploymentRestricted(false),

@@ -8,9  8,7 @@ import (
 	"github.com/onflow/cadence/sema"
 	"github.com/onflow/cadence/stdlib"
 
-	"github.com/onflow/flow-go/fvm/accountV2Migration"
 	"github.com/onflow/flow-go/fvm/errors"
-	"github.com/onflow/flow-go/model/flow"
 )
 
 // Note: this is a subset of environment.Environment, redeclared to handle
@@ -38,7  36,6 @@ type ReusableCadenceRuntime struct {
 func NewReusableCadenceRuntime(
 	rt runtime.Runtime,
 	config runtime.Config,
-	chainID flow.ChainID,
 ) *ReusableCadenceRuntime {
 	reusable := &ReusableCadenceRuntime{
 		Runtime:          rt,
@@ -47,7  44,6 @@ func NewReusableCadenceRuntime(
 	}
 
 	reusable.declareRandomSourceHistory()
-	accountV2Migration.DeclareFunctions(reusable.TxRuntimeEnv, chainID)
 
 	return reusable
 }
@@ -186,8  182,6 @@ type ReusableCadenceRuntimePool struct {
 
 	config runtime.Config
 
-	chainID flow.ChainID
-
 	// When newCustomRuntime is nil, the pool will create standard cadence
 	// interpreter runtimes via runtime.NewInterpreterRuntime.  Otherwise, the
 	// pool will create runtimes using this function.
@@ -199,7  193,6 @@ type ReusableCadenceRuntimePool struct {
 func newReusableCadenceRuntimePool(
 	poolSize int,
 	config runtime.Config,
-	chainID flow.ChainID,
 	newCustomRuntime CadenceRuntimeConstructor,
 ) ReusableCadenceRuntimePool {
 	var pool chan *ReusableCadenceRuntime
@@ -210,34  203,29 @@ func newReusableCadenceRuntimePool(
 	return ReusableCadenceRuntimePool{
 		pool:             pool,
 		config:           config,
-		chainID:          chainID,
 		newCustomRuntime: newCustomRuntime,
 	}
 }
 
 func NewReusableCadenceRuntimePool(
 	poolSize int,
 	config runtime.Config,
-	chainID flow.ChainID,
 ) ReusableCadenceRuntimePool {
 	return newReusableCadenceRuntimePool(
 		poolSize,
 		config,
-		chainID,
 		nil,
 	)
 }
 
 func NewCustomReusableCadenceRuntimePool(
 	poolSize int,
 	config runtime.Config,
-	chainID flow.ChainID,
 	newCustomRuntime CadenceRuntimeConstructor,
 ) ReusableCadenceRuntimePool {
 	return newReusableCadenceRuntimePool(
 		poolSize,
 		config,
-		chainID,
 		newCustomRuntime,
 	)
 }
@@ -262,7  250,6 @@ func (pool ReusableCadenceRuntimePool) Borrow(
 				pool.newRuntime(),
 			},
 			pool.config,
-			pool.chainID,
 		)
 	}
 

@@ -8,6  8,7 @@ import (
 	"github.com/onflow/cadence/common"
 	"github.com/onflow/cadence/runtime"
 
 	"github.com/onflow/flow-go/fvm/accountV2Migration"
 	"github.com/onflow/flow-go/fvm/environment"
 	"github.com/onflow/flow-go/fvm/errors"
 	"github.com/onflow/flow-go/fvm/evm"
@@ -201,10  202,11 @@ func (executor *scriptExecutor) executeScript() error {
 	rt := executor.env.BorrowCadenceRuntime()
 	defer executor.env.ReturnCadenceRuntime(rt)
 
 	chainID := executor.ctx.Chain.ChainID()
 
 	if executor.ctx.EVMEnabled {
-		chain := executor.ctx.Chain
 		err := evm.SetupEnvironment(
-			chain.ChainID(),
 			chainID,
 			executor.env,
 			rt.ScriptRuntimeEnv,
 			debug.NopTracer, // we shouldn't trace during script execution
@@ -214,6  216,11 @@ func (executor *scriptExecutor) executeScript() error {
 		}
 	}
 
 	accountV2Migration.DeclareFunctions(
 		rt.ScriptRuntimeEnv,
 		chainID,
 	)
 
 	value, err := rt.ExecuteScript(
 		runtime.Script{
 			Source:    executor.proc.Script,

@@ -10,6  10,7 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	otelTrace "go.opentelemetry.io/otel/trace"
 
 	"github.com/onflow/flow-go/fvm/accountV2Migration"
 	"github.com/onflow/flow-go/fvm/environment"
 	"github.com/onflow/flow-go/fvm/errors"
 	"github.com/onflow/flow-go/fvm/evm"
@@ -189,11  190,12 @@ func (executor *transactionExecutor) preprocess() error {
 // infrequently modified and are expensive to compute.  For now this includes
 // reading meter parameter overrides and parsing programs.
 func (executor *transactionExecutor) preprocessTransactionBody() error {
-	// setup evm
 	chainID := executor.ctx.Chain.ChainID()
 
 	// setup EVM
 	if executor.ctx.EVMEnabled {
-		chain := executor.ctx.Chain
 		err := evm.SetupEnvironment(
-			chain.ChainID(),
 			chainID,
 			executor.env,
 			executor.cadenceRuntime.TxRuntimeEnv,
 			executor.ctx.EVMTracer,
@@ -202,6  204,12 @@ func (executor *transactionExecutor) preprocessTransactionBody() error {
 			return err
 		}
 	}
 
 	accountV2Migration.DeclareFunctions(
 		executor.cadenceRuntime.TxRuntimeEnv,
 		chainID,
 	)
 
 	// get meter parameters
 	executionParameters, executionStateRead, err := getExecutionParameters(
 		executor.env.Logger(),
@@ -257,11  265,12 @@ func (executor *transactionExecutor) execute() error {
 }
 
 func (executor *transactionExecutor) ExecuteTransactionBody() error {
-	// setup evm
 	chainID := executor.ctx.Chain.ChainID()
 
 	// setup EVM
 	if executor.ctx.EVMEnabled {
-		chain := executor.ctx.Chain
 		err := evm.SetupEnvironment(
-			chain.ChainID(),
 			chainID,
 			executor.env,
 			executor.cadenceRuntime.TxRuntimeEnv,
 			executor.ctx.EVMTracer,
@@ -271,6  280,11 @@ func (executor *transactionExecutor) ExecuteTransactionBody() error {
 		}
 	}
 
 	accountV2Migration.DeclareFunctions(
 		executor.cadenceRuntime.TxRuntimeEnv,
 		chainID,
 	)
 
 	var invalidator derived.TransactionInvalidator
 	if !executor.errs.CollectedError() {