add fallback

Author: mmsqe

rpc/backend/blocks.go

@@ -2,6 +2,7 @@ package backend
 
 import (
 	"fmt"
+	"math"
 	"math/big"
 	"strconv"
 
@@ -568,6 +569,7 @@ func (b *Backend) GetBlockReceipts(
 		result[i], err = b.formatTxReceipt(
 			msg,
 			txResult,
+			resBlock,
 			blockRes,
 			blockHash,
 		)
@@ -582,6 +584,7 @@ func (b *Backend) GetBlockReceipts(
 func (b *Backend) formatTxReceipt(
 	ethMsg *evmtypes.MsgEthereumTx,
 	txResult *cosmosevmtypes.TxResult,
+	resBlock *cmtrpctypes.ResultBlock,
 	blockRes *cmtrpctypes.ResultBlockResults,
 	blockHeaderHash string,
 ) (map[string]interface{}, error) {
@@ -626,6 +629,20 @@ func (b *Backend) formatTxReceipt(
 		b.Logger.Debug("failed to parse logs", "hash", ethMsg.Hash().String(), "error", err.Error())
 	}
 
+	if txResult.EthTxIndex == -1 {
+		// Fallback to find tx index by iterating all valid eth transactions
+		msgs := b.EthMsgsFromCometBlock(resBlock, blockRes)
+		for i := range msgs {
+			if msgs[i].Hash() == ethTx.Hash() {
+				if i > math.MaxInt32 {
+					return nil, errors.New("tx index overflow")
+				}
+				txResult.EthTxIndex = int32(i) //#nosec G115 -- checked for int overflow already
+				break
+			}
+		}
+	}
+
 	// return error if still unable to find the eth tx index
 	if txResult.EthTxIndex == -1 {
 		return nil, fmt.Errorf("can't find index of ethereum tx")

rpc/backend/tx_info.go

@@ -191,7 +191,7 @@ func (b *Backend) GetTransactionReceipt(hash common.Hash) (map[string]interface{
 
 	ethMsg := tx.GetMsgs()[res.MsgIndex].(*evmtypes.MsgEthereumTx)
 	blockHeaderHash := common.BytesToHash(resBlock.Block.Header.Hash()).Hex()
-	return b.formatTxReceipt(ethMsg, res, blockRes, blockHeaderHash)
+	return b.formatTxReceipt(ethMsg, res, resBlock, blockRes, blockHeaderHash)
 }
 
 // GetTransactionLogs returns the transaction logs identified by hash.