From ff4ff30a68b613a598a1e674c13063be58cbefa1 Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Thu, 8 Jul 2021 11:34:56 +0200 Subject: [PATCH] core, params: define london block at 12965000 (#23176) * core, params: define london block at 12965000 * core/forkid: fix test --- core/forkid/forkid_test.go | 10 ++++++---- params/config.go | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go index 5829e863e..916bffadc 100644 --- a/core/forkid/forkid_test.go +++ b/core/forkid/forkid_test.go @@ -61,8 +61,10 @@ func TestCreation(t *testing.T) { {9199999, ID{Hash: checksumToBytes(0x879d6e30), Next: 9200000}}, // Last Istanbul and first Muir Glacier block {9200000, ID{Hash: checksumToBytes(0xe029e991), Next: 12244000}}, // First Muir Glacier block {12243999, ID{Hash: checksumToBytes(0xe029e991), Next: 12244000}}, // Last Muir Glacier block - {12244000, ID{Hash: checksumToBytes(0x0eb440f6), Next: 0}}, // First Berlin block - {20000000, ID{Hash: checksumToBytes(0x0eb440f6), Next: 0}}, // Future Berlin block + {12244000, ID{Hash: checksumToBytes(0x0eb440f6), Next: 12965000}}, // First Berlin block + {12964999, ID{Hash: checksumToBytes(0x0eb440f6), Next: 12965000}}, // Last Berlin block + {12965000, ID{Hash: checksumToBytes(0xb715077d), Next: 0}}, // First London block + {20000000, ID{Hash: checksumToBytes(0xb715077d), Next: 0}}, // Future London block }, }, // Ropsten test cases @@ -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. diff --git a/params/config.go b/params/config.go index 31da38a7b..eaa7f9242 100644 --- a/params/config.go +++ b/params/config.go @@ -69,6 +69,7 @@ var ( IstanbulBlock: big.NewInt(9_069_000), MuirGlacierBlock: big.NewInt(9_200_000), BerlinBlock: big.NewInt(12_244_000), + LondonBlock: big.NewInt(12_965_000), Ethash: new(EthashConfig), }