[Bug Fix] getLogs endpoint should check whether or not to include cos…

…mos Txs based on namespace (#1988)

* Fix GetEthLogs: getEvmTxHashesFromBlock should exclude cosmos txs

* Fix unit test

* Fix test failure and add a check for synthetic logs

* Fix test

* Fix log

* Increase fee

* Add fee

* Test

contracts/test/lib.js

@@ -286,14 +286,14 @@ async function instantiateWasm(codeId, adminAddr, label, args = {}, from=adminKe
     return getEventAttribute(response, "instantiate", "_contract_address");
 }
 
-async function proposeCW20toERC20Upgrade(erc20Address, cw20Address, title="erc20-pointer", version=99, description="erc20 pointer",fees="20000usei", from=adminKeyName) {
+async function proposeCW20toERC20Upgrade(erc20Address, cw20Address, title="erc20-pointer", version=99, description="erc20 pointer",fees="200000usei", from=adminKeyName) {
     const command = `seid tx evm add-cw-erc20-pointer "${title}" "${description}" ${erc20Address} ${version} 200000000usei ${cw20Address} --from ${from} --fees ${fees} -y -o json --broadcast-mode=block`
     const output = await execute(command);
     const proposalId = getEventAttribute(JSON.parse(output), "submit_proposal", "proposal_id")
     return await passProposal(proposalId)
 }
 
-async function passProposal(proposalId,  desposit="200000000usei", fees="20000usei", from=adminKeyName) {
+async function passProposal(proposalId,  desposit="200000000usei", fees="200000usei", from=adminKeyName) {
     if(await isDocker()) {
         await executeOnAllNodes(`seid tx gov vote ${proposalId} yes --from node_admin -b block -y --fees ${fees}`)
     } else {
@@ -330,6 +330,15 @@ async function registerPointerForERC721(erc721Address, fees="20000usei", from=ad
     return getEventAttribute(response, "pointer_registered", "pointer_address")
 }
 
+async function registerPointerForERC1155(erc1155Address, fees="200000usei", from=adminKeyName) {
+    const command = `seid tx evm register-cw-pointer ERC1155 ${erc1155Address} --from ${from} --fees ${fees} --broadcast-mode block -y -o json`
+    const output = await execute(command);
+    const response = JSON.parse(output)
+    if(response.code !== 0) {
+        throw new Error("contract deployment failed")
+    }
+    return getEventAttribute(response, "pointer_registered", "pointer_address")
+}
 
 async function getSeiAddress(evmAddress) {
     const command = `seid q evm sei-addr ${evmAddress} -o json`

evmrpc/block.go

@@ -40,7 +40,15 @@ type BlockAPI struct {
 }
 
 func NewBlockAPI(tmClient rpcclient.Client, k *keeper.Keeper, ctxProvider func(int64) sdk.Context, txConfig client.TxConfig, connectionType ConnectionType, namespace string) *BlockAPI {
-	return &BlockAPI{tmClient: tmClient, keeper: k, ctxProvider: ctxProvider, txConfig: txConfig, connectionType: connectionType, includeShellReceipts: shouldIncludeSynthetic(namespace)}
+	return &BlockAPI{
+		tmClient:             tmClient,
+		keeper:               k,
+		ctxProvider:          ctxProvider,
+		txConfig:             txConfig,
+		connectionType:       connectionType,
+		namespace:            namespace,
+		includeShellReceipts: shouldIncludeSynthetic(namespace),
+	}
 }
 
 func (a *BlockAPI) GetBlockTransactionCountByNumber(ctx context.Context, number rpc.BlockNumber) (result *hexutil.Uint, returnErr error) {
@@ -150,7 +158,7 @@ func (a *BlockAPI) GetBlockReceipts(ctx context.Context, blockNrOrHash rpc.Block
 
 	// Get all tx hashes for the block
 	height := block.Block.Header.Height
-	txHashes := getEvmTxHashesFromBlock(block, a.txConfig)
+	txHashes := getTxHashesFromBlock(block, a.txConfig, shouldIncludeSynthetic(a.namespace))
 	// Get tx receipts for all hashes in parallel
 	wg := sync.WaitGroup{}
 	mtx := sync.Mutex{}

evmrpc/block_test.go

@@ -80,16 +80,16 @@ func TestGetBlockReceipts(t *testing.T) {
 	// Query by block height
 	resObj := sendRequestGood(t, "getBlockReceipts", "0x2")
 	result := resObj["result"].([]interface{})
-	require.Equal(t, 5, len(result))
+	require.Equal(t, 3, len(result))
 	receipt1 := result[0].(map[string]interface{})
 	require.Equal(t, "0x2", receipt1["blockNumber"])
-	require.Equal(t, "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", receipt1["transactionHash"])
+	require.Equal(t, multiTxBlockTx1.Hash().Hex(), receipt1["transactionHash"])
 	receipt2 := result[1].(map[string]interface{})
 	require.Equal(t, "0x2", receipt2["blockNumber"])
-	require.Equal(t, multiTxBlockTx1.Hash().Hex(), receipt2["transactionHash"])
+	require.Equal(t, multiTxBlockTx2.Hash().Hex(), receipt2["transactionHash"])
 	receipt3 := result[2].(map[string]interface{})
 	require.Equal(t, "0x2", receipt3["blockNumber"])
-	require.Equal(t, "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", receipt3["transactionHash"])
+	require.Equal(t, multiTxBlockTx3.Hash().Hex(), receipt3["transactionHash"])
 
 	resObjSei := sendSeiRequestGood(t, "getBlockReceipts", "0x2")
 	result = resObjSei["result"].([]interface{})
@@ -98,21 +98,21 @@ func TestGetBlockReceipts(t *testing.T) {
 	// Query by block hash
 	resObj2 := sendRequestGood(t, "getBlockReceipts", "0x0000000000000000000000000000000000000000000000000000000000000002")
 	result = resObj2["result"].([]interface{})
-	require.Equal(t, 5, len(result))
+	require.Equal(t, 3, len(result))
 	receipt1 = result[0].(map[string]interface{})
 	require.Equal(t, "0x2", receipt1["blockNumber"])
-	require.Equal(t, "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", receipt1["transactionHash"])
+	require.Equal(t, multiTxBlockTx1.Hash().Hex(), receipt1["transactionHash"])
 	receipt2 = result[1].(map[string]interface{})
 	require.Equal(t, "0x2", receipt2["blockNumber"])
-	require.Equal(t, multiTxBlockTx1.Hash().Hex(), receipt2["transactionHash"])
+	require.Equal(t, multiTxBlockTx2.Hash().Hex(), receipt2["transactionHash"])
 	receipt3 = result[2].(map[string]interface{})
 	require.Equal(t, "0x2", receipt3["blockNumber"])
-	require.Equal(t, "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", receipt3["transactionHash"])
+	require.Equal(t, multiTxBlockTx3.Hash().Hex(), receipt3["transactionHash"])
 
 	// Query by tag latest => retrieves block 8
 	resObj3 := sendRequestGood(t, "getBlockReceipts", "latest")
 	result = resObj3["result"].([]interface{})
-	require.Equal(t, 2, len(result))
+	require.Equal(t, 1, len(result))
 	receipt1 = result[0].(map[string]interface{})
 	require.Equal(t, "0x8", receipt1["blockNumber"])
 	require.Equal(t, tx1.Hash().Hex(), receipt1["transactionHash"])
@@ -192,10 +192,10 @@ func TestEncodeTmBlock_EmptyTransactions(t *testing.T) {
 	block := &coretypes.ResultBlock{
 		BlockID: MockBlockID,
 		Block: &tmtypes.Block{
-			Header: mockBlockHeader(MockHeight),
+			Header: mockBlockHeader(MockHeight8),
 			Data:   tmtypes.Data{},
 			LastCommit: &tmtypes.Commit{
-				Height: MockHeight - 1,
+				Height: MockHeight8 - 1,
 			},
 		},
 	}
@@ -228,15 +228,15 @@ func TestEncodeBankMsg(t *testing.T) {
 	resBlock := coretypes.ResultBlock{
 		BlockID: MockBlockID,
 		Block: &tmtypes.Block{
-			Header: mockBlockHeader(MockHeight),
+			Header: mockBlockHeader(MockHeight8),
 			Data: tmtypes.Data{
 				Txs: []tmtypes.Tx{func() []byte {
 					bz, _ := Encoder(tx)
 					return bz
 				}()},
 			},
 			LastCommit: &tmtypes.Commit{
-				Height: MockHeight - 1,
+				Height: MockHeight8 - 1,
 			},
 		},
 	}
@@ -282,12 +282,12 @@ func TestEncodeWasmExecuteMsg(t *testing.T) {
 	resBlock := coretypes.ResultBlock{
 		BlockID: MockBlockID,
 		Block: &tmtypes.Block{
-			Header: mockBlockHeader(MockHeight),
+			Header: mockBlockHeader(MockHeight8),
 			Data: tmtypes.Data{
 				Txs: []tmtypes.Tx{bz},
 			},
 			LastCommit: &tmtypes.Commit{
-				Height: MockHeight - 1,
+				Height: MockHeight8 - 1,
 			},
 		},
 	}
@@ -313,7 +313,7 @@ func TestEncodeWasmExecuteMsg(t *testing.T) {
 	to := common.Address(toSeiAddr)
 	require.Equal(t, &ethapi.RPCTransaction{
 		BlockHash:        &bh,
-		BlockNumber:      (*hexutil.Big)(big.NewInt(MockHeight)),
+		BlockNumber:      (*hexutil.Big)(big.NewInt(MockHeight8)),
 		From:             fromEvmAddr,
 		To:               &to,
 		Input:            []byte{1, 2, 3},

evmrpc/filter.go

@@ -360,16 +360,13 @@ func (f *LogFetcher) FindBlockesByBloom(begin, end int64, filters [][]bloomIndex
 
 func (f *LogFetcher) FindLogsByBloom(height int64, filters [][]bloomIndexes) (res []*ethtypes.Log) {
 	ctx := f.ctxProvider(LatestCtxHeight)
-	block, err := blockByNumberWithRetry(context.Background(), f.tmClient, &height, 1)
-	if err != nil {
-		fmt.Printf("error getting block when querying logs: %s\n", err)
-		return
-	}
-
-	for _, hash := range getEvmTxHashesFromBlock(block, f.txConfig) {
+	for _, hash := range getTxHashesFromBlock(block, f.txConfig, f.includeSyntheticReceipts) {
 		receipt, err := f.k.GetReceipt(ctx, hash)
 		if err != nil {
-			ctx.Logger().Error(fmt.Sprintf("FindLogsByBloom: unable to find receipt for hash %s", hash.Hex()))
+			// ignore the error if receipt is not found when includeSyntheticReceipts is true
+			if !f.includeSyntheticReceipts {
+				ctx.Logger().Error(fmt.Sprintf("FindLogsByBloom: unable to find receipt for hash %s", hash.Hex()))
+			}
 			continue
 		}
 		if !f.includeSyntheticReceipts && (receipt.TxType == ShellEVMTxType || receipt.EffectiveGasPrice == 0) {

evmrpc/filter_test.go

@@ -1,7 +1,6 @@
 package evmrpc_test
 
 import (
-	"fmt"
 	"testing"
 	"time"
 
@@ -202,8 +201,8 @@ func TestFilterSeiGetLogs(t *testing.T) {
 	testFilterGetLogs(t, "sei", []GetFilterLogTests{
 		{
 			name:      "filter by single synthetic address",
-			fromBlock: "0x8",
-			toBlock:   "0x8",
+			fromBlock: "0x64",
+			toBlock:   "0x64",
 			addrs:     []common.Address{common.HexToAddress("0x1111111111111111111111111111111111111116")},
 			wantErr:   false,
 			check: func(t *testing.T, log map[string]interface{}) {
@@ -212,21 +211,18 @@ func TestFilterSeiGetLogs(t *testing.T) {
 			wantLen: 1,
 		},
 		{
-			name:    "filter by single topic with default range, include synethetic logs",
-			topics:  [][]common.Hash{{common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000234")}},
-			wantErr: false,
+			name:      "filter by single topic, include synethetic logs",
+			topics:    [][]common.Hash{{common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000234")}},
+			wantErr:   false,
+			fromBlock: "0x64",
+			toBlock:   "0x64",
 			check: func(t *testing.T, log map[string]interface{}) {
 				require.Equal(t, "0x0000000000000000000000000000000000000000000000000000000000000234", log["topics"].([]interface{})[0].(string))
 			},
 			wantLen: 1,
 		},
-	})
-}
-
-func TestFilterEthEndpointCanReturnSyntheticLogs(t *testing.T) {
-	testFilterGetLogs(t, "eth", []GetFilterLogTests{
 		{
-			name:    "filter by single topic with default range, still include synthetic logs",
+			name:    "filter by single topic with default range, include synethetic logs",
 			topics:  [][]common.Hash{{common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000234")}},
 			wantErr: false,
 			check: func(t *testing.T, log map[string]interface{}) {
@@ -257,7 +253,6 @@ func TestFilterEthEndpointReturnsNormalEvmLogEvenIfSyntheticLogIsInSameBlock(t *
 func testFilterGetLogs(t *testing.T, namespace string, tests []GetFilterLogTests) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			fmt.Println(tt.name)
 			filterCriteria := map[string]interface{}{
 				"address": tt.addrs,
 				"topics":  tt.topics,
@@ -302,7 +297,7 @@ func TestFilterGetFilterLogs(t *testing.T) {
 
 	resObj = sendRequest(t, TestPort, "getFilterLogs", filterId)
 	logs := resObj["result"].([]interface{})
-	require.Equal(t, 6, len(logs))
+	require.Equal(t, 4, len(logs))
 	for _, log := range logs {
 		logObj := log.(map[string]interface{})
 		require.Equal(t, "0x2", logObj["blockNumber"].(string))