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.

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

core, params: define london block at 12965000 #23176

Merged
merged 2 commits into from
Jul 8, 2021

Conversation

holiman
Copy link
Contributor

@holiman holiman commented Jul 7, 2021

This PR adds mainnet london fork block at 12965000.

@holiman holiman added the london label Jul 7, 2021
@holiman holiman added this to the 1.10.5 milestone Jul 7, 2021
@karalabe
Copy link
Member

karalabe commented Jul 8, 2021

Also gonna need

@@ -203,11 +205,11 @@ func TestValidation(t *testing.T) {
                // Local is mainnet Petersburg, remote is Rinkeby Petersburg.
                {7987396, ID{Hash: checksumToBytes(0xafec6b27), Next: 0}, ErrLocalIncompatibleOrStale},
 
-               // Local is mainnet Berlin, far in the future. Remote announces Gopherium (non existing fork)
+               // Local is mainnet London, far in the future. Remote announces Gopherium (non existing fork)
                // at some future block 88888888, for itself, but past block for local. Local is incompatible.
                //
                // This case detects non-upgraded nodes with majority hash power (typical Ropsten mess).
-               {88888888, ID{Hash: checksumToBytes(0x0eb440f6), Next: 88888888}, ErrLocalIncompatibleOrStale},
+               {88888888, ID{Hash: checksumToBytes(0xb715077d), Next: 88888888}, ErrLocalIncompatibleOrStale},
 
                // Local is mainnet Byzantium. Remote is also in Byzantium, but announces Gopherium (non existing
                // fork) at block 7279999, before Petersburg. Local is incompatible.

Copy link
Member

@karalabe karalabe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@karalabe karalabe merged commit ff4ff30 into ethereum:master Jul 8, 2021
sidhujag pushed a commit to sidhujag/go-ethereum that referenced this pull request Jul 10, 2021
* core, params: define london block at 12965000

* core/forkid: fix test
AusIV pushed a commit to NoteGio/go-ethereum that referenced this pull request Jul 21, 2021
* core, params: define london block at 12965000

* core/forkid: fix test
atif-konasl pushed a commit to frozeman/pandora-execution-engine that referenced this pull request Oct 15, 2021
* core, params: define london block at 12965000

* core/forkid: fix test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants