Skip to content

fix: fix from field in eth receipt rpc method #3507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skosito merged 2 commits into from
Feb 10, 2025
Merged

fix: fix from field in eth receipt rpc method #3507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67f823b
fix from field in eth receipt rpc method
skosito Feb 10, 2025
c8b1b11
PR comment
skosito Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
5 changes: 4 additions & 1 deletion rpc/backend/tx_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
6 changes: 5 additions & 1 deletion rpc/backend/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,11 @@ 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())
continue
}
if sender == accAddr {
nonce++
}
Expand Down