fix: wrong TransactionIndex in receipt (#806)

* fix: wrong TransactionIndex in receipt

* enable indexer

Author: mmsqe

CHANGELOG.md

@@ -48,7 +48,7 @@
 - [\#687](https://github.com/cosmos/evm/pull/687) Avoid blocking node shutdown when evm indexer is enabled, log startup failures instead of using errgroup.
 - [\#689](https://github.com/cosmos/evm/pull/689) Align debug addr for hex address.
 - [\#668](https://github.com/cosmos/evm/pull/668) Fix panic in legacy mempool when Reset() was called with a skipped header between old and new block.
-- [\#723](https://github.com/cosmos/evm/pull/723) Fix TransactionIndex in receipt generation to use actual EthTxIndex instead of loop index.
+- [\#723](https://github.com/cosmos/evm/pull/723), [\#806](https://github.com/cosmos/evm/pull/806) Fix TransactionIndex in receipt generation to use actual EthTxIndex instead of loop index.
 - [\#729](https://github.com/cosmos/evm/pull/729) Remove non-deterministic state mutation from EVM pre-blocker.
 - [\#725](https://github.com/cosmos/evm/pull/725) Fix inconsistent block hash in json-rpc.
 - [\#727](https://github.com/cosmos/evm/pull/727) Avoid nil pointer for `tx evm raw` due to uninitialized EVM coin info.

local_node.sh

@@ -272,6 +272,7 @@ if [[ $overwrite == "y" || $overwrite == "Y" ]]; then
   sed -i.bak 's/prometheus-retention-time  = "0"/prometheus-retention-time  = "1000000000000"/g' "$APP_TOML"
   sed -i.bak 's/enabled = false/enabled = true/g' "$APP_TOML"
   sed -i.bak 's/enable = false/enable = true/g' "$APP_TOML"
+  sed -i.bak 's/enable-indexer = false/enable-indexer = true/g' "$APP_TOML"
 
   # --------- maybe generate additional users ---------
   # start with provided/default list

rpc/backend/comet_to_eth.go

@@ -296,7 +296,7 @@ func (b *Backend) ReceiptsFromCometBlock(
 			// transaction corresponding to this receipt.
 			BlockHash:        blockHash,
 			BlockNumber:      big.NewInt(resBlock.Block.Height),
-			TransactionIndex: uint(i), // #nosec G115 -- no overflow here
+			TransactionIndex: uint(txResult.EthTxIndex), // #nosec G115 -- checked for int overflow already
 		}
 
 		receipts[i] = receipt

rpc/backend/tx_info_test.go

@@ -467,21 +467,20 @@ func TestReceiptsFromCometBlock(t *testing.T) {
 	}
 	tcs := []struct {
 		name       string
-		ethTxIndex int
+		ethTxIndex int32
 	}{
 		{"tx_with_index_5", 5},
 		{"tx_with_index_10", 10},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.name, func(t *testing.T) {
-			var msgs []*evmtypes.MsgEthereumTx
-			for range tc.ethTxIndex + 1 {
-				msgs = append(msgs, buildMsgEthereumTx(t))
+			msgs := []*evmtypes.MsgEthereumTx{
+				buildMsgEthereumTx(t),
 			}
 			expectedTxResult := &servertypes.TxResult{
 				Height:     height,
 				TxIndex:    0,
-				EthTxIndex: int32(tc.ethTxIndex), // #nosec G115 -- no overflow here
+				EthTxIndex: tc.ethTxIndex,
 				MsgIndex:   0,
 			}
 			mockIndexer := &MockIndexer{
@@ -494,13 +493,13 @@ func TestReceiptsFromCometBlock(t *testing.T) {
 			mockEVMQueryClient.On("BaseFee", mock.Anything, mock.Anything).Return(&evmtypes.QueryBaseFeeResponse{}, nil)
 			receipts, err := backend.ReceiptsFromCometBlock(resBlock, blockRes, msgs)
 			require.NoError(t, err)
-			require.Len(t, receipts, tc.ethTxIndex+1)
-			actualTxIndex := receipts[tc.ethTxIndex].TransactionIndex
+			require.Len(t, receipts, 1)
+			actualTxIndex := receipts[0].TransactionIndex
 			require.NotEqual(t, uint(0), actualTxIndex)
 			require.Equal(t, uint(tc.ethTxIndex), actualTxIndex) // #nosec G115
-			require.Equal(t, msgs[tc.ethTxIndex].Hash(), receipts[tc.ethTxIndex].TxHash)
-			require.Equal(t, big.NewInt(height), receipts[tc.ethTxIndex].BlockNumber)
-			require.Equal(t, ethtypes.ReceiptStatusSuccessful, receipts[tc.ethTxIndex].Status)
+			require.Equal(t, msgs[0].Hash(), receipts[0].TxHash)
+			require.Equal(t, big.NewInt(height), receipts[0].BlockNumber)
+			require.Equal(t, ethtypes.ReceiptStatusSuccessful, receipts[0].Status)
 		})
 	}
 }