From 67f823beb737a80846eb5c1e8f1ea5a7f50fc92e Mon Sep 17 00:00:00 2001 From: skosito Date: Mon, 10 Feb 2025 15:14:02 +0100 Subject: [PATCH 1/2] fix from field in eth receipt rpc method --- go.mod | 2 +- go.sum | 4 ++-- rpc/backend/tx_info.go | 5 ++++- rpc/backend/utils.go | 5 ++++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index f799949493..75c921c859 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.10.0 - github.com/zeta-chain/ethermint v0.0.0-20250124145234-b12523a2c64f + github.com/zeta-chain/ethermint v0.0.0-20250210141109-c8cb0fa0d95d github.com/zeta-chain/protocol-contracts v1.0.2-athens3.0.20250115133723-7232d7838789 gitlab.com/thorchain/tss/go-tss v1.6.5 go.nhat.io/grpcmock v0.25.0 diff --git a/go.sum b/go.sum index 30f01a7b61..40a5b06bf9 100644 --- a/go.sum +++ b/go.sum @@ -1394,8 +1394,8 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zeta-chain/ethermint v0.0.0-20250124145234-b12523a2c64f h1:31XqosZt7MJiVWJqTm4qZLYm3bkO5kCTtdy0od+eii4= -github.com/zeta-chain/ethermint v0.0.0-20250124145234-b12523a2c64f/go.mod h1:Pykye2Mw2eQ8/l80MTr6yNaBm6OI3TkQCmwQGUrL5VM= +github.com/zeta-chain/ethermint v0.0.0-20250210141109-c8cb0fa0d95d h1:6ZVsQ41ziPjce2rOMczlwWKvhBsohjI5ChX+O/0m/YY= +github.com/zeta-chain/ethermint v0.0.0-20250210141109-c8cb0fa0d95d/go.mod h1:Pykye2Mw2eQ8/l80MTr6yNaBm6OI3TkQCmwQGUrL5VM= github.com/zeta-chain/go-ethereum v1.13.16-0.20241022183758-422c6ef93ccc h1:FVOttT/f7QCZMkOLssLTY1cbX8pT+HS/kg81zgUAmYE= github.com/zeta-chain/go-ethereum v1.13.16-0.20241022183758-422c6ef93ccc/go.mod h1:MgO2/CmxFnj6W7v/5hrz3ypco3kHkb8856pRnFkY4xQ= github.com/zeta-chain/go-libp2p v0.0.0-20240710192637-567fbaacc2b4 h1:FmO3HfVdZ7LzxBUfg6sVzV7ilKElQU2DZm8PxJ7KcYI= diff --git a/rpc/backend/tx_info.go b/rpc/backend/tx_info.go index f943d1d011..fe8b2b08eb 100644 --- a/rpc/backend/tx_info.go +++ b/rpc/backend/tx_info.go @@ -237,7 +237,10 @@ func (b *Backend) GetTransactionReceipt(hash common.Hash) (map[string]interface{ if additional != nil { from = common.HexToAddress(ethMsg.From) } else if ethMsg.Data != nil { - from = ethMsg.GetSender() + from, err = ethMsg.GetSender(b.chainID) + if err != nil { + b.logger.Debug("failed to parse from field", "hash", hexTx, "error", err.Error()) + } } else { return nil, errors.New("failed to parse receipt") } diff --git a/rpc/backend/utils.go b/rpc/backend/utils.go index ce3b90fb1d..3a15e3b2f0 100644 --- a/rpc/backend/utils.go +++ b/rpc/backend/utils.go @@ -107,7 +107,10 @@ func (b *Backend) getAccountNonce( break } - sender := ethMsg.GetSender() + sender, err := ethMsg.GetSender(b.chainID) + if err != nil { + b.logger.Debug("failed to parse from field", "hash", ethMsg.Hash, "error", err.Error()) + } if sender == accAddr { nonce++ } From c8b1b11748719765a58f268ca99f0556417baaf3 Mon Sep 17 00:00:00 2001 From: skosito Date: Mon, 10 Feb 2025 15:35:58 +0100 Subject: [PATCH 2/2] PR comment --- rpc/backend/utils.go | 1 + 1 file changed, 1 insertion(+) diff --git a/rpc/backend/utils.go b/rpc/backend/utils.go index 3a15e3b2f0..350c8c0101 100644 --- a/rpc/backend/utils.go +++ b/rpc/backend/utils.go @@ -110,6 +110,7 @@ func (b *Backend) getAccountNonce( sender, err := ethMsg.GetSender(b.chainID) if err != nil { b.logger.Debug("failed to parse from field", "hash", ethMsg.Hash, "error", err.Error()) + continue } if sender == accAddr { nonce++