feat: Use x/precisebank for x/evm keeper (#1960)

Replace x/evmutil EvmBankKeeper usage for x/evm
Kava-Labs · Jul 10, 2024 · d2d6612 · d2d6612
1 parent 9de9de6
commit d2d6612
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 1,174 deletions.
diff --git a/app/app.go b/app/app.go
@@ -550,19 +550,20 @@ func NewApp(
 		app.accountKeeper,
 	)
 
-	// TODO: Pass this to evmkeeper.NewKeeper() instead of evmutilKeeper
 	app.precisebankKeeper = precisebankkeeper.NewKeeper(
 		app.appCodec,
 		keys[precisebanktypes.StoreKey],
 		app.bankKeeper,
 		app.accountKeeper,
 	)
 
-	evmBankKeeper := evmutilkeeper.NewEvmBankKeeper(app.evmutilKeeper, app.bankKeeper, app.accountKeeper)
 	app.evmKeeper = evmkeeper.NewKeeper(
 		appCodec, keys[evmtypes.StoreKey], tkeys[evmtypes.TransientKey],
 		govAuthAddr,
-		app.accountKeeper, evmBankKeeper, app.stakingKeeper, app.feeMarketKeeper,
+		app.accountKeeper,
+		app.precisebankKeeper, // x/precisebank in place of x/bank
+		app.stakingKeeper,
+		app.feeMarketKeeper,
 		nil, // precompiled contracts
 		geth.NewEVM,
 		options.EVMTrace,

diff --git a/x/evmutil/keeper/bank_keeper.go b/x/evmutil/keeper/bank_keeper.go