From 34439a35b79c823bef897afef7563f4868b46669 Mon Sep 17 00:00:00 2001 From: evgeniy-scherbina Date: Thu, 18 Apr 2024 15:16:24 -0400 Subject: [PATCH] Temporary Commit --- app/app.go | 2 +- x/evm/keeper/keeper.go | 27 +++++++++++---------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/app/app.go b/app/app.go index ed660480c3..a0c0fab8fd 100644 --- a/app/app.go +++ b/app/app.go @@ -427,7 +427,7 @@ func NewEthermintApp( appCodec, keys[evmtypes.StoreKey], tkeys[evmtypes.TransientKey], authtypes.NewModuleAddress(govtypes.ModuleName), app.AccountKeeper, app.BankKeeper, stakingKeeper, app.FeeMarketKeeper, - nil, vm.NewEVM, tracer, evmSs, + vm.NewEVM, tracer, evmSs, ) // Create IBC Keeper diff --git a/x/evm/keeper/keeper.go b/x/evm/keeper/keeper.go index e9528b75a3..4427c87a1d 100644 --- a/x/evm/keeper/keeper.go +++ b/x/evm/keeper/keeper.go @@ -72,9 +72,6 @@ type Keeper struct { // EVM Hooks for tx post-processing hooks types.EvmHooks - // custom stateless precompiled smart contracts - customPrecompiles evm.PrecompiledContracts - // evm constructor function evmConstructor evm.Constructor // Legacy subspace @@ -90,7 +87,6 @@ func NewKeeper( bankKeeper types.BankKeeper, sk types.StakingKeeper, fmk types.FeeMarketKeeper, - customPrecompiles evm.PrecompiledContracts, evmConstructor evm.Constructor, tracer string, ss paramstypes.Subspace, @@ -111,18 +107,17 @@ func NewKeeper( // NOTE: we pass in the parameter space to the CommitStateDB in order to use custom denominations for the EVM operations return &Keeper{ - cdc: cdc, - authority: authority, - accountKeeper: ak, - bankKeeper: bankKeeper, - stakingKeeper: sk, - feeMarketKeeper: fmk, - storeKey: storeKey, - transientKey: transientKey, - customPrecompiles: customPrecompiles, - evmConstructor: evmConstructor, - tracer: tracer, - ss: ss, + cdc: cdc, + authority: authority, + accountKeeper: ak, + bankKeeper: bankKeeper, + stakingKeeper: sk, + feeMarketKeeper: fmk, + storeKey: storeKey, + transientKey: transientKey, + evmConstructor: evmConstructor, + tracer: tracer, + ss: ss, } }