From e6395c3af3012b4c4eeee6b2241486a7863b47c7 Mon Sep 17 00:00:00 2001
From: Simon Dudley <simon.dudley@consensys.net>
Date: Fri, 17 Mar 2023 10:38:41 +1000
Subject: [PATCH] Schedule shanghaiTime for Mainnet and configure forkId for
 tests (#5230)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🦉
---
 CHANGELOG.md                                                 | 3 ++-
 .../java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java  | 5 +++--
 config/src/main/resources/mainnet.json                       | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc0efc12ca0..5c57e35c7ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,8 @@
 ### Breaking Changes
 
 ### Additions and Improvements
-- Increase default from 1000 to 5000 for `--rpc-max-logs-range` #5209
+- Schedule Shanghai (Shapella) fork for Mainnet [#5230](https://github.com/hyperledger/besu/pull/5230)
+- Increase default from 1000 to 5000 for `--rpc-max-logs-range` [#5209](https://github.com/hyperledger/besu/pull/5209)
 
 ### Bug Fixes
 - Persist backward sync status to support resuming across restarts [#5182](https://github.com/hyperledger/besu/pull/5182)
diff --git a/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java
index 5483a6173d8..51332996518 100644
--- a/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java
@@ -118,8 +118,9 @@ public static Collection<Object[]> parameters() {
                 new ForkId(Bytes.ofUnsignedInt(0xeb440f6L), 12965000L),
                 new ForkId(Bytes.ofUnsignedInt(0xb715077dL), 13773000L),
                 new ForkId(Bytes.ofUnsignedInt(0x20c327fcL), 15050000L),
-                new ForkId(Bytes.ofUnsignedInt(0xf0afd0e3L), 0L),
-                new ForkId(Bytes.ofUnsignedInt(0xf0afd0e3L), 0L))
+                new ForkId(Bytes.ofUnsignedInt(0xf0afd0e3L), 1681338455L),
+                new ForkId(Bytes.ofUnsignedInt(0xdce96c2dL), 0L),
+                new ForkId(Bytes.ofUnsignedInt(0xdce96c2dL), 0L))
           },
           new Object[] {
             NetworkName.MORDOR,
diff --git a/config/src/main/resources/mainnet.json b/config/src/main/resources/mainnet.json
index 9a29b242c58..00668a8cf0e 100644
--- a/config/src/main/resources/mainnet.json
+++ b/config/src/main/resources/mainnet.json
@@ -14,6 +14,7 @@
     "arrowGlacierBlock": 13773000,
     "grayGlacierBlock": 15050000,
     "terminalTotalDifficulty": 58750000000000000000000,
+    "shanghaiTime": 1681338455,
     "ethash": {
     },
     "discovery": {