Set log index across all transactions in a block (#2067)

Author: codchen

app/receipt.go

@@ -118,7 +118,7 @@ func (app *App) AddCosmosEventsToEVMReceiptIfApplicable(ctx sdk.Context, tx sdk.
 		for i, l := range r.Logs {
 			l.Index = uint32(i)
 		}
-		bloom = ethtypes.CreateBloom(ethtypes.Receipts{&ethtypes.Receipt{Logs: evmkeeper.GetLogsForTx(r)}})
+		bloom = ethtypes.CreateBloom(ethtypes.Receipts{&ethtypes.Receipt{Logs: evmkeeper.GetLogsForTx(r, 0)}})
 		r.LogsBloom = bloom[:]
 		_ = app.EvmKeeper.SetTransientReceipt(wasmToEvmEventCtx, txHash, r)
 	} else {

evmrpc/filter.go

@@ -423,6 +423,7 @@ func (f *LogFetcher) GetLogsForBlock(block *coretypes.ResultBlock, crit filters.
 
 func (f *LogFetcher) FindLogsByBloom(block *coretypes.ResultBlock, filters [][]bloomIndexes) (res []*ethtypes.Log) {
 	ctx := f.ctxProvider(LatestCtxHeight)
+	totalLogs := uint(0)
 	for _, hash := range getTxHashesFromBlock(block, f.txConfig, f.includeSyntheticReceipts) {
 		receipt, err := f.k.GetReceipt(ctx, hash)
 		if err != nil {
@@ -436,8 +437,9 @@ func (f *LogFetcher) FindLogsByBloom(block *coretypes.ResultBlock, filters [][]b
 			continue
 		}
 		if len(receipt.LogsBloom) > 0 && MatchFilters(ethtypes.Bloom(receipt.LogsBloom), filters) {
-			res = append(res, keeper.GetLogsForTx(receipt)...)
+			res = append(res, keeper.GetLogsForTx(receipt, totalLogs)...)
 		}
+		totalLogs += uint(len(receipt.Logs))
 	}
 	return
 }

evmrpc/tx.go

@@ -350,7 +350,7 @@ func GetEvmTxIndex(txs tmtypes.Txs, txIndex uint32, decoder sdk.TxDecoder, recei
 func encodeReceipt(receipt *types.Receipt, decoder sdk.TxDecoder, block *coretypes.ResultBlock, receiptChecker func(common.Hash) bool) (map[string]interface{}, error) {
 	blockHash := block.BlockID.Hash
 	bh := common.HexToHash(blockHash.String())
-	logs := keeper.GetLogsForTx(receipt)
+	logs := keeper.GetLogsForTx(receipt, 0)
 	for _, log := range logs {
 		log.BlockHash = bh
 	}

x/evm/keeper/log.go

@@ -61,19 +61,19 @@ func (k *Keeper) GetLegacyBlockBloomCutoffHeight(ctx sdk.Context) int64 {
 	return int64(binary.BigEndian.Uint64(bz))
 }
 
-func GetLogsForTx(receipt *types.Receipt) []*ethtypes.Log {
-	return utils.Map(receipt.Logs, func(l *types.Log) *ethtypes.Log { return convertLog(l, receipt) })
+func GetLogsForTx(receipt *types.Receipt, logStartIndex uint) []*ethtypes.Log {
+	return utils.Map(receipt.Logs, func(l *types.Log) *ethtypes.Log { return convertLog(l, receipt, logStartIndex) })
 }
 
-func convertLog(l *types.Log, receipt *types.Receipt) *ethtypes.Log {
+func convertLog(l *types.Log, receipt *types.Receipt, logStartIndex uint) *ethtypes.Log {
 	return &ethtypes.Log{
 		Address:     common.HexToAddress(l.Address),
 		Topics:      utils.Map(l.Topics, common.HexToHash),
 		Data:        l.Data,
 		BlockNumber: receipt.BlockNumber,
 		TxHash:      common.HexToHash(receipt.TxHashHex),
 		TxIndex:     uint(receipt.TransactionIndex),
-		Index:       uint(l.Index)}
+		Index:       uint(l.Index) + logStartIndex}
 }
 
 func ConvertEthLog(l *ethtypes.Log) *types.Log {

x/evm/keeper/log_test.go

@@ -69,7 +69,7 @@ func TestGetLogsForTx(t *testing.T) {
 	}
 
 	// Convert the types.Receipt to a list of ethtypes.Log objects
-	logs := keeper.GetLogsForTx(receipt)
+	logs := keeper.GetLogsForTx(receipt, 0)
 
 	// Check that the fields match
 	require.Equal(t, len(receipt.Logs), len(logs))
@@ -82,6 +82,13 @@ func TestGetLogsForTx(t *testing.T) {
 		require.Equal(t, receipt.Logs[i].Data, log.Data)
 		require.Equal(t, uint(receipt.Logs[i].Index), log.Index)
 	}
+
+	// non-zero starting index
+	logs = keeper.GetLogsForTx(receipt, 5)
+	require.Equal(t, len(receipt.Logs), len(logs))
+	for i, log := range logs {
+		require.Equal(t, uint(receipt.Logs[i].Index+5), log.Index)
+	}
 }
 
 func TestLegacyBlockBloomCutoffHeight(t *testing.T) {