Temporary Commit

app/app.go

@@ -421,7 +421,7 @@ func NewEthermintApp(
 	app.EvmKeeper = evmkeeper.NewKeeper(
 		appCodec, keys[evmtypes.StoreKey], tkeys[evmtypes.TransientKey],
 		authtypes.NewModuleAddress(govtypes.ModuleName),
-		app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.FeeMarketKeeper, nil,
+		app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.FeeMarketKeeper, nil, nil,
 		nil, geth.NewEVM, tracer, evmSs,
 	)
 

x/evm/keeper/grpc_query.go

@@ -268,6 +268,8 @@ func (k Keeper) EthCall(c context.Context, req *types.EthCallRequest) (*types.Ms
 
 // EstimateGas implements eth_estimateGas rpc api.
 func (k Keeper) EstimateGas(c context.Context, req *types.EthCallRequest) (*types.EstimateGasResponse, error) {
+	fmt.Printf("EstimateGas: 1\n")
+
 	if req == nil {
 		return nil, status.Error(codes.InvalidArgument, "empty request")
 	}

x/evm/keeper/keeper.go

@@ -64,6 +64,7 @@ type Keeper struct {
 	feeMarketKeeper types.FeeMarketKeeper
 
 	ibcTransferKeeper statedb.IBCTransferKeeper
+	evmutilKeeper     statedb.EvmutilKeeper
 
 	// chain ID number obtained from the context's chain id
 	eip155ChainID *big.Int
@@ -94,6 +95,7 @@ func NewKeeper(
 	sk types.StakingKeeper,
 	fmk types.FeeMarketKeeper,
 	ibcTransferKeeper statedb.IBCTransferKeeper,
+	evmutilKeeper statedb.EvmutilKeeper,
 	customPrecompiles evm.PrecompiledContracts,
 	evmConstructor evm.Constructor,
 	tracer string,
@@ -122,6 +124,7 @@ func NewKeeper(
 		stakingKeeper:     sk,
 		feeMarketKeeper:   fmk,
 		ibcTransferKeeper: ibcTransferKeeper,
+		evmutilKeeper:     evmutilKeeper,
 		storeKey:          storeKey,
 		transientKey:      transientKey,
 		customPrecompiles: customPrecompiles,
@@ -408,3 +411,7 @@ func (k Keeper) AddTransientGasUsed(ctx sdk.Context, gasUsed uint64) (uint64, er
 func (k Keeper) IBCTransferKeeper() statedb.IBCTransferKeeper {
 	return k.ibcTransferKeeper
 }
+
+func (k Keeper) EvmutilKeeper() statedb.EvmutilKeeper {
+	return k.evmutilKeeper
+}

x/evm/statedb/interfaces.go

@@ -39,6 +39,16 @@ type IBCTransferKeeper interface {
 	Transfer(goCtx context.Context, msg *ibctransfertypes.MsgTransfer) (*ibctransfertypes.MsgTransferResponse, error)
 }
 
+type EvmutilKeeper interface {
+	ConvertERC20ToCoin(
+		goCtx context.Context,
+		initiator string,
+		receiver string,
+		kavaERC20Address string,
+		amount sdk.Int,
+	) error
+}
+
 // Keeper provide underlying storage of StateDB
 type Keeper interface {
 	// Read methods
@@ -56,4 +66,5 @@ type Keeper interface {
 	DeleteAccount(ctx sdk.Context, addr common.Address) error
 
 	IBCTransferKeeper() IBCTransferKeeper
+	EvmutilKeeper() EvmutilKeeper
 }

x/evm/statedb/statedb.go

@@ -481,3 +481,13 @@ func (s *StateDB) IBCTransfer(goCtx context.Context, msg *ibctransfertypes.MsgTr
 
 	return resp, nil
 }
+
+func (s *StateDB) ConvertERC20ToCoin(
+	goCtx context.Context,
+	initiator string,
+	receiver string,
+	kavaERC20Address string,
+	amount sdk.Int,
+) error {
+	return s.keeper.EvmutilKeeper().ConvertERC20ToCoin(goCtx, initiator, receiver, kavaERC20Address, amount)
+}