refactor: use NewEVMArgs struct in hook

Author: ARR4N

core/vm/evm.libevm_test.go

@@ -12,15 +12,15 @@ type chainIDOverrider struct {
 	chainID int64
 }
 
-func (o chainIDOverrider) OverrideNewEVMArgs(BlockContext, TxContext, StateDB, *params.ChainConfig, Config) (BlockContext, TxContext, StateDB, *params.ChainConfig, Config) {
-	return BlockContext{}, TxContext{}, nil, &params.ChainConfig{ChainID: big.NewInt(o.chainID)}, Config{}
+func (o chainIDOverrider) OverrideNewEVMArgs(args *NewEVMArgs) *NewEVMArgs {
+	args.ChainConfig = &params.ChainConfig{ChainID: big.NewInt(o.chainID)}
+	return args
 }
 
 func TestOverrideNewEVMArgs(t *testing.T) {
-	// The OverrideNewEVMArgs hook accepts and returns all arguments to
+	// The overrideNewEVMArgs function accepts and returns all arguments to
 	// NewEVM(), in order. Here we lock in our assumption of that order. If this
-	// breaks then the Hooks.OverrideNewEVMArgs() signature MUST be changed to
-	// match.
+	// breaks then all functionality overriding the args MUST be updated.
 	var _ func(BlockContext, TxContext, StateDB, *params.ChainConfig, Config) *EVM = NewEVM
 
 	const chainID = 13579

core/vm/hooks.libevm.go

@@ -15,7 +15,16 @@ var libevmHooks Hooks
 
 // Hooks are arbitrary configuration functions to modify default VM behaviour.
 type Hooks interface {
-	OverrideNewEVMArgs(BlockContext, TxContext, StateDB, *params.ChainConfig, Config) (BlockContext, TxContext, StateDB, *params.ChainConfig, Config)
+	OverrideNewEVMArgs(*NewEVMArgs) *NewEVMArgs
+}
+
+// NewEVMArgs are the arguments received by [NewEVM], available for override.
+type NewEVMArgs struct {
+	BlockContext BlockContext
+	TxContext    TxContext
+	StateDB      StateDB
+	ChainConfig  *params.ChainConfig
+	Config       Config
 }
 
 func overrideNewEVMArgs(
@@ -28,5 +37,6 @@ func overrideNewEVMArgs(
 	if libevmHooks == nil {
 		return blockCtx, txCtx, statedb, chainConfig, config
 	}
-	return libevmHooks.OverrideNewEVMArgs(blockCtx, txCtx, statedb, chainConfig, config)
+	args := libevmHooks.OverrideNewEVMArgs(&NewEVMArgs{blockCtx, txCtx, statedb, chainConfig, config})
+	return args.BlockContext, args.TxContext, args.StateDB, args.ChainConfig, args.Config
 }