From a19ae55bd5592c3851116a961b58b98b2fba45ed Mon Sep 17 00:00:00 2001 From: Andrew Ashikhmin <34320705+yperbasis@users.noreply.github.com> Date: Thu, 8 Feb 2024 20:20:20 +0100 Subject: [PATCH] Schedule Dencun on mainnet (#9409) Refer to https://github.com/ethereum/EIPs/pull/8173 --- cl/clparams/config.go | 2 +- core/forkid/forkid_test.go | 6 ++++-- params/chainspecs/mainnet.json | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cl/clparams/config.go b/cl/clparams/config.go index a15c6e73f06..98b0f6e0362 100644 --- a/cl/clparams/config.go +++ b/cl/clparams/config.go @@ -753,7 +753,7 @@ var MainnetBeaconConfig BeaconChainConfig = BeaconChainConfig{ CapellaForkVersion: 0x03000000, CapellaForkEpoch: 194048, DenebForkVersion: 0x04000000, - DenebForkEpoch: math.MaxUint64, + DenebForkEpoch: 269568, // New values introduced in Altair hard fork 1. // Participation flag indices. diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go index 41c52891bf5..4d7feee0233 100644 --- a/core/forkid/forkid_test.go +++ b/core/forkid/forkid_test.go @@ -75,8 +75,10 @@ func TestCreation(t *testing.T) { {15049999, 1656586434, ID{Hash: checksumToBytes(0x20c327fc), Next: 15050000}}, // Last Arrow Glacier block {15050000, 1656586444, ID{Hash: checksumToBytes(0xf0afd0e3), Next: 1681338455}}, // First Gray Glacier block {17034869, 1681338443, ID{Hash: checksumToBytes(0xf0afd0e3), Next: 1681338455}}, // Last pre-Shanghai block - {17034870, 1681338479, ID{Hash: checksumToBytes(0xdce96c2d), Next: 0}}, // First Shanghai block - {19000000, 1700000000, ID{Hash: checksumToBytes(0xdce96c2d), Next: 0}}, // Future Shanghai block (mock) + {17034870, 1681338479, ID{Hash: checksumToBytes(0xdce96c2d), Next: 1710338135}}, // First Shanghai block + {19428734, 1710338123, ID{Hash: checksumToBytes(0xdce96c2d), Next: 1710338135}}, // Last Shanghai block (approx) + {19428735, 1710338135, ID{Hash: checksumToBytes(0x9f3d2254), Next: 0}}, // First Cancun block (approx) + {20000000, 1800000000, ID{Hash: checksumToBytes(0x9f3d2254), Next: 0}}, // Future Cancun block (mock) }, }, // Goerli test cases diff --git a/params/chainspecs/mainnet.json b/params/chainspecs/mainnet.json index 2de0e0b8394..a47bf7f418c 100644 --- a/params/chainspecs/mainnet.json +++ b/params/chainspecs/mainnet.json @@ -18,5 +18,6 @@ "terminalTotalDifficulty": 58750000000000000000000, "terminalTotalDifficultyPassed": true, "shanghaiTime": 1681338455, + "cancunTime": 1710338135, "ethash": {} }