refactor: utils function

Author: canu0205

rpc/backend/comet_to_eth.go

@@ -310,10 +310,7 @@ func (b *Backend) ReceiptsFromCometBlock(
 		// reassign log indices to be block-global per Ethereum spec.
 		// statedb assigns per-tx indices starting at 0 for Block STM compatibility,
 		// so we apply the cumulative offset here at the RPC layer.
-		for _, log := range logs {
-			log.Index = cumulatedLogIndex
-			cumulatedLogIndex++
-		}
+		cumulatedLogIndex = assignBlockGlobalLogIndices(logs, cumulatedLogIndex)
 
 		bloom := ethtypes.CreateBloom(&ethtypes.Receipt{Logs: logs})
 

rpc/backend/tx_info.go

@@ -25,7 +25,6 @@ import (
 	rpctypes "github.com/cosmos/evm/rpc/types"
 	servertypes "github.com/cosmos/evm/server/types"
 	evmtrace "github.com/cosmos/evm/trace"
-	"github.com/cosmos/evm/utils"
 	evmtypes "github.com/cosmos/evm/x/vm/types"
 
 	errorsmod "cosmossdk.io/errors"
@@ -210,6 +209,10 @@ func (b *Backend) GetTransactionReceipt(ctx context.Context, hash common.Hash) (
 		return nil, fmt.Errorf("failed to get receipts from comet block")
 	}
 
+	// fix log indices to be block-global per Ethereum spec
+	offset := countPriorBlockLogs(blockRes.TxsResults, res.TxIndex, blockRes.Height)
+	assignBlockGlobalLogIndices(receipts[0].Logs, offset)
+
 	var signer ethtypes.Signer
 	ethTx := ethMsg.AsTransaction()
 	if ethTx.Protected() {
@@ -248,36 +251,21 @@ func (b *Backend) GetTransactionLogs(ctx context.Context, hash common.Hash) (res
 		b.Logger.Debug("block result not found", "number", res.Height, "error", err.Error())
 		return nil, nil
 	}
-	height, err := utils.SafeUint64(resBlockResult.Height)
-	if err != nil {
-		return nil, err
-	}
-	// compute cumulative log index offset from prior txs in the block
-	cumulatedLogIndex := uint(0)
-	for ti := int64(0); ti < int64(res.TxIndex); ti++ {
-		priorLogs, err := evmtypes.DecodeTxLogs(resBlockResult.TxsResults[ti].Data, height)
-		if err != nil {
-			continue
-		}
-		cumulatedLogIndex += uint(len(priorLogs))
-	}
+	offset := countPriorBlockLogs(resBlockResult.TxsResults, res.TxIndex, resBlockResult.Height)
 
 	// parse tx logs from events
 	index := int(res.MsgIndex) // #nosec G701
 	logs, err := evmtypes.DecodeMsgLogs(
 		resBlockResult.TxsResults[res.TxIndex].Data,
 		index,
-		height,
+		uint64(resBlockResult.Height), // #nosec G115 -- block heights are always positive
 	)
 	if err != nil {
 		b.Logger.Debug("failed to parse tx logs", "error", err.Error())
 	}
 
-	// reassign log indices to be block-global per Ethereum spec
-	for _, log := range logs {
-		log.Index = cumulatedLogIndex
-		cumulatedLogIndex++
-	}
+	// fix log indices to be block-global per Ethereum spec
+	assignBlockGlobalLogIndices(logs, offset)
 
 	return logs, nil
 }

rpc/backend/utils.go

@@ -326,15 +326,39 @@ func GetLogsFromBlockResults(blockRes *cmtrpctypes.ResultBlockResults) ([][]*eth
 			return nil, err
 		}
 		// reassign log indices to be block-global per Ethereum spec
-		for _, log := range logs {
-			log.Index = cumulatedLogIndex
-			cumulatedLogIndex++
-		}
+		cumulatedLogIndex = assignBlockGlobalLogIndices(logs, cumulatedLogIndex)
 		blockLogs = append(blockLogs, logs)
 	}
 	return blockLogs, nil
 }
 
+// countPriorBlockLogs returns the total number of EVM logs in all Cosmos txs
+// before txIndex within the given block results. This offset is needed to
+// produce block-global log indices per the Ethereum JSON-RPC spec.
+// TODO: store latest N blocks logindex for optimization
+func countPriorBlockLogs(txsResults []*abci.ExecTxResult, txIndex uint32, blockHeight int64) uint {
+	height := uint64(blockHeight) // #nosec G115 -- block heights are always positive
+	offset := uint(0)
+	for i := uint32(0); i < txIndex; i++ {
+		logs, err := evmtypes.DecodeTxLogs(txsResults[i].Data, height)
+		if err != nil {
+			continue
+		}
+		offset += uint(len(logs))
+	}
+	return offset
+}
+
+// assignBlockGlobalLogIndices sets block-global log indices on the given logs
+// starting from startIndex. Returns the next available index.
+func assignBlockGlobalLogIndices(logs []*ethtypes.Log, startIndex uint) uint {
+	for _, log := range logs {
+		log.Index = startIndex
+		startIndex++
+	}
+	return startIndex
+}
+
 // GetHexProofs returns list of hex data of proof op
 func GetHexProofs(proof *crypto.ProofOps) []string {
 	if proof == nil {

tests/systemtests/main_test.go

@@ -9,7 +9,6 @@ import (
 	"github.com/cosmos/evm/tests/systemtests/chainupgrade"
 	"github.com/cosmos/evm/tests/systemtests/eip712"
 	"github.com/cosmos/evm/tests/systemtests/logindex"
-
 	"github.com/cosmos/evm/tests/systemtests/mempool"
 	"github.com/cosmos/evm/tests/systemtests/suite"