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
 

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