Skip to content

Commit 42a7759

Browse files
MariusVanDerWijdenbharath-123
authored andcommitted
params, core/forkid: enable cancun on sepolia and holesky (#28834)
This change enables Cancun - Sepolia at 1706655072 (Jan 31st, 2024) - Holesky at 1707305664 (Feb 7th, 2024) Specification: ethereum/execution-specs#860
1 parent c951dbc commit 42a7759

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

core/forkid/forkid_test.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,23 @@ func TestCreation(t *testing.T) {
106106
{1735370, 0, ID{Hash: checksumToBytes(0xfe3366e7), Next: 1735371}}, // Last London block
107107
{1735371, 0, ID{Hash: checksumToBytes(0xb96cbd13), Next: 1677557088}}, // First MergeNetsplit block
108108
{1735372, 1677557087, ID{Hash: checksumToBytes(0xb96cbd13), Next: 1677557088}}, // Last MergeNetsplit block
109-
{1735372, 1677557088, ID{Hash: checksumToBytes(0xf7f9bc08), Next: 0}}, // First Shanghai block
109+
{1735372, 1677557088, ID{Hash: checksumToBytes(0xf7f9bc08), Next: 1706655072}}, // First Shanghai block
110+
{1735372, 1706655071, ID{Hash: checksumToBytes(0xf7f9bc08), Next: 1706655072}}, // Last Shanghai block
111+
{1735372, 1706655072, ID{Hash: checksumToBytes(0x88cf81d9), Next: 0}}, // First Cancun block
112+
{1735372, 2706655072, ID{Hash: checksumToBytes(0x88cf81d9), Next: 0}}, // Future Cancun block
110113
},
111114
},
112115
// Holesky test cases
113116
{
114117
params.HoleskyChainConfig,
115118
core.DefaultHoleskyGenesisBlock().ToBlock(),
116119
[]testcase{
117-
{0, 0, ID{Hash: checksumToBytes(0xc61a6098), Next: 1696000704}}, // Unsynced, last Frontier, Homestead, Tangerine, Spurious, Byzantium, Constantinople, Petersburg, Istanbul, Berlin, London, Paris block
118-
{123, 0, ID{Hash: checksumToBytes(0xc61a6098), Next: 1696000704}}, // First MergeNetsplit block
119-
{123, 1696000704, ID{Hash: checksumToBytes(0xfd4f016b), Next: 0}}, // Last MergeNetsplit block
120+
{0, 0, ID{Hash: checksumToBytes(0xc61a6098), Next: 1696000704}}, // Unsynced, last Frontier, Homestead, Tangerine, Spurious, Byzantium, Constantinople, Petersburg, Istanbul, Berlin, London, Paris block
121+
{123, 0, ID{Hash: checksumToBytes(0xc61a6098), Next: 1696000704}}, // First MergeNetsplit block
122+
{123, 1696000704, ID{Hash: checksumToBytes(0xfd4f016b), Next: 1707305664}}, // First Shanghai block
123+
{123, 1707305663, ID{Hash: checksumToBytes(0xfd4f016b), Next: 1707305664}}, // Last Shanghai block
124+
{123, 1707305664, ID{Hash: checksumToBytes(0x9b192ad0), Next: 0}}, // First Cancun block
125+
{123, 2707305664, ID{Hash: checksumToBytes(0x9b192ad0), Next: 0}}, // Future Cancun block
120126
},
121127
},
122128
}

params/config.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ var (
8686
TerminalTotalDifficultyPassed: true,
8787
MergeNetsplitBlock: nil,
8888
ShanghaiTime: newUint64(1696000704),
89+
CancunTime: newUint64(1707305664),
8990
Ethash: new(EthashConfig),
9091
}
9192
// SepoliaChainConfig contains the chain parameters to run a node on the Sepolia test network.
@@ -110,6 +111,7 @@ var (
110111
TerminalTotalDifficultyPassed: true,
111112
MergeNetsplitBlock: big.NewInt(1735371),
112113
ShanghaiTime: newUint64(1677557088),
114+
CancunTime: newUint64(1706655072),
113115
Ethash: new(EthashConfig),
114116
}
115117
// GoerliChainConfig contains the chain parameters to run a node on the Görli test network.

0 commit comments

Comments
 (0)