try out to revert hash in tx proto

skosito · skosito · commit a5fd23d63da8 · 2025-11-04T01:11:59.000+01:00
diff --git a/ante/evm/11_emit_event.go b/ante/evm/11_emit_event.go
@@ -57,7 +57,7 @@ func EmitTxHashEvent(ctx sdk.Context, msg *evmtypes.MsgEthereumTx, blockTxIndex,
 	ctx.EventManager().EmitEvent(
 		sdk.NewEvent(
 			evmtypes.EventTypeEthereumTx,
-			sdk.NewAttribute(evmtypes.AttributeKeyEthereumTxHash, msg.Hash().String()),
+			sdk.NewAttribute(evmtypes.AttributeKeyEthereumTxHash, msg.Hash),
 			sdk.NewAttribute(evmtypes.AttributeKeyTxIndex, strconv.FormatUint(blockTxIndex+msgIndex, 10)), // #nosec G115
 		),
 	)
diff --git a/ante/tx_listener.go b/ante/tx_listener.go
@@ -27,7 +27,7 @@ func (d TxListenerDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate boo
 	if ctx.IsCheckTx() && !simulate && d.pendingTxListener != nil {
 		for _, msg := range tx.GetMsgs() {
 			if ethTx, ok := msg.(*evmtypes.MsgEthereumTx); ok {
-				d.pendingTxListener(ethTx.Hash())
+				d.pendingTxListener(common.HexToHash(ethTx.Hash))
 			}
 		}
 	}
diff --git a/api/cosmos/evm/vm/v1/tx.pulsar.go b/api/cosmos/evm/vm/v1/tx.pulsar.go
diff --git a/indexer/kv_indexer.go b/indexer/kv_indexer.go
@@ -82,7 +82,7 @@ func (kv *KVIndexer) IndexBlock(block *cmttypes.Block, txResults []*abci.ExecTxR
 		var cumulativeGasUsed uint64
 		for msgIndex, msg := range tx.GetMsgs() {
 			ethMsg := msg.(*evmtypes.MsgEthereumTx)
-			txHash := ethMsg.Hash()
+			txHash := ethMsg.Hash
 
 			txResult := servertypes.TxResult{
 				Height:     height,
@@ -112,7 +112,7 @@ func (kv *KVIndexer) IndexBlock(block *cmttypes.Block, txResults []*abci.ExecTxR
 			txResult.CumulativeGasUsed = cumulativeGasUsed
 			ethTxIndex++
 
-			if err := saveTxResult(kv.clientCtx.Codec, batch, txHash, &txResult); err != nil {
+			if err := saveTxResult(kv.clientCtx.Codec, batch, common.HexToHash(txHash), &txResult); err != nil {
 				return errorsmod.Wrapf(err, "IndexBlock %d", height)
 			}
 		}
diff --git a/mempool/mempool.go b/mempool/mempool.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"sync"
 
+	"github.com/ethereum/go-ethereum/common"
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/holiman/uint256"
 
@@ -224,7 +225,7 @@ func (m *ExperimentalEVMMempool) Insert(goCtx context.Context, tx sdk.Tx) error
 	ethMsg, err := m.getEVMMessage(tx)
 	if err == nil {
 		// Insert into EVM pool
-		hash := ethMsg.Hash()
+		hash := ethMsg.Hash
 		m.logger.Debug("inserting EVM transaction", "tx_hash", hash)
 		ethTxs := []*ethtypes.Transaction{ethMsg.AsTransaction()}
 		errs := m.txPool.Add(ethTxs, true)
@@ -320,7 +321,7 @@ func (m *ExperimentalEVMMempool) Remove(tx sdk.Tx) error {
 		// We should not do this with EVM transactions because removing them causes the subsequent ones to
 		// be dequeued as temporarily invalid, only to be requeued a block later.
 		// The EVM mempool handles removal based on account nonce automatically.
-		hash := msg.Hash()
+		hash := common.HexToHash(msg.Hash)
 		if m.shouldRemoveFromEVMPool(tx) {
 			m.logger.Debug("manually removing EVM transaction", "tx_hash", hash)
 			m.legacyTxPool.RemoveTx(hash, false, true)
diff --git a/proto/cosmos/evm/vm/v1/tx.proto b/proto/cosmos/evm/vm/v1/tx.proto
@@ -37,7 +37,8 @@ message MsgEthereumTx {
 
   option (gogoproto.goproto_getters) = false;
 
-  reserved 1, 2, 3, 4;
+  reserved 1, 2, 4;
+  string hash = 3;
 
   // from is the bytes of ethereum signer address. This address value is checked
   // against the address derived from the signature (V, R, S) using the
diff --git a/rpc/backend/comet_to_eth.go b/rpc/backend/comet_to_eth.go
@@ -237,9 +237,9 @@ func (b *Backend) ReceiptsFromCometBlock(
 	receipts := make([]*ethtypes.Receipt, len(msgs))
 	cumulatedGasUsed := uint64(0)
 	for i, ethMsg := range msgs {
-		txResult, err := b.GetTxByEthHash(ethMsg.Hash())
+		txResult, err := b.GetTxByEthHash(common.HexToHash(ethMsg.Hash))
 		if err != nil {
-			return nil, fmt.Errorf("tx not found: hash=%s, error=%s", ethMsg.Hash(), err.Error())
+			return nil, fmt.Errorf("tx not found: hash=%s, error=%s", common.HexToHash(ethMsg.Hash), err.Error())
 		}
 
 		cumulatedGasUsed += txResult.GasUsed
@@ -285,7 +285,7 @@ func (b *Backend) ReceiptsFromCometBlock(
 			Logs:              logs,
 
 			// Implementation fields: These fields are added by geth when processing a transaction.
-			TxHash:            ethMsg.Hash(),
+			TxHash:            common.HexToHash(ethMsg.Hash),
 			ContractAddress:   contractAddress,
 			GasUsed:           txResult.GasUsed,
 			EffectiveGasPrice: effectiveGasPrice,
diff --git a/rpc/backend/tx_info.go b/rpc/backend/tx_info.go
@@ -62,7 +62,7 @@ func (b *Backend) GetTransactionByHash(txHash common.Hash) (*rpctypes.RPCTransac
 		// Fallback to find tx index by iterating all valid eth transactions
 		msgs := b.EthMsgsFromCometBlock(block, blockRes)
 		for i := range msgs {
-			if msgs[i].Hash() == txHash {
+			if msgs[i].Hash == txHash.Hex() {
 				if i > math.MaxInt32 {
 					return nil, errors.New("tx index overflow")
 				}
@@ -113,7 +113,7 @@ func (b *Backend) GetTransactionByHashPending(txHash common.Hash) (*rpctypes.RPC
 			continue
 		}
 
-		if msg.Hash() == txHash {
+		if msg.Hash == txHash.Hex() {
 			// use zero block values since it's not included in a block yet
 			return rpctypes.NewTransactionFromMsg(
 				msg,
diff --git a/rpc/backend/tx_info_test.go b/rpc/backend/tx_info_test.go
@@ -485,7 +485,7 @@ func TestReceiptsFromCometBlock(t *testing.T) {
 			}
 			mockIndexer := &MockIndexer{
 				txResults: map[common.Hash]*servertypes.TxResult{
-					msgs[0].Hash(): expectedTxResult,
+					common.HexToHash(msgs[0].Hash): expectedTxResult,
 				},
 			}
 			backend.Indexer = mockIndexer
@@ -497,7 +497,7 @@ func TestReceiptsFromCometBlock(t *testing.T) {
 			actualTxIndex := receipts[0].TransactionIndex
 			require.NotEqual(t, uint(0), actualTxIndex)
 			require.Equal(t, uint(tc.ethTxIndex), actualTxIndex) // #nosec G115
-			require.Equal(t, msgs[0].Hash(), receipts[0].TxHash)
+			require.Equal(t, common.HexToHash(msgs[0].Hash), receipts[0].TxHash)
 			require.Equal(t, big.NewInt(height), receipts[0].BlockNumber)
 			require.Equal(t, ethtypes.ReceiptStatusSuccessful, receipts[0].Status)
 		})
diff --git a/tests/integration/rpc/backend/test_call_tx.go b/tests/integration/rpc/backend/test_call_tx.go
@@ -376,7 +376,7 @@ func (s *TestSuite) TestSendRawTransaction() {
 				bytes, _ := rlp.EncodeToBytes(ethTx.AsTransaction())
 				return bytes
 			},
-			ethTx.Hash(),
+			common.HexToHash(ethTx.Hash),
 			errortypes.ErrInvalidRequest.Error(),
 			false,
 		},
@@ -391,7 +391,7 @@ func (s *TestSuite) TestSendRawTransaction() {
 				RegisterBroadcastTx(client, txBytes)
 			},
 			func() []byte { return rlpEncodedBz },
-			ethTx.Hash(),
+			common.HexToHash(ethTx.Hash),
 			"",
 			true,
 		},
diff --git a/tests/integration/rpc/backend/test_tx_info.go b/tests/integration/rpc/backend/test_tx_info.go
@@ -115,7 +115,7 @@ func (s *TestSuite) TestGetTransactionByHash() {
 			err := s.backend.Indexer.IndexBlock(block, responseDeliver)
 			s.Require().NoError(err)
 
-			rpcTx, err := s.backend.GetTransactionByHash(tc.tx.Hash())
+			rpcTx, err := s.backend.GetTransactionByHash(common.HexToHash(tc.tx.Hash))
 
 			if tc.expPass {
 				s.Require().NoError(err)
@@ -175,7 +175,7 @@ func (s *TestSuite) TestGetTransactionsByHashPending() {
 			s.SetupTest() // reset
 			tc.registerMock()
 
-			rpcTx, err := s.backend.GetTransactionByHashPending(tc.tx.Hash())
+			rpcTx, err := s.backend.GetTransactionByHashPending(common.HexToHash(tc.tx.Hash))
 
 			if tc.expPass {
 				s.Require().NoError(err)
@@ -203,7 +203,7 @@ func (s *TestSuite) TestGetTxByEthHash() {
 			func() {
 				s.backend.Indexer = nil
 				client := s.backend.ClientCtx.Client.(*mocks.Client)
-				query := fmt.Sprintf("%s.%s='%s'", evmtypes.TypeMsgEthereumTx, evmtypes.AttributeKeyEthereumTxHash, msgEthereumTx.Hash().Hex())
+				query := fmt.Sprintf("%s.%s='%s'", evmtypes.TypeMsgEthereumTx, evmtypes.AttributeKeyEthereumTxHash, msgEthereumTx.Hash)
 				RegisterTxSearch(client, query, bz)
 			},
 			msgEthereumTx,
@@ -217,7 +217,7 @@ func (s *TestSuite) TestGetTxByEthHash() {
 			s.SetupTest() // reset
 			tc.registerMock()
 
-			rpcTx, err := s.backend.GetTxByEthHash(tc.tx.Hash())
+			rpcTx, err := s.backend.GetTxByEthHash((common.HexToHash(tc.tx.Hash)))
 
 			if tc.expPass {
 				s.Require().NoError(err)
@@ -288,7 +288,7 @@ func (s *TestSuite) TestGetTransactionByBlockAndIndex() {
 			Code: 0,
 			Events: []abci.Event{
 				{Type: evmtypes.EventTypeEthereumTx, Attributes: []abci.EventAttribute{
-					{Key: "ethereumTxHash", Value: msgEthTx.Hash().Hex()},
+					{Key: "ethereumTxHash", Value: msgEthTx.Hash},
 					{Key: "txIndex", Value: "0"},
 					{Key: "amount", Value: "1000"},
 					{Key: "txGasUsed", Value: "21000"},
@@ -685,9 +685,9 @@ func (s *TestSuite) TestGetTransactionReceipt() {
 			err := s.backend.Indexer.IndexBlock(tc.block, tc.blockResult)
 			s.Require().NoError(err)
 
-			res, err := s.backend.GetTransactionReceipt(tc.tx.Hash())
+			res, err := s.backend.GetTransactionReceipt(common.HexToHash(tc.tx.Hash))
 			if tc.expPass {
-				s.Require().Equal(res["transactionHash"], tc.tx.Hash())
+				s.Require().Equal(res["transactionHash"], common.HexToHash(tc.tx.Hash))
 				s.Require().Equal(res["blockNumber"], hexutil.Uint64(tc.block.Height)) //nolint: gosec // G115
 				requiredFields := []string{"status", "cumulativeGasUsed", "logsBloom", "logs", "gasUsed", "blockHash", "blockNumber", "transactionIndex", "effectiveGasPrice", "from", "to", "type"}
 				for _, field := range requiredFields {
diff --git a/x/vm/types/msg.go b/x/vm/types/msg.go
@@ -64,6 +64,7 @@ func NewTxFromArgs(args *TransactionArgs) *MsgEthereumTx {
 // FromEthereumTx populates the message fields from the given ethereum transaction
 func (msg *MsgEthereumTx) FromEthereumTx(tx *ethtypes.Transaction) {
 	msg.Raw = EthereumTx{tx}
+	msg.Hash = tx.Hash().Hex()
 }
 
 // FromSignedEthereumTx populates the message fields from the given signed ethereum transaction, and set From field.
@@ -76,6 +77,7 @@ func (msg *MsgEthereumTx) FromSignedEthereumTx(tx *ethtypes.Transaction, signer
 	}
 
 	msg.From = from.Bytes()
+	msg.Hash = tx.Hash().Hex()
 	return nil
 }
 
@@ -298,10 +300,6 @@ func (msg *MsgEthereumTx) UnmarshalBinary(b []byte, signer ethtypes.Signer) erro
 	return msg.FromSignedEthereumTx(tx, signer)
 }
 
-func (msg *MsgEthereumTx) Hash() common.Hash {
-	return msg.AsTransaction().Hash()
-}
-
 // BuildTx builds the canonical cosmos tx from ethereum msg
 func (msg *MsgEthereumTx) BuildTx(b client.TxBuilder, evmDenom string) (signing.Tx, error) {
 	return msg.BuildTxWithEvmParams(b, Params{
diff --git a/x/vm/types/tx.pb.go b/x/vm/types/tx.pb.go

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func EmitTxHashEvent(ctx sdk.Context, msg *evmtypes.MsgEthereumTx, blockTxIndex,`
`57`	`57`	`ctx.EventManager().EmitEvent(`
`58`	`58`	`sdk.NewEvent(`
`59`	`59`	`evmtypes.EventTypeEthereumTx,`
`60`		`- sdk.NewAttribute(evmtypes.AttributeKeyEthereumTxHash, msg.Hash().String()),`
	`60`	`+ sdk.NewAttribute(evmtypes.AttributeKeyEthereumTxHash, msg.Hash),`
`61`	`61`	`sdk.NewAttribute(evmtypes.AttributeKeyTxIndex, strconv.FormatUint(blockTxIndex+msgIndex, 10)), // #nosec G115`
`62`	`62`	`),`
`63`	`63`	`)`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func (d TxListenerDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate boo`
`27`	`27`	`if ctx.IsCheckTx() && !simulate && d.pendingTxListener != nil {`
`28`	`28`	`for _, msg := range tx.GetMsgs() {`
`29`	`29`	`if ethTx, ok := msg.(*evmtypes.MsgEthereumTx); ok {`
`30`		`- d.pendingTxListener(ethTx.Hash())`
	`30`	`+ d.pendingTxListener(common.HexToHash(ethTx.Hash))`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`}`