From 4abc6cd119e29203e36bc50f78c7864513d1af87 Mon Sep 17 00:00:00 2001 From: Andrew Ashikhmin <34320705+yperbasis@users.noreply.github.com> Date: Thu, 18 Jan 2024 09:27:03 +0100 Subject: [PATCH] =?UTF-8?q?Schedule=20Dencun=20for=20Sepolia=20&=20Hole?= =?UTF-8?q?=C5=A1ky=20(#9255)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/ethereum/EIPs/pull/8051 & https://github.com/ethereum/execution-specs/pull/860 --- cl/clparams/config.go | 2 ++ core/forkid/forkid_test.go | 14 ++++++++------ params/chainspecs/holesky.json | 3 ++- params/chainspecs/sepolia.json | 1 + 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/cl/clparams/config.go b/cl/clparams/config.go index 8748f7a8f..ec7ba8516 100644 --- a/cl/clparams/config.go +++ b/cl/clparams/config.go @@ -805,6 +805,8 @@ func sepoliaConfig() BeaconChainConfig { cfg.BellatrixForkVersion = 0x90000071 cfg.CapellaForkEpoch = 56832 cfg.CapellaForkVersion = 0x90000072 + cfg.DenebForkEpoch = 132608 + cfg.DenebForkVersion = 0x90000073 cfg.TerminalTotalDifficulty = "17000000000000000" cfg.DepositContractAddress = "0x7f02C3E3c98b133055B8B348B2Ac625669Ed295D" cfg.InitializeForkSchedule() diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go index ab631f9e2..179c2dd0e 100644 --- a/core/forkid/forkid_test.go +++ b/core/forkid/forkid_test.go @@ -93,8 +93,8 @@ func TestCreation(t *testing.T) { {5062605, 1625109579, ID{Hash: checksumToBytes(0xB8C6299D), Next: 1678832736}}, // First London block {8656122, 1678832724, ID{Hash: checksumToBytes(0xB8C6299D), Next: 1678832736}}, // Last pre-Shanghai block {8656123, 1678832784, ID{Hash: checksumToBytes(0xf9843abf), Next: 1705473120}}, // First Shanghai block - {10416288, 1705473108, ID{Hash: checksumToBytes(0xf9843abf), Next: 1705473120}}, // Last Shanghai block (approx) - {10416289, 1705473120, ID{Hash: checksumToBytes(0x70cc14e2), Next: 0}}, // First Cancun block (approx) + {10388175, 1705473108, ID{Hash: checksumToBytes(0xf9843abf), Next: 1705473120}}, // Last Shanghai block + {10388176, 1705473120, ID{Hash: checksumToBytes(0x70cc14e2), Next: 0}}, // First Cancun block {12000000, 1800000000, ID{Hash: checksumToBytes(0x70cc14e2), Next: 0}}, // Future Cancun block (mock) }, }, @@ -107,8 +107,10 @@ func TestCreation(t *testing.T) { {1735370, 1661130096, ID{Hash: checksumToBytes(0xfe3366e7), Next: 1735371}}, // Last pre-MergeNetsplit block {1735371, 1661130108, ID{Hash: checksumToBytes(0xb96cbd13), Next: 1677557088}}, // First MergeNetsplit block {2990907, 1677557076, ID{Hash: checksumToBytes(0xb96cbd13), Next: 1677557088}}, // Last pre-Shanghai block - {2990908, 1677557088, ID{Hash: checksumToBytes(0xf7f9bc08), Next: 0}}, // First Shanghai block - {5000000, 1700000000, ID{Hash: checksumToBytes(0xf7f9bc08), Next: 0}}, // Future Shanghai block (mock) + {2990908, 1677557088, ID{Hash: checksumToBytes(0xf7f9bc08), Next: 1706655072}}, // First Shanghai block + {5198775, 1706655060, ID{Hash: checksumToBytes(0xf7f9bc08), Next: 1706655072}}, // Last Shanghai block (approx) + {5198776, 1706655072, ID{Hash: checksumToBytes(0x88cf81d9), Next: 0}}, // First Cancun block (approx) + {8000000, 1800000000, ID{Hash: checksumToBytes(0x88cf81d9), Next: 0}}, // Future Cancun block (mock) }, }, // Gnosis test cases @@ -130,8 +132,8 @@ func TestCreation(t *testing.T) { {19039999, 1636753575, ID{Hash: checksumToBytes(0x069a83d9), Next: 19040000}}, // Last Berlin block {19040000, 1636753580, ID{Hash: checksumToBytes(0x018479d3), Next: 1690889660}}, // First London block {21735000, 1650443255, ID{Hash: checksumToBytes(0x018479d3), Next: 1690889660}}, // First GIP-31 block - {29272666, 1690889655, ID{Hash: checksumToBytes(0x018479d3), Next: 1690889660}}, // Last pre-Shanghai block (approx) - {29272667, 1690889660, ID{Hash: checksumToBytes(0x2efe91ba), Next: 0}}, // First Shanghai block (approx) + {29242931, 1690889650, ID{Hash: checksumToBytes(0x018479d3), Next: 1690889660}}, // Last pre-Shanghai block + {29242932, 1690889660, ID{Hash: checksumToBytes(0x2efe91ba), Next: 0}}, // First Shanghai block }, }, // Chiado test cases diff --git a/params/chainspecs/holesky.json b/params/chainspecs/holesky.json index 852beb80e..e582e4060 100644 --- a/params/chainspecs/holesky.json +++ b/params/chainspecs/holesky.json @@ -13,5 +13,6 @@ "mergeForkBlock": 0, "terminalTotalDifficulty": 0, "terminalTotalDifficultyPassed": true, - "shanghaiTime": 1696000704 + "shanghaiTime": 1696000704, + "cancunTime": 1707305664 } \ No newline at end of file diff --git a/params/chainspecs/sepolia.json b/params/chainspecs/sepolia.json index 9c9d42410..9fe80a63f 100644 --- a/params/chainspecs/sepolia.json +++ b/params/chainspecs/sepolia.json @@ -16,5 +16,6 @@ "terminalTotalDifficultyPassed": true, "mergeNetsplitBlock": 1735371, "shanghaiTime": 1677557088, + "cancunTime": 1706655072, "ethash": {} }