Simplify evmConstructor

x/evm/keeper/state_transition.go

@@ -52,8 +52,6 @@ func (k *Keeper) NewEVM(
 	tracer vm.EVMLogger,
 	stateDB vm.StateDB,
 ) evm.EVM {
-	goCtx := sdk.WrapSDKContext(ctx)
-
 	blockCtx := vm.BlockContext{
 		CanTransfer: core.CanTransfer,
 		Transfer:    core.Transfer,
@@ -72,7 +70,7 @@ func (k *Keeper) NewEVM(
 		tracer = k.Tracer(ctx, msg, cfg.ChainConfig)
 	}
 	vmConfig := k.VMConfig(ctx, msg, cfg, tracer)
-	return k.evmConstructor(goCtx, blockCtx, txCtx, stateDB, cfg.ChainConfig, vmConfig, k.customPrecompiles)
+	return k.evmConstructor(blockCtx, txCtx, stateDB, cfg.ChainConfig, vmConfig, k.customPrecompiles)
 }
 
 // GetHashFn implements vm.GetHashFunc for Ethermint. It handles 3 cases:

x/evm/vm/geth/geth.go

@@ -16,7 +16,6 @@
 package geth
 
 import (
-	"context"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -41,7 +40,6 @@ type EVM struct {
 // the default precompiled contracts and the EVM concrete implementation from
 // geth.
 func NewEVM(
-	goCtx context.Context,
 	blockCtx vm.BlockContext,
 	txCtx vm.TxContext,
 	stateDB vm.StateDB,
@@ -50,7 +48,7 @@ func NewEVM(
 	_ evm.PrecompiledContracts, // unused
 ) evm.EVM {
 	return &EVM{
-		EVM: vm.NewEVMWithContext(goCtx, blockCtx, txCtx, stateDB, chainConfig, config),
+		EVM: vm.NewEVM(blockCtx, txCtx, stateDB, chainConfig, config),
 	}
 }
 

x/evm/vm/interface.go

@@ -16,7 +16,6 @@
 package vm
 
 import (
-	"context"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -76,7 +75,6 @@ type EVM interface {
 // Constructor defines the function used to instantiate the EVM on
 // each state transition.
 type Constructor func(
-	goCtx context.Context,
 	blockCtx vm.BlockContext,
 	txCtx vm.TxContext,
 	stateDB vm.StateDB,