Skip to content

Commit 997fa46

Browse files
authored
Schedule Pectra hard-fork for Holešky and Sepolia (#13722) (#13756)
1 parent 443f770 commit 997fa46

File tree

4 files changed

+25
-2
lines changed

4 files changed

+25
-2
lines changed

cl/clparams/config.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -813,6 +813,8 @@ func sepoliaConfig() BeaconChainConfig {
813813
cfg.CapellaForkVersion = 0x90000072
814814
cfg.DenebForkEpoch = 132608
815815
cfg.DenebForkVersion = 0x90000073
816+
cfg.ElectraForkEpoch = 222464
817+
cfg.ElectraForkVersion = 0x90000074
816818
cfg.TerminalTotalDifficulty = "17000000000000000"
817819
cfg.DepositContractAddress = "0x7f02C3E3c98b133055B8B348B2Ac625669Ed295D"
818820
cfg.InitializeForkSchedule()
@@ -862,6 +864,8 @@ func holeskyConfig() BeaconChainConfig {
862864
cfg.CapellaForkVersion = 0x04017000
863865
cfg.DenebForkEpoch = 29696
864866
cfg.DenebForkVersion = 0x05017000
867+
cfg.ElectraForkEpoch = 115968
868+
cfg.ElectraForkVersion = 0x06017000
865869
cfg.TerminalTotalDifficulty = "0"
866870
cfg.TerminalBlockHash = [32]byte{}
867871
cfg.TerminalBlockHashActivationEpoch = math.MaxUint64

core/forkid/forkid_test.go

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,27 @@ func TestCreation(t *testing.T) {
111111
{2990907, 1677557076, ID{Hash: checksumToBytes(0xb96cbd13), Next: 1677557088}}, // Last pre-Shanghai block
112112
{2990908, 1677557088, ID{Hash: checksumToBytes(0xf7f9bc08), Next: 1706655072}}, // First Shanghai block
113113
{5187022, 1706655060, ID{Hash: checksumToBytes(0xf7f9bc08), Next: 1706655072}}, // Last Shanghai block
114-
{5187023, 1706655072, ID{Hash: checksumToBytes(0x88cf81d9), Next: 0}}, // First Cancun block
115-
{8000000, 1800000000, ID{Hash: checksumToBytes(0x88cf81d9), Next: 0}}, // Future Cancun block (mock)
114+
{5187023, 1706655072, ID{Hash: checksumToBytes(0x88cf81d9), Next: 1741159776}}, // First Cancun block
115+
{7844466, 1741159764, ID{Hash: checksumToBytes(0x88cf81d9), Next: 1741159776}}, // Last Cancun block (approx)
116+
{7844467, 1741159776, ID{Hash: checksumToBytes(0xed88b5fd), Next: 0}}, // First Prague block (approx)
117+
{12000000, 1800000000, ID{Hash: checksumToBytes(0xed88b5fd), Next: 0}}, // Future Prague block (mock)
116118
},
117119
},
120+
121+
// Holesky test cases
122+
{
123+
params.HoleskyChainConfig,
124+
params.HoleskyGenesisHash,
125+
[]testcase{
126+
{0, 1696000704, ID{Hash: checksumToBytes(0xfd4f016b), Next: 1707305664}}, // First Shanghai block
127+
{0, 1707305652, ID{Hash: checksumToBytes(0xfd4f016b), Next: 1707305664}}, // Last Shanghai block
128+
{894733, 1707305676, ID{Hash: checksumToBytes(0x9b192ad0), Next: 1740434112}}, // First Cancun block
129+
{3655435, 1740434100, ID{Hash: checksumToBytes(0x9b192ad0), Next: 1740434112}}, // Last Cancun block (approx)
130+
{3655436, 1740434112, ID{Hash: checksumToBytes(0xdfbd9bed), Next: 0}}, // First Prague block (approx)
131+
{8000000, 1800000000, ID{Hash: checksumToBytes(0xdfbd9bed), Next: 0}}, // Future Prague block (mock)
132+
},
133+
},
134+
118135
// Gnosis test cases
119136
{
120137
params.GnosisChainConfig,

params/chainspecs/holesky.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"terminalTotalDifficultyPassed": true,
1616
"shanghaiTime": 1696000704,
1717
"cancunTime": 1707305664,
18+
"pragueTime": 1740434112,
1819
"blobSchedule": {
1920
"cancun": {
2021
"target": 3,

params/chainspecs/sepolia.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"mergeNetsplitBlock": 1735371,
1818
"shanghaiTime": 1677557088,
1919
"cancunTime": 1706655072,
20+
"pragueTime": 1741159776,
2021
"blobSchedule": {
2122
"cancun": {
2223
"target": 3,

0 commit comments

Comments
 (0)