From 391b267552234353b2362b8452d1f97ed706ea25 Mon Sep 17 00:00:00 2001
From: Andrew Ashikhmin <34320705+yperbasis@users.noreply.github.com>
Date: Wed, 3 Jan 2024 15:49:10 +0100
Subject: [PATCH] =?UTF-8?q?Schedule=20Dencun=20for=20G=C3=B6rli=20(#9116)?=
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         |  3 ++-
 core/forkid/forkid_test.go    | 22 ++++++++++++----------
 params/chainspecs/goerli.json |  1 +
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/cl/clparams/config.go b/cl/clparams/config.go
index a0bb995e3fe..3fd059b8264 100644
--- a/cl/clparams/config.go
+++ b/cl/clparams/config.go
@@ -824,7 +824,8 @@ func goerliConfig() BeaconChainConfig {
 	cfg.BellatrixForkVersion = 0x02001020
 	cfg.CapellaForkEpoch = 162304
 	cfg.CapellaForkVersion = 0x03001020
-	cfg.DenebForkVersion = 0x40001020
+	cfg.DenebForkEpoch = 231680
+	cfg.DenebForkVersion = 0x04001020
 	cfg.TerminalTotalDifficulty = "10790000"
 	cfg.DepositContractAddress = "0xff50ed3d0ec03aC01D4C79aAd74928BFF48a7b2b"
 	cfg.InitializeForkSchedule()
diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go
index 310beaa739a..7b2b7833661 100644
--- a/core/forkid/forkid_test.go
+++ b/core/forkid/forkid_test.go
@@ -84,16 +84,18 @@ func TestCreation(t *testing.T) {
 			params.GoerliChainConfig,
 			params.GoerliGenesisHash,
 			[]testcase{
-				{0, 1548854791, ID{Hash: checksumToBytes(0xa3f5ab08), Next: 1561651}},          // Unsynced, last Frontier, Homestead, Tangerine, Spurious, Byzantium, Constantinople and first Petersburg block
-				{1561650, 1572443570, ID{Hash: checksumToBytes(0xa3f5ab08), Next: 1561651}},    // Last Petersburg block
-				{1561651, 1572443585, ID{Hash: checksumToBytes(0xc25efa5c), Next: 4460644}},    // First Istanbul block
-				{4460643, 1616045376, ID{Hash: checksumToBytes(0xc25efa5c), Next: 4460644}},    // Last Istanbul block
-				{4460644, 1616045391, ID{Hash: checksumToBytes(0x757a1c47), Next: 5062605}},    // First Berlin block
-				{5062604, 1625109564, ID{Hash: checksumToBytes(0x757a1c47), Next: 5062605}},    // Last Berlin block
-				{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: 0}},          // First Shanghai block
-				{9900000, 1700000000, ID{Hash: checksumToBytes(0xf9843abf), Next: 0}},          // Future Shanghai block (mock)
+				{0, 1548854791, ID{Hash: checksumToBytes(0xa3f5ab08), Next: 1561651}},           // Unsynced, last Frontier, Homestead, Tangerine, Spurious, Byzantium, Constantinople and first Petersburg block
+				{1561650, 1572443570, ID{Hash: checksumToBytes(0xa3f5ab08), Next: 1561651}},     // Last Petersburg block
+				{1561651, 1572443585, ID{Hash: checksumToBytes(0xc25efa5c), Next: 4460644}},     // First Istanbul block
+				{4460643, 1616045376, ID{Hash: checksumToBytes(0xc25efa5c), Next: 4460644}},     // Last Istanbul block
+				{4460644, 1616045391, ID{Hash: checksumToBytes(0x757a1c47), Next: 5062605}},     // First Berlin block
+				{5062604, 1625109564, ID{Hash: checksumToBytes(0x757a1c47), Next: 5062605}},     // Last Berlin block
+				{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)
+				{12000000, 1800000000, ID{Hash: checksumToBytes(0x70cc14e2), Next: 0}},          // Future Cancun block (mock)
 			},
 		},
 		// Sepolia test cases
diff --git a/params/chainspecs/goerli.json b/params/chainspecs/goerli.json
index 46603963dc3..4bf04baa184 100644
--- a/params/chainspecs/goerli.json
+++ b/params/chainspecs/goerli.json
@@ -14,6 +14,7 @@
   "terminalTotalDifficulty": 10790000,
   "terminalTotalDifficultyPassed": true,
   "shanghaiTime": 1678832736,
+  "cancunTime": 1705473120,
   "clique": {
     "period": 15,
     "epoch": 30000