Skip to content

Commit

Permalink
eth: remove check for tdd reached on pos api block tags (#27799)
Browse files Browse the repository at this point in the history
This change defers to the blockchain for in what circumstances to return error, instead of handling many error-cases in the api backend.
  • Loading branch information
lightclient authored Aug 26, 2023
1 parent 3ff6b3c commit 3a662d4
Showing 1 changed file with 6 additions and 18 deletions.
24 changes: 6 additions & 18 deletions eth/api_backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,24 +78,18 @@ func (b *EthAPIBackend) HeaderByNumber(ctx context.Context, number rpc.BlockNumb
return b.eth.blockchain.CurrentBlock(), nil
}
if number == rpc.FinalizedBlockNumber {
if !b.eth.Merger().TDDReached() {
return nil, errors.New("'finalized' tag not supported on pre-merge network")
}
block := b.eth.blockchain.CurrentFinalBlock()
if block != nil {
return block, nil
if block == nil {
return nil, errors.New("finalized block not found")
}
return nil, errors.New("finalized block not found")
return block, nil
}
if number == rpc.SafeBlockNumber {
if !b.eth.Merger().TDDReached() {
return nil, errors.New("'safe' tag not supported on pre-merge network")
}
block := b.eth.blockchain.CurrentSafeBlock()
if block != nil {
return block, nil
if block == nil {
return nil, errors.New("safe block not found")
}
return nil, errors.New("safe block not found")
return block, nil
}
return b.eth.blockchain.GetHeaderByNumber(uint64(number)), nil
}
Expand Down Expand Up @@ -136,19 +130,13 @@ func (b *EthAPIBackend) BlockByNumber(ctx context.Context, number rpc.BlockNumbe
return b.eth.blockchain.GetBlock(header.Hash(), header.Number.Uint64()), nil
}
if number == rpc.FinalizedBlockNumber {
if !b.eth.Merger().TDDReached() {
return nil, errors.New("'finalized' tag not supported on pre-merge network")
}
header := b.eth.blockchain.CurrentFinalBlock()
if header == nil {
return nil, errors.New("finalized block not found")
}
return b.eth.blockchain.GetBlock(header.Hash(), header.Number.Uint64()), nil
}
if number == rpc.SafeBlockNumber {
if !b.eth.Merger().TDDReached() {
return nil, errors.New("'safe' tag not supported on pre-merge network")
}
header := b.eth.blockchain.CurrentSafeBlock()
if header == nil {
return nil, errors.New("safe block not found")
Expand Down

0 comments on commit 3a662d4

Please sign in to comment.