From 087ed9c92ecfe41109c1e039693fc126952a3718 Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Mon, 14 Jun 2021 19:35:01 +0200
Subject: [PATCH] params, core/forkid: add london testnet blocks (#23041)
* params: add london testnet blocks
* core/forkid: update fork hashes
---
core/forkid/forkid_test.go | 46 +++++++++++++++++++++-----------------
params/config.go | 3 +++
2 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go
index 2a7938bd2..5829e863e 100644
--- a/core/forkid/forkid_test.go
+++ b/core/forkid/forkid_test.go
@@ -70,22 +70,24 @@ func TestCreation(t *testing.T) {
params.RopstenChainConfig,
params.RopstenGenesisHash,
[]testcase{
- {0, ID{Hash: checksumToBytes(0x30c7ddbc), Next: 10}}, // Unsynced, last Frontier, Homestead and first Tangerine block
- {9, ID{Hash: checksumToBytes(0x30c7ddbc), Next: 10}}, // Last Tangerine block
- {10, ID{Hash: checksumToBytes(0x63760190), Next: 1700000}}, // First Spurious block
- {1699999, ID{Hash: checksumToBytes(0x63760190), Next: 1700000}}, // Last Spurious block
- {1700000, ID{Hash: checksumToBytes(0x3ea159c7), Next: 4230000}}, // First Byzantium block
- {4229999, ID{Hash: checksumToBytes(0x3ea159c7), Next: 4230000}}, // Last Byzantium block
- {4230000, ID{Hash: checksumToBytes(0x97b544f3), Next: 4939394}}, // First Constantinople block
- {4939393, ID{Hash: checksumToBytes(0x97b544f3), Next: 4939394}}, // Last Constantinople block
- {4939394, ID{Hash: checksumToBytes(0xd6e2149b), Next: 6485846}}, // First Petersburg block
- {6485845, ID{Hash: checksumToBytes(0xd6e2149b), Next: 6485846}}, // Last Petersburg block
- {6485846, ID{Hash: checksumToBytes(0x4bc66396), Next: 7117117}}, // First Istanbul block
- {7117116, ID{Hash: checksumToBytes(0x4bc66396), Next: 7117117}}, // Last Istanbul block
- {7117117, ID{Hash: checksumToBytes(0x6727ef90), Next: 9812189}}, // First Muir Glacier block
- {9812188, ID{Hash: checksumToBytes(0x6727ef90), Next: 9812189}}, // Last Muir Glacier block
- {9812189, ID{Hash: checksumToBytes(0xa157d377), Next: 0}}, // First Berlin block
- {10000000, ID{Hash: checksumToBytes(0xa157d377), Next: 0}}, // Future Berlin block
+ {0, ID{Hash: checksumToBytes(0x30c7ddbc), Next: 10}}, // Unsynced, last Frontier, Homestead and first Tangerine block
+ {9, ID{Hash: checksumToBytes(0x30c7ddbc), Next: 10}}, // Last Tangerine block
+ {10, ID{Hash: checksumToBytes(0x63760190), Next: 1700000}}, // First Spurious block
+ {1699999, ID{Hash: checksumToBytes(0x63760190), Next: 1700000}}, // Last Spurious block
+ {1700000, ID{Hash: checksumToBytes(0x3ea159c7), Next: 4230000}}, // First Byzantium block
+ {4229999, ID{Hash: checksumToBytes(0x3ea159c7), Next: 4230000}}, // Last Byzantium block
+ {4230000, ID{Hash: checksumToBytes(0x97b544f3), Next: 4939394}}, // First Constantinople block
+ {4939393, ID{Hash: checksumToBytes(0x97b544f3), Next: 4939394}}, // Last Constantinople block
+ {4939394, ID{Hash: checksumToBytes(0xd6e2149b), Next: 6485846}}, // First Petersburg block
+ {6485845, ID{Hash: checksumToBytes(0xd6e2149b), Next: 6485846}}, // Last Petersburg block
+ {6485846, ID{Hash: checksumToBytes(0x4bc66396), Next: 7117117}}, // First Istanbul block
+ {7117116, ID{Hash: checksumToBytes(0x4bc66396), Next: 7117117}}, // Last Istanbul block
+ {7117117, ID{Hash: checksumToBytes(0x6727ef90), Next: 9812189}}, // First Muir Glacier block
+ {9812188, ID{Hash: checksumToBytes(0x6727ef90), Next: 9812189}}, // Last Muir Glacier block
+ {9812189, ID{Hash: checksumToBytes(0xa157d377), Next: 10499401}}, // First Berlin block
+ {10499400, ID{Hash: checksumToBytes(0xa157d377), Next: 10499401}}, // Last Berlin block
+ {10499401, ID{Hash: checksumToBytes(0x7119b6b3), Next: 0}}, // First London block
+ {11000000, ID{Hash: checksumToBytes(0x7119b6b3), Next: 0}}, // Future London block
},
},
// Rinkeby test cases
@@ -106,8 +108,10 @@ func TestCreation(t *testing.T) {
{5435344, ID{Hash: checksumToBytes(0xafec6b27), Next: 5435345}}, // Last Petersburg block
{5435345, ID{Hash: checksumToBytes(0xcbdb8838), Next: 8290928}}, // First Istanbul block
{8290927, ID{Hash: checksumToBytes(0xcbdb8838), Next: 8290928}}, // Last Istanbul block
- {8290928, ID{Hash: checksumToBytes(0x6910c8bd), Next: 0}}, // First Berlin block
- {10000000, ID{Hash: checksumToBytes(0x6910c8bd), Next: 0}}, // Future Berlin block
+ {8290928, ID{Hash: checksumToBytes(0x6910c8bd), Next: 8897988}}, // First Berlin block
+ {8897987, ID{Hash: checksumToBytes(0x6910c8bd), Next: 8897988}}, // Last Berlin block
+ {8897988, ID{Hash: checksumToBytes(0x8E29F2F3), Next: 0}}, // First London block
+ {10000000, ID{Hash: checksumToBytes(0x8E29F2F3), Next: 0}}, // Future London block
},
},
// Goerli test cases
@@ -119,8 +123,10 @@ func TestCreation(t *testing.T) {
{1561650, ID{Hash: checksumToBytes(0xa3f5ab08), Next: 1561651}}, // Last Petersburg block
{1561651, ID{Hash: checksumToBytes(0xc25efa5c), Next: 4460644}}, // First Istanbul block
{4460643, ID{Hash: checksumToBytes(0xc25efa5c), Next: 4460644}}, // Last Istanbul block
- {4460644, ID{Hash: checksumToBytes(0x757a1c47), Next: 0}}, // First Berlin block
- {5000000, ID{Hash: checksumToBytes(0x757a1c47), Next: 0}}, // Future Berlin block
+ {4460644, ID{Hash: checksumToBytes(0x757a1c47), Next: 5062605}}, // First Berlin block
+ {5000000, ID{Hash: checksumToBytes(0x757a1c47), Next: 5062605}}, // Last Berlin block
+ {5062605, ID{Hash: checksumToBytes(0xB8C6299D), Next: 0}}, // First London block
+ {6000000, ID{Hash: checksumToBytes(0xB8C6299D), Next: 0}}, // Future London block
},
},
}
diff --git a/params/config.go b/params/config.go
index b0d7f35ee..7fd7d6086 100644
--- a/params/config.go
+++ b/params/config.go
@@ -109,6 +109,7 @@ var (
IstanbulBlock: big.NewInt(6_485_846),
MuirGlacierBlock: big.NewInt(7_117_117),
BerlinBlock: big.NewInt(9_812_189),
+ LondonBlock: big.NewInt(10_499_401),
Ethash: new(EthashConfig),
}
@@ -149,6 +150,7 @@ var (
IstanbulBlock: big.NewInt(5_435_345),
MuirGlacierBlock: nil,
BerlinBlock: big.NewInt(8_290_928),
+ LondonBlock: big.NewInt(8_897_988),
Clique: &CliqueConfig{
Period: 15,
Epoch: 30000,
@@ -190,6 +192,7 @@ var (
IstanbulBlock: big.NewInt(1_561_651),
MuirGlacierBlock: nil,
BerlinBlock: big.NewInt(4_460_644),
+ LondonBlock: big.NewInt(5_062_605),
Clique: &CliqueConfig{
Period: 15,
Epoch: 30000,
--
GitLab