Temporary Commit

app/ante/eth.go

@@ -303,7 +303,7 @@ func (ctd CanTransferDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate
 		}
 
 		stateDB := statedb.New(ctx, ctd.evmKeeper, statedb.NewEmptyTxConfig(common.BytesToHash(ctx.HeaderHash().Bytes())))
-		evm := ctd.evmKeeper.NewEVM(ctx, coreMsg, cfg, evmtypes.NewNoOpTracer(), stateDB)
+		evm := ctd.evmKeeper.NewEVM(ctx, coreMsg, cfg, evmtypes.NewNoOpTracer(), stateDB, nil)
 
 		// check that caller has enough balance to cover asset transfer for **topmost** call
 		// NOTE: here the gas consumed is from the context with the infinite gas meter

app/ante/interfaces.go

@@ -44,7 +44,14 @@ type EVMKeeper interface {
 	statedb.Keeper
 	DynamicFeeEVMKeeper
 
-	NewEVM(ctx sdk.Context, msg core.Message, cfg *statedb.EVMConfig, tracer vm.EVMLogger, stateDB vm.StateDB) evm.EVM
+	NewEVM(
+		ctx sdk.Context,
+		msg core.Message,
+		cfg *statedb.EVMConfig,
+		tracer vm.EVMLogger,
+		stateDB vm.StateDB,
+		precompilesMetadata []*vm.PrecompileMetadata,
+	) evm.EVM
 	DeductTxCostsFromUserBalance(ctx sdk.Context, fees sdk.Coins, from common.Address) error
 	GetBalance(ctx sdk.Context, addr common.Address) *big.Int
 	ResetTransientGasUsed(ctx sdk.Context)

x/evm/keeper/state_transition.go

@@ -51,6 +51,7 @@ func (k *Keeper) NewEVM(
 	cfg *statedb.EVMConfig,
 	tracer vm.EVMLogger,
 	stateDB vm.StateDB,
+	precompilesMetadata []*vm.PrecompileMetadata,
 ) evm.EVM {
 	blockCtx := vm.BlockContext{
 		CanTransfer: core.CanTransfer,
@@ -70,7 +71,7 @@ func (k *Keeper) NewEVM(
 		tracer = k.Tracer(ctx, msg, cfg.ChainConfig)
 	}
 	vmConfig := k.VMConfig(ctx, msg, cfg, tracer)
-	return k.evmConstructor(blockCtx, txCtx, stateDB, cfg.ChainConfig, vmConfig, k.customPrecompiles)
+	return k.evmConstructor(blockCtx, txCtx, stateDB, cfg.ChainConfig, vmConfig, k.customPrecompiles, precompilesMetadata)
 }
 
 // GetHashFn implements vm.GetHashFunc for Ethermint. It handles 3 cases:
@@ -329,9 +330,9 @@ func (k *Keeper) ApplyMessageWithConfig(ctx sdk.Context,
 		return nil, errorsmod.Wrap(types.ErrCallDisabled, "failed to call contract")
 	}
 
-	enabledPrecompiles := k.evmutilKeeper.GetEnabledPrecompiles()
+	precompilesMetadata := k.evmutilKeeper.GetPrecompilesMetadata()
 	stateDB := statedb.New(ctx, k, txConfig)
-	evm := k.NewEVM(ctx, msg, cfg, tracer, stateDB)
+	evm := k.NewEVM(ctx, msg, cfg, tracer, stateDB, precompilesMetadata)
 
 	leftoverGas := msg.Gas()
 

x/evm/types/interfaces.go

@@ -16,7 +16,7 @@
 package types
 
 import (
-	"github.com/ethereum/go-ethereum/precompile/contract"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"math/big"
 
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
@@ -65,9 +65,15 @@ type FeeMarketKeeper interface {
 	AddTransientGasWanted(ctx sdk.Context, gasWanted uint64) (uint64, error)
 }
 
+//type PrecompileMetadata struct {
+//	Name      string
+//	Address   string
+//	IsEnabled bool
+//}
+
 type EvmutilKeeper interface {
 	IsEnabled(blockHeight uint64, address string) bool
-	GetEnabledPrecompiles() []contract.StatefulPrecompiledContract
+	GetPrecompilesMetadata() []*vm.PrecompileMetadata
 }
 
 // Event Hooks

x/evm/vm/geth/geth.go

@@ -46,9 +46,10 @@ func NewEVM(
 	chainConfig *params.ChainConfig,
 	config vm.Config,
 	_ evm.PrecompiledContracts, // unused
+	precompilesMetadata []*vm.PrecompileMetadata,
 ) evm.EVM {
 	return &EVM{
-		EVM: vm.NewEVM(blockCtx, txCtx, stateDB, chainConfig, config),
+		EVM: vm.NewEVM(blockCtx, txCtx, stateDB, chainConfig, config, precompilesMetadata),
 	}
 }
 

x/evm/vm/interface.go

@@ -82,4 +82,5 @@ type Constructor func(
 	chainConfig *params.ChainConfig,
 	config vm.Config,
 	customPrecompiles PrecompiledContracts,
+	precompilesMetadata []*vm.PrecompileMetadata,
 ) EVM