Skip to content
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

Jump to bottom

rpc: change BlockNumber constant values to match ethclient #27219

Merged
merged 8 commits into from
May 23, 2023
Merged

rpc: change BlockNumber constant values to match ethclient #27219

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
562be5f
ethclient: fix discrepancy between latest/pending blocknumbers
holiman May 4, 2023
11ad739
rpc: swap rpc.Latest and rpc.Pending block number (internal) constant
holiman May 10, 2023
d64678e
eth/filters: use constants instead of magic, handle missing pending s…
holiman May 11, 2023
3ea8e2b
rpc: add String method for BlockNumber
fjl May 16, 2023
236358e
ethclient: improve toBlockNumArg
fjl May 16, 2023
c0cf2ac
ethclient/gethclient: copy new toBlockNumArg
fjl May 16, 2023
48f68ab
eth/filters: fix test
fjl May 23, 2023
025270c
eth/filters: remove log
fjl May 23, 2023
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
11 changes: 4 additions & 7 deletions ethclient/ethclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,19 +582,16 @@ func (ec *Client) SendTransaction(ctx context.Context, tx *types.Transaction) er
}

func toBlockNumArg(number *big.Int) string {
if number == nil {
if number == nil || number.Cmp(big.NewInt(int64(rpc.LatestBlockNumber))) == 0 {
return "latest"
}
pending := big.NewInt(-1)
if number.Cmp(pending) == 0 {
if number.Cmp(big.NewInt(int64(rpc.PendingBlockNumber))) == 0 {
return "pending"
}
finalized := big.NewInt(int64(rpc.FinalizedBlockNumber))
if number.Cmp(finalized) == 0 {
if number.Cmp(big.NewInt(int64(rpc.FinalizedBlockNumber))) == 0 {
return "finalized"
}
safe := big.NewInt(int64(rpc.SafeBlockNumber))
if number.Cmp(safe) == 0 {
if number.Cmp(big.NewInt(int64(rpc.SafeBlockNumber))) == 0 {
return "safe"
}
return hexutil.EncodeBig(number)
Expand Down