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

eth/api_backend: return error if pos tag used pre-merge #26862

Merged
merged 6 commits into from
Mar 13, 2023
Merged

eth/api_backend: return error if pos tag used pre-merge #26862

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d06966e
eth/api_backend: return error if pos tag used pre-merge
lightclient Mar 11, 2023
7726410
Update eth/api_backend.go
holiman Mar 13, 2023
347862d
Update eth/api_backend.go
holiman Mar 13, 2023
8cbf6ef
Update eth/api_backend.go
holiman Mar 13, 2023
4c8e217
Update api_backend.go
fjl Mar 13, 2023
e0881c0
eth: minor change in error-handling
holiman Mar 13, 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
7 changes: 7 additions & 0 deletions eth/api_backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package eth
import (
"context"
"errors"
"fmt"
holiman marked this conversation as resolved.
Show resolved Hide resolved
"math/big"
"time"

Expand Down Expand Up @@ -74,6 +75,9 @@ func (b *EthAPIBackend) HeaderByNumber(ctx context.Context, number rpc.BlockNumb
if number == rpc.LatestBlockNumber {
return b.eth.blockchain.CurrentBlock(), nil
}
if !b.eth.Merger().TDDReached() && (number == rpc.FinalizedBlockNumber || number == rpc.SafeBlockNumber) {
return nil, fmt.Errorf("tag not supported on pre-merge network")
holiman marked this conversation as resolved.
Show resolved Hide resolved
}
if number == rpc.FinalizedBlockNumber {
block := b.eth.blockchain.CurrentFinalBlock()
if block != nil {
Expand Down Expand Up @@ -123,6 +127,9 @@ func (b *EthAPIBackend) BlockByNumber(ctx context.Context, number rpc.BlockNumbe
header := b.eth.blockchain.CurrentBlock()
return b.eth.blockchain.GetBlock(header.Hash(), header.Number.Uint64()), nil
}
if !b.eth.Merger().TDDReached() && (number == rpc.FinalizedBlockNumber || number == rpc.SafeBlockNumber) {
return nil, fmt.Errorf("tag not supported on pre-merge network")
holiman marked this conversation as resolved.
Show resolved Hide resolved
}
if number == rpc.FinalizedBlockNumber {
header := b.eth.blockchain.CurrentFinalBlock()
return b.eth.blockchain.GetBlock(header.Hash(), header.Number.Uint64()), nil
Expand Down