use snapshot to support revert

x/evm/keeper/context.go

@@ -161,6 +161,12 @@ func (k Keeper) CreateEVM(ctx context.Context, caller common.Address, tracer *tr
 		return ctx, nil, err
 	}
 
+	// prepare SDK context for EVM execution
+	ctx, err = prepareSDKContext(sdk.UnwrapSDKContext(ctx))
+	if err != nil {
+		return ctx, nil, err
+	}
+
 	evm := &vm.EVM{}
 	blockContext, err := k.buildBlockContext(ctx, evm, fee)
 	if err != nil {
@@ -181,19 +187,13 @@ func (k Keeper) CreateEVM(ctx context.Context, caller common.Address, tracer *tr
 		NumRetainBlockHashes: &params.NumRetainBlockHashes,
 	}
 
-	// prepare SDK context for EVM execution
-	ctx, err = prepareSDKContext(sdk.UnwrapSDKContext(ctx))
-	if err != nil {
-		return ctx, nil, err
-	}
-
 	*evm = *vm.NewEVMWithPrecompiles(
 		blockContext,
 		txContext,
 		stateDB,
 		types.DefaultChainConfig(ctx),
 		vmConfig,
-		k.precompiles.toMap(ctx),
+		k.precompiles.toMap(stateDB),
 	)
 
 	if tracer != nil {

x/evm/keeper/precompiles.go

@@ -1,8 +1,6 @@
 package keeper
 
 import (
-	"context"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/vm"
 
@@ -55,10 +53,10 @@ func (k *Keeper) loadPrecompiles() error {
 type precompiles []precompile
 
 // toMap converts the precompiles to a map.
-func (ps precompiles) toMap(ctx context.Context) map[common.Address]vm.PrecompiledContract {
+func (ps precompiles) toMap(stateDB types.StateDB) map[common.Address]vm.PrecompiledContract {
 	m := make(map[common.Address]vm.PrecompiledContract)
 	for _, p := range ps {
-		m[p.addr] = p.contract.(types.WithContext).WithContext(ctx)
+		m[p.addr] = p.contract.(types.WithStateDB).WithStateDB(stateDB)
 	}
 
 	return m