add fallback

* align patch
* cleanup

Author: mmsqe

CHANGELOG.md

@@ -25,6 +25,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.
 
 ## v0.5.0
 

rpc/backend/comet_to_eth.go

@@ -2,6 +2,7 @@ package backend
 
 import (
 	"fmt"
+	"math"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -273,6 +274,20 @@ func (b *Backend) ReceiptsFromCometBlock(
 			return nil, fmt.Errorf("failed to convert tx result to eth receipt: %w", err)
 		}
 
+		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() == ethMsg.Hash() {
+					if i > math.MaxInt32 {
+						return nil, errors.New("tx index overflow")
+					}
+					txResult.EthTxIndex = int32(i) //#nosec G115 -- checked for int overflow already
+					break
+				}
+			}
+		}
+
 		bloom := ethtypes.CreateBloom(&ethtypes.Receipt{Logs: logs})
 
 		receipt := &ethtypes.Receipt{

x/vm/keeper/config.go

@@ -38,8 +38,8 @@ func (k *Keeper) EVMConfig(ctx sdk.Context, proposerAddress sdk.ConsAddress) (*s
 // TxConfig loads `TxConfig` from current transient storage
 func (k *Keeper) TxConfig(ctx sdk.Context, txHash common.Hash) statedb.TxConfig {
 	return statedb.NewTxConfig(
-		txHash,              // TxHash
-		uint(ctx.TxIndex()), //#nosec G115 // TxIndex
+		txHash, // TxHash
+		0,
 	)
 }
 

x/vm/keeper/state_transition.go

@@ -244,7 +244,6 @@ func (k *Keeper) ApplyTransaction(ctx sdk.Context, tx *ethtypes.Transaction) (*t
 		GasUsed:           res.GasUsed,
 		BlockHash:         common.BytesToHash(ctx.HeaderHash()),
 		BlockNumber:       big.NewInt(ctx.BlockHeight()),
-		TransactionIndex:  uint(ctx.TxIndex()), //#nosec G115
 	}
 
 	if res.Failed() {

x/vm/types/response.go

@@ -28,9 +28,11 @@ func PatchTxResponses(input []*abci.ExecTxResult) []*abci.ExecTxResult {
 			panic(err)
 		}
 
-		var dataDirty bool
-		ethTxHashes := make(map[string]uint64)
-
+		var (
+			anteEvents []abci.Event
+			// if the response data is modified and need to be marshaled back
+			dataDirty bool
+		)
 		for i, rsp := range txMsgData.MsgResponses {
 			var response MsgEthereumTxResponse
 			if rsp.TypeUrl != "/"+proto.MessageName(&response) {
@@ -41,7 +43,13 @@ func PatchTxResponses(input []*abci.ExecTxResult) []*abci.ExecTxResult {
 				panic(err)
 			}
 
-			ethTxHashes[response.Hash] = txIndex
+			anteEvents = append(anteEvents, abci.Event{
+				Type: EventTypeEthereumTx,
+				Attributes: []abci.EventAttribute{
+					{Key: AttributeKeyEthereumTxHash, Value: response.Hash},
+					{Key: AttributeKeyTxIndex, Value: strconv.FormatUint(txIndex, 10)},
+				},
+			})
 
 			if len(response.Logs) > 0 {
 				for _, log := range response.Logs {
@@ -62,32 +70,21 @@ func PatchTxResponses(input []*abci.ExecTxResult) []*abci.ExecTxResult {
 			txIndex++
 		}
 
-		for i := range res.Events {
-			if res.Events[i].Type == EventTypeEthereumTx {
-				var txHash string
-				for _, attr := range res.Events[i].Attributes {
-					if attr.Key == AttributeKeyEthereumTxHash {
-						txHash = attr.Value
-						break
-					}
-				}
+		if len(anteEvents) > 0 {
+			// prepend ante events in front to emulate the side effect of `EthEmitEventDecorator`
+			events := make([]abci.Event, len(anteEvents)+len(res.Events))
+			copy(events, anteEvents)
+			copy(events[len(anteEvents):], res.Events)
+			res.Events = events
 
-				if idx, ok := ethTxHashes[txHash]; ok {
-					res.Events[i].Attributes = append(res.Events[i].Attributes, abci.EventAttribute{
-						Key:   AttributeKeyTxIndex,
-						Value: strconv.FormatUint(idx, 10),
-					})
+			if dataDirty {
+				data, err := proto.Marshal(&txMsgData)
+				if err != nil {
+					panic(err)
 				}
-			}
-		}
 
-		if dataDirty {
-			data, err := proto.Marshal(&txMsgData)
-			if err != nil {
-				panic(err)
+				res.Data = data
 			}
-
-			res.Data = data
 		}
 	}
 	return input