Skip to content

Commit 4abc6cd

Browse files
authored
Schedule Dencun for Sepolia & Holešky (#9255)
See ethereum/EIPs#8051 & ethereum/execution-specs#860
1 parent 1914b52 commit 4abc6cd

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

cl/clparams/config.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -805,6 +805,8 @@ func sepoliaConfig() BeaconChainConfig {
805805
cfg.BellatrixForkVersion = 0x90000071
806806
cfg.CapellaForkEpoch = 56832
807807
cfg.CapellaForkVersion = 0x90000072
808+
cfg.DenebForkEpoch = 132608
809+
cfg.DenebForkVersion = 0x90000073
808810
cfg.TerminalTotalDifficulty = "17000000000000000"
809811
cfg.DepositContractAddress = "0x7f02C3E3c98b133055B8B348B2Ac625669Ed295D"
810812
cfg.InitializeForkSchedule()

core/forkid/forkid_test.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ func TestCreation(t *testing.T) {
9393
{5062605, 1625109579, ID{Hash: checksumToBytes(0xB8C6299D), Next: 1678832736}}, // First London block
9494
{8656122, 1678832724, ID{Hash: checksumToBytes(0xB8C6299D), Next: 1678832736}}, // Last pre-Shanghai block
9595
{8656123, 1678832784, ID{Hash: checksumToBytes(0xf9843abf), Next: 1705473120}}, // First Shanghai block
96-
{10416288, 1705473108, ID{Hash: checksumToBytes(0xf9843abf), Next: 1705473120}}, // Last Shanghai block (approx)
97-
{10416289, 1705473120, ID{Hash: checksumToBytes(0x70cc14e2), Next: 0}}, // First Cancun block (approx)
96+
{10388175, 1705473108, ID{Hash: checksumToBytes(0xf9843abf), Next: 1705473120}}, // Last Shanghai block
97+
{10388176, 1705473120, ID{Hash: checksumToBytes(0x70cc14e2), Next: 0}}, // First Cancun block
9898
{12000000, 1800000000, ID{Hash: checksumToBytes(0x70cc14e2), Next: 0}}, // Future Cancun block (mock)
9999
},
100100
},
@@ -107,8 +107,10 @@ func TestCreation(t *testing.T) {
107107
{1735370, 1661130096, ID{Hash: checksumToBytes(0xfe3366e7), Next: 1735371}}, // Last pre-MergeNetsplit block
108108
{1735371, 1661130108, ID{Hash: checksumToBytes(0xb96cbd13), Next: 1677557088}}, // First MergeNetsplit block
109109
{2990907, 1677557076, ID{Hash: checksumToBytes(0xb96cbd13), Next: 1677557088}}, // Last pre-Shanghai block
110-
{2990908, 1677557088, ID{Hash: checksumToBytes(0xf7f9bc08), Next: 0}}, // First Shanghai block
111-
{5000000, 1700000000, ID{Hash: checksumToBytes(0xf7f9bc08), Next: 0}}, // Future Shanghai block (mock)
110+
{2990908, 1677557088, ID{Hash: checksumToBytes(0xf7f9bc08), Next: 1706655072}}, // First Shanghai block
111+
{5198775, 1706655060, ID{Hash: checksumToBytes(0xf7f9bc08), Next: 1706655072}}, // Last Shanghai block (approx)
112+
{5198776, 1706655072, ID{Hash: checksumToBytes(0x88cf81d9), Next: 0}}, // First Cancun block (approx)
113+
{8000000, 1800000000, ID{Hash: checksumToBytes(0x88cf81d9), Next: 0}}, // Future Cancun block (mock)
112114
},
113115
},
114116
// Gnosis test cases
@@ -130,8 +132,8 @@ func TestCreation(t *testing.T) {
130132
{19039999, 1636753575, ID{Hash: checksumToBytes(0x069a83d9), Next: 19040000}}, // Last Berlin block
131133
{19040000, 1636753580, ID{Hash: checksumToBytes(0x018479d3), Next: 1690889660}}, // First London block
132134
{21735000, 1650443255, ID{Hash: checksumToBytes(0x018479d3), Next: 1690889660}}, // First GIP-31 block
133-
{29272666, 1690889655, ID{Hash: checksumToBytes(0x018479d3), Next: 1690889660}}, // Last pre-Shanghai block (approx)
134-
{29272667, 1690889660, ID{Hash: checksumToBytes(0x2efe91ba), Next: 0}}, // First Shanghai block (approx)
135+
{29242931, 1690889650, ID{Hash: checksumToBytes(0x018479d3), Next: 1690889660}}, // Last pre-Shanghai block
136+
{29242932, 1690889660, ID{Hash: checksumToBytes(0x2efe91ba), Next: 0}}, // First Shanghai block
135137
},
136138
},
137139
// Chiado test cases

params/chainspecs/holesky.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
"mergeForkBlock": 0,
1414
"terminalTotalDifficulty": 0,
1515
"terminalTotalDifficultyPassed": true,
16-
"shanghaiTime": 1696000704
16+
"shanghaiTime": 1696000704,
17+
"cancunTime": 1707305664
1718
}

params/chainspecs/sepolia.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616
"terminalTotalDifficultyPassed": true,
1717
"mergeNetsplitBlock": 1735371,
1818
"shanghaiTime": 1677557088,
19+
"cancunTime": 1706655072,
1920
"ethash": {}
2021
}

0 commit comments

Comments
 (0)