fix: evm tx index and log indexes are not patched

CHANGELOG.md

@@ -34,6 +34,7 @@
 - [\#774](https://github.com/cosmos/evm/pull/774) Emit proper allowance amount in erc20 event.
 - [\#790](https://github.com/cosmos/evm/pull/790) fix panic in historical query due to missing EvmCoinInfo.
 - [\#800](https://github.com/cosmos/evm/pull/800) Fix denom exponent validation in virtual fee deduct in vm module.
+- [\#812](https://github.com/cosmos/evm/pull/812) Patch evm tx index and log indexes, cleanup EmitTxHashEvent and ResetTransientGasUsed.
 - [\#817](https://github.com/cosmos/evm/pull/817) Align GetCoinbaseAddress to handle empty proposer address in contexts like CheckTx where proposer doesn't exist.
 - [\#814](https://github.com/cosmos/evm/pull/814) Fix duplicated events in post tx processor.
 - [\#816](https://github.com/cosmos/evm/pull/816) Avoid nil pointer when RPC requests execute before evmCoinInfo initialization in PreBlock with defaultEvmCoinInfo fallback.

ante/evm/mono_decorator.go

@@ -257,9 +257,6 @@ func (md MonoDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, ne
 		return ctx, err
 	}
 
-	// Emit event unconditionally - ctx.TxIndex() will be valid during block execution
-	EmitTxHashEvent(ctx, ethMsg, uint64(ctx.TxIndex())) // #nosec G115 -- no overlfow here
-
 	if err := CheckTxFee(txFeeInfo, decUtils.TxFee, decUtils.TxGasLimit); err != nil {
 		return ctx, err
 	}

evmd/app.go

@@ -1,6 +1,7 @@
 package evmd
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -9,17 +10,16 @@ import (
 
 	goruntime "runtime"
 
+	cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
+
 	"github.com/spf13/cast"
 
 	// Force-load the tracer engines to trigger registration due to Go-Ethereum v1.10.15 changes
-	"github.com/cosmos/cosmos-sdk/baseapp/txnrunner"
 	"github.com/ethereum/go-ethereum/common"
-
 	_ "github.com/ethereum/go-ethereum/eth/tracers/js"
 	_ "github.com/ethereum/go-ethereum/eth/tracers/native"
 
 	abci "github.com/cometbft/cometbft/abci/types"
-
 	dbm "github.com/cosmos/cosmos-db"
 	evmante "github.com/cosmos/evm/ante"
 	antetypes "github.com/cosmos/evm/ante/types"
@@ -64,6 +64,7 @@ import (
 	storetypes "cosmossdk.io/store/types"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
+	"github.com/cosmos/cosmos-sdk/baseapp/txnrunner"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/grpc/cmtservice"
@@ -147,6 +148,19 @@ var (
 	_ ibctesting.TestingApp       = (*EVMD)(nil)
 )
 
+type customRunner struct {
+	*txnrunner.STMRunner
+}
+
+func (r *customRunner) Run(ctx context.Context, ms storetypes.MultiStore, txs [][]byte, deliverTx sdk.DeliverTxFunc) ([]*abci.ExecTxResult, error) {
+	results, err := r.STMRunner.Run(ctx, ms, txs, deliverTx)
+	if err != nil {
+		return nil, err
+	}
+
+	return evmtypes.PatchTxResponses(results), nil
+}
+
 // EVMD extends an ABCI application, but with most of its parameters exported.
 type EVMD struct {
 	*baseapp.BaseApp
@@ -214,6 +228,7 @@ func NewExampleApp(
 	legacyAmino := encodingConfig.Amino
 	interfaceRegistry := encodingConfig.InterfaceRegistry
 	txConfig := encodingConfig.TxConfig
+	txDecoder := encodingConfig.TxConfig.TxDecoder()
 
 	// enable optimistic execution
 	baseAppOptions = append(
@@ -226,7 +241,7 @@ func NewExampleApp(
 		logger,
 		db,
 		// use transaction decoder to support the sdk.Tx interface instead of sdk.StdTx
-		encodingConfig.TxConfig.TxDecoder(),
+		txDecoder,
 		baseAppOptions...,
 	)
 	bApp.SetCommitMultiStoreTracer(traceStore)
@@ -254,15 +269,6 @@ func NewExampleApp(
 		nonTransientKeys = append(nonTransientKeys, k)
 	}
 
-	// enable block stm for parallel execution
-	bApp.SetBlockSTMTxRunner(txnrunner.NewSTMRunner(
-		encodingConfig.TxConfig.TxDecoder(),
-		nonTransientKeys,
-		min(goruntime.GOMAXPROCS(0), goruntime.NumCPU()),
-		true,
-		func(ms storetypes.MultiStore) string { return sdk.DefaultBondDenom },
-	))
-
 	// disable block gas meter
 	bApp.SetDisableBlockGasMeter(true)
 
@@ -780,6 +786,19 @@ func NewExampleApp(
 		}
 	}
 
+	// enable block stm for parallel execution
+	bApp.SetBlockSTMTxRunner(&customRunner{
+		STMRunner: txnrunner.NewSTMRunner(
+			txDecoder,
+			nonTransientKeys,
+			min(goruntime.GOMAXPROCS(0), goruntime.NumCPU()),
+			true,
+			func(ms storetypes.MultiStore) string {
+				return app.EVMKeeper.GetParams(sdk.NewContext(ms, cmtproto.Header{}, false, log.NewNopLogger())).EvmDenom
+			},
+		),
+	})
+
 	return app
 }
 

evmd/tests/integration/balance_handler/balance_handler_test.go

@@ -91,7 +91,7 @@ func (s *BalanceHandlerTestSuite) TestRecursivePrecompileCallsWithDebugPrecompil
 	s.Require().NoError(err, "callback transaction should succeed")
 	s.Require().False(res.IsErr(), "callback should not fail: %s", res.Events)
 
-	s.Require().Equal(len(res.Events), 15, "callback should have 15 events")
+	s.Require().Equal(15, len(res.Events), "callback should have 15 events")
 	debug_count := 0
 	for _, event := range res.Events {
 		if event.Type == "debug_precompile" {

local_node.sh

@@ -273,7 +273,6 @@ 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

@@ -306,6 +306,15 @@ func (b *Backend) ReceiptsFromCometBlock(
 			return nil, fmt.Errorf("failed to convert tx result to eth receipt: %w", err)
 		}
 
+		if txResult.EthTxIndex == -1 {
+			var err error
+			// Fallback to find tx index by iterating all valid eth transactions
+			txResult.EthTxIndex, err = FindEthTxIndexByHash(ctx, ethMsg.Hash(), resBlock, blockRes, b)
+			if err != nil {
+				return nil, err
+			}
+		}
+
 		bloom := ethtypes.CreateBloom(&ethtypes.Receipt{Logs: logs})
 
 		receipt := &ethtypes.Receipt{

rpc/backend/tx_info.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"math"
 	"math/big"
 	"time"
 
@@ -66,22 +65,13 @@ func (b *Backend) GetTransactionByHash(ctx context.Context, txHash common.Hash)
 	}
 
 	if res.EthTxIndex == -1 {
+		var err error
 		// Fallback to find tx index by iterating all valid eth transactions
-		msgs := b.EthMsgsFromCometBlock(ctx, block, blockRes)
-		for i := range msgs {
-			if msgs[i].Hash() == txHash {
-				if i > math.MaxInt32 {
-					return nil, errors.New("tx index overflow")
-				}
-				res.EthTxIndex = int32(i) //#nosec G115 -- checked for int overflow already
-				break
-			}
+		res.EthTxIndex, err = FindEthTxIndexByHash(ctx, txHash, block, blockRes, b)
+		if err != nil {
+			return nil, err
 		}
 	}
-	// if we still unable to find the eth tx index, return error, shouldn't happen.
-	if res.EthTxIndex == -1 {
-		return nil, errors.New("can't find index of ethereum tx")
-	}
 
 	baseFee, err := b.BaseFee(ctx, blockRes)
 	if err != nil {

rpc/backend/utils.go

@@ -355,3 +355,17 @@ func unwrapBlockNOrHash(blockNOrHash types.BlockNumberOrHash) string {
 	}
 	return ""
 }
+
+// Fallback to find tx index by iterating all valid eth transactions for legacy blocks that don't have AttributeKeyTxIndex in events
+func FindEthTxIndexByHash(ctx context.Context, txHash common.Hash, block *cmtrpctypes.ResultBlock, blockRes *cmtrpctypes.ResultBlockResults, b *Backend) (int32, error) {
+	msgs := b.EthMsgsFromCometBlock(ctx, block, blockRes)
+	for i := range msgs {
+		if msgs[i].Hash() == txHash {
+			if i > math.MaxInt32 {
+				return -1, fmt.Errorf("tx index overflow")
+			}
+			return int32(i), nil //#nosec G115 -- checked for int overflow already
+		}
+	}
+	return -1, fmt.Errorf("can't find index of ethereum tx")
+}

rpc/types/events.go

@@ -188,6 +188,10 @@ func (p *ParsedTxs) updateTx(eventIndex int, attrs []abci.EventAttribute) error
 		// if hash is different, index the new one too
 		p.TxHashes[tx.Hash] = eventIndex
 	}
+	// preserve EthTxIndex from the first event set by PatchTxResponses if not set in the second event from msg_server
+	if tx.EthTxIndex == -1 {
+		tx.EthTxIndex = p.Txs[eventIndex].EthTxIndex
+	}
 	// override the tx because the second event is more trustworthy
 	p.Txs[eventIndex] = tx
 	return nil