whitelist erc20 wrapper to ibchook whitelist

app/ibc-hooks/common_test.go

@@ -303,6 +303,7 @@ func _createTestInput(
 	banktypes.RegisterQueryServer(queryRouter, &bankKeeper)
 
 	communityPoolKeeper := &MockCommunityPoolKeeper{}
+	ibcHookKeeper := &MockIBCHookKeeper{}
 	gasPriceKeeper := &MockGasPriceKeeper{GasPrices: map[string]math.LegacyDec{}}
 	evmKeeper := evmkeeper.NewKeeper(
 		ac,
@@ -312,6 +313,7 @@ func _createTestInput(
 		accountKeeper,
 		bankKeeper,
 		communityPoolKeeper,
+		ibcHookKeeper,
 		gasPriceKeeper,
 		msgRouter,
 		queryRouter,
@@ -439,3 +441,9 @@ func (k *MockGasPriceKeeper) GasPrice(ctx context.Context, denom string) (math.L
 
 	return gasPrice, nil
 }
+
+type MockIBCHookKeeper struct{}
+
+func (k *MockIBCHookKeeper) SetAllowed(ctx context.Context, addr sdk.AccAddress, allowed bool) error {
+	return nil
+}

app/keepers/keepers.go

@@ -557,6 +557,7 @@ func NewAppKeeper(
 		accountKeeper,
 		bankKeeper,
 		communityPoolKeeper,
+		appKeepers.IBCHooksKeeper,
 		gasPriceKeeper,
 		bApp.MsgServiceRouter(),
 		bApp.GRPCQueryRouter(),

app/modules.go

@@ -187,11 +187,11 @@ can do so safely.
 */
 func orderInitBlockers() []string {
 	return []string{
-		capabilitytypes.ModuleName, authtypes.ModuleName, evmtypes.ModuleName, banktypes.ModuleName,
+		capabilitytypes.ModuleName, authtypes.ModuleName, ibchookstypes.ModuleName, evmtypes.ModuleName, banktypes.ModuleName,
 		opchildtypes.ModuleName, genutiltypes.ModuleName, authz.ModuleName, group.ModuleName, crisistypes.ModuleName,
 		upgradetypes.ModuleName, feegrant.ModuleName, consensusparamtypes.ModuleName, ibcexported.ModuleName,
 		ibctransfertypes.ModuleName, ibcnfttransfertypes.ModuleName, icatypes.ModuleName, icaauthtypes.ModuleName,
 		ibcfeetypes.ModuleName, auctiontypes.ModuleName, oracletypes.ModuleName, marketmaptypes.ModuleName,
-		packetforwardtypes.ModuleName, forwardingtypes.ModuleName, ibchookstypes.ModuleName,
+		packetforwardtypes.ModuleName, forwardingtypes.ModuleName,
 	}
 }

jsonrpc/backend/feehistory.go

@@ -128,7 +128,7 @@ func (b *JSONRPCBackend) FeeHistory(blocks uint64, unresolvedLastBlock rpc.Block
 				} else {
 					fees.header, fees.err = b.GetHeaderByNumber(rpc.BlockNumber(blockNumber))
 					if len(rewardPercentiles) != 0 && fees.err == nil {
-						fees.receipts, fees.err = b.getBLockReceipts(blockNumber)
+						fees.receipts, fees.err = b.getBlockReceipts(blockNumber)
 						if fees.err == nil {
 							var txs []*rpctypes.RPCTransaction
 							txs, fees.err = b.getBlockTransactions(blockNumber)

jsonrpc/backend/filters.go

@@ -2,8 +2,6 @@ package backend
 
 import (
 	coretypes "github.com/ethereum/go-ethereum/core/types"
-
-	rpctypes "github.com/initia-labs/minievm/jsonrpc/types"
 )
 
 // GetLogsByHeight returns all the logs from all the ethereum transactions in a block.
@@ -20,11 +18,7 @@ func (b *JSONRPCBackend) GetLogsByHeight(height uint64) ([]*coretypes.Log, error
 		return nil, err
 	}
 
-	txs := []*rpctypes.RPCTransaction{}
-	err = b.app.EVMIndexer().IterateBlockTxs(queryCtx, height, func(tx *rpctypes.RPCTransaction) (bool, error) {
-		txs = append(txs, tx)
-		return false, nil
-	})
+	txs, err := b.getBlockTransactions(height)
 	if err != nil {
 		return nil, err
 	}

jsonrpc/backend/tx.go

@@ -385,7 +385,7 @@ func (b *JSONRPCBackend) getBlockTransactions(blockNumber uint64) ([]*rpctypes.R
 	return txs, nil
 }
 
-func (b *JSONRPCBackend) getBLockReceipts(blockNumber uint64) ([]*coretypes.Receipt, error) {
+func (b *JSONRPCBackend) getBlockReceipts(blockNumber uint64) ([]*coretypes.Receipt, error) {
 	queryCtx, err := b.getQueryCtx()
 	if err != nil {
 		return nil, err
@@ -414,7 +414,7 @@ func (b *JSONRPCBackend) GetBlockReceipts(ctx context.Context, blockNrOrHash rpc
 		return nil, err
 	}
 
-	receipts, err := b.getBLockReceipts(blockNumber)
+	receipts, err := b.getBlockReceipts(blockNumber)
 	if err != nil {
 		return nil, err
 	}

jsonrpc/namespaces/eth/filters/filter.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
+	"slices"
 
 	"cosmossdk.io/log"
 
@@ -213,7 +214,7 @@ func filterLogs(logs []*coretypes.Log, fromBlock, toBlock *big.Int, addresses []
 		if toBlock != nil && toBlock.Int64() >= 0 && toBlock.Uint64() < log.BlockNumber {
 			return false
 		}
-		if len(addresses) > 0 && !includes(addresses, log.Address) {
+		if len(addresses) > 0 && !slices.Contains(addresses, log.Address) {
 			return false
 		}
 		// If the to filtered topics is greater than the amount of topics in logs, skip.
@@ -224,7 +225,7 @@ func filterLogs(logs []*coretypes.Log, fromBlock, toBlock *big.Int, addresses []
 			if len(sub) == 0 {
 				continue // empty rule set == wildcard
 			}
-			if !includes(sub, log.Topics[i]) {
+			if !slices.Contains(sub, log.Topics[i]) {
 				return false
 			}
 		}
@@ -239,16 +240,6 @@ func filterLogs(logs []*coretypes.Log, fromBlock, toBlock *big.Int, addresses []
 	return ret
 }
 
-// includes returns true if the element is present in the list.
-func includes[T comparable](things []T, element T) bool {
-	for _, thing := range things {
-		if thing == element {
-			return true
-		}
-	}
-	return false
-}
-
 func bloomFilter(bloom coretypes.Bloom, addresses []common.Address, topics [][]common.Hash) bool {
 	if len(addresses) > 0 {
 		var included bool

x/bank/keeper/common_test.go

@@ -295,6 +295,7 @@ func _createTestInput(
 	banktypes.RegisterQueryServer(queryRouter, &bankKeeper)
 
 	communityPoolKeeper := &MockCommunityPoolKeeper{}
+	ibcHookKeeper := &MockIBCHookKeeper{}
 	gasPriceKeeper := &MockGasPriceKeeper{GasPrices: map[string]math.LegacyDec{}}
 	evmKeeper := evmkeeper.NewKeeper(
 		ac,
@@ -304,6 +305,7 @@ func _createTestInput(
 		accountKeeper,
 		bankKeeper,
 		communityPoolKeeper,
+		ibcHookKeeper,
 		gasPriceKeeper,
 		msgRouter,
 		queryRouter,
@@ -356,3 +358,9 @@ func (k *MockGasPriceKeeper) GasPrice(ctx context.Context, denom string) (math.L
 
 	return gasPrice, nil
 }
+
+type MockIBCHookKeeper struct{}
+
+func (k *MockIBCHookKeeper) SetAllowed(ctx context.Context, addr sdk.AccAddress, allowed bool) error {
+	return nil
+}

x/evm/keeper/common_test.go

@@ -256,6 +256,7 @@ func _createTestInput(
 	banktypes.RegisterQueryServer(queryRouter, &bankKeeper)
 
 	communityPoolKeeper := &MockCommunityPoolKeeper{}
+	ibcHookKeeper := &MockIBCHookKeeper{}
 	gasPriceKeeper := &MockGasPriceKeeper{GasPrices: map[string]math.LegacyDec{}}
 	evmKeeper := evmkeeper.NewKeeper(
 		ac,
@@ -265,6 +266,7 @@ func _createTestInput(
 		accountKeeper,
 		bankKeeper,
 		communityPoolKeeper,
+		ibcHookKeeper,
 		gasPriceKeeper,
 		msgRouter,
 		queryRouter,
@@ -331,3 +333,9 @@ func (k *MockGasPriceKeeper) GasPrice(ctx context.Context, denom string) (math.L
 
 	return gasPrice, nil
 }
+
+type MockIBCHookKeeper struct{}
+
+func (k *MockIBCHookKeeper) SetAllowed(ctx context.Context, addr sdk.AccAddress, allowed bool) error {
+	return nil
+}

x/evm/keeper/genesis.go

@@ -86,8 +86,16 @@ func (k Keeper) DeployERC20Wrapper(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
+	if err = k.ERC20WrapperAddr.Set(ctx, wrapperAddr.Bytes()); err != nil {
+		return err
+	}
+
+	// whitelist the wrapper contract for IBC hook
+	if err = k.ibcHookKeeper.SetAllowed(ctx, wrapperAddr.Bytes(), true); err != nil {
+		return err
+	}
 
-	return k.ERC20WrapperAddr.Set(ctx, wrapperAddr.Bytes())
+	return nil
 }
 
 func (k Keeper) InitGenesis(ctx context.Context, genState types.GenesisState) error {

x/evm/keeper/keeper.go

@@ -24,6 +24,7 @@ type Keeper struct {
 	accountKeeper       types.AccountKeeper
 	bankKeeper          types.BankKeeper
 	communityPoolKeeper types.CommunityPoolKeeper
+	ibcHookKeeper       types.IBCHookKeeper
 	gasPriceKeeper      types.GasPriceKeeper
 	erc20Keeper         types.IERC20Keeper
 	erc20StoresKeeper   types.IERC20StoresKeeper
@@ -86,6 +87,7 @@ func NewKeeper(
 	accountKeeper types.AccountKeeper,
 	bankKeeper types.BankKeeper,
 	communityPoolKeeper types.CommunityPoolKeeper,
+	ibcHookKeeper types.IBCHookKeeper,
 	gasPriceKeeper types.GasPriceKeeper,
 	msgRouter baseapp.MessageRouter,
 	grpcRouter *baseapp.GRPCQueryRouter,
@@ -109,6 +111,7 @@ func NewKeeper(
 		accountKeeper:       accountKeeper,
 		bankKeeper:          bankKeeper,
 		communityPoolKeeper: communityPoolKeeper,
+		ibcHookKeeper:       ibcHookKeeper,
 		gasPriceKeeper:      gasPriceKeeper,
 		authority:           authority,
 

x/evm/state/common_test.go

@@ -255,6 +255,7 @@ func _createTestInput(
 	banktypes.RegisterQueryServer(queryRouter, &bankKeeper)
 
 	communityPoolKeeper := &MockCommunityPoolKeeper{}
+	ibcHookKeeper := &MockIBCHookKeeper{}
 	gasPriceKeeper := &MockGasPriceKeeper{GasPrices: make(map[string]math.LegacyDec)}
 	evmKeeper := evmkeeper.NewKeeper(
 		ac,
@@ -264,6 +265,7 @@ func _createTestInput(
 		accountKeeper,
 		bankKeeper,
 		communityPoolKeeper,
+		ibcHookKeeper,
 		gasPriceKeeper,
 		msgRouter,
 		queryRouter,
@@ -329,3 +331,9 @@ func (k *MockGasPriceKeeper) GasPrice(ctx context.Context, denom string) (math.L
 
 	return gasPrice, nil
 }
+
+type MockIBCHookKeeper struct{}
+
+func (k *MockIBCHookKeeper) SetAllowed(ctx context.Context, addr sdk.AccAddress, allowed bool) error {
+	return nil
+}

x/evm/types/expected_keeper.go

@@ -102,3 +102,7 @@ type TxUtils interface {
 	ConvertEthereumTxToCosmosTx(ctx context.Context, ethTx *coretypes.Transaction) (sdk.Tx, error)
 	IsEthereumTx(ctx context.Context, sdkTx sdk.Tx) (bool, error)
 }
+
+type IBCHookKeeper interface {
+	SetAllowed(ctx context.Context, addr sdk.AccAddress, allowed bool) error
+}