eth: remove check for tdd reached on pos api block tags #27799
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lightclient
requested review from
karalabe,
holiman and
rjl493456442
as code owners
rjl493456442
approved these changes
Jul 28, 2023
holiman
approved these changes
Aug 10, 2023
Deacon77
reviewed
Aug 26, 2023
| @@ -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() { | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| @@ -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") | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| @@ -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") | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| @@ -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") | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| @@ -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") | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| @@ -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() { | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| @@ -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() { | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| @@ -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") | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| @@ -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") | |||
| } | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| @@ -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") | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
devopsbo3
pushed a commit
to HorizenOfficial/go-ethereum
that referenced
this pull request
Nov 10, 2023
This change defers to the blockchain for in what circumstances to return error, instead of handling many error-cases in the api backend.
devopsbo3
added a commit
to HorizenOfficial/go-ethereum
that referenced
this pull request
Nov 10, 2023
…reum#27799)" This reverts commit 7a2909a.
devopsbo3
added a commit
to HorizenOfficial/go-ethereum
that referenced
this pull request
Nov 10, 2023
…reum#27799)" This reverts commit 7a2909a.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We're dealing with a bit of a problem over in rpctestgen where we would like to generate some rpc test interactions using the
safeandfinalizedblock tags, but it is not currently possible without making some Engine API requests.This is a relatively specialized use case, but the error returned is sort of incorrect here when a genesis has
terminalTotalDifficultyPassedset in genesis:'xxxxx' tag not supported on pre-merge network. Now it will returnnilif the network is pre-merge or the network is post-merge but we haven't determined which block issafe/finalyet. This behavior seems more correct.