all: remove TerminalTotalDifficultyPassed #30609
Merged
Conversation
This file contains hidden or 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
jwasinger
requested review from
fjl,
holiman,
karalabe,
gballet,
rjl493456442,
zsfelfoldi,
s1na and
lightclient
as code owners
|
hi, I didn't notice you create one too. I just re-commit the PR #30612, including more deletion of TerminalTotalDifficultyPassed. |
|
your commit contains my updates, closing mine. |
namiloh
approved these changes
Oct 22, 2024
Co-authored-by: stevemilk <wangpeculiar@gmail.com>
… into its own commit as a reminder to double-check that this doesn't break anything
…cified. Remove unused parts from HF description generation
…x possible). Otherwise, we cannot create the consensus engine if ttd==nil.
…ensus engine creation ensures this.
jwasinger
force-pushed
the
remove-ttd-passed
branch
from
18db7d0 to
90906c8
Compare
| if t := cfg.ChainConfig.ShanghaiTime; cfg.ChainConfig.TerminalTotalDifficultyPassed || (t != nil && *t == 0) { | ||
| cfg.Random = &(common.Hash{}) | ||
| } | ||
| cfg.Random = &(common.Hash{}) |
There was a problem hiding this comment.
The random is only set if the Shanghai fork is configured. The behavior is changed
There was a problem hiding this comment.
EDIT. Yeah, since you always expect the TTD is configured and it implies the Shanghai has already be configured (no matter is activated or not).
| @@ -113,8 +113,12 @@ func testHeaderVerificationForMerging(t *testing.T, isClique bool) { | |||
| } | |||
| copy(gspec.ExtraData[32:], addr[:]) | |||
|
|
|||
| // chain_maker has no blockchain to retrieve the TTD from, setting to nil | |||
There was a problem hiding this comment.
I think you can delete all the pre-merge tests
There was a problem hiding this comment.
We're still supposed to be able to verify backwards across a merge, right? In that case, I think we should leave it in
holiman
pushed a commit
that referenced
this pull request
Nov 19, 2024
rebased #29766 . The downstream branch appears to have been deleted and I don't have perms to push to that fork. `TerminalTotalDifficultyPassed` is removed. `TerminalTotalDifficulty` must now be non-nil, and it is expected that networks are already merged: we can only import PoW/Clique chains, not produce blocks on them. --------- Co-authored-by: stevemilk <wangpeculiar@gmail.com>
zfy0701
pushed a commit
to sentioxyz/go-ethereum
that referenced
this pull request
Dec 3, 2024
rebased ethereum#29766 . The downstream branch appears to have been deleted and I don't have perms to push to that fork. `TerminalTotalDifficultyPassed` is removed. `TerminalTotalDifficulty` must now be non-nil, and it is expected that networks are already merged: we can only import PoW/Clique chains, not produce blocks on them. --------- Co-authored-by: stevemilk <wangpeculiar@gmail.com>
This was referenced Dec 6, 2024
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.
rebased #29766 . The downstream branch appears to have been deleted and I don't have perms to push to that fork.
TerminalTotalDifficultyPassedis removed.TerminalTotalDifficultymust now be non-nil, and it is expected that networks are already merged: we can only import PoW/Clique chains, not produce blocks on them.