Update holesky with fixed extraData, genesis time, shanghaiTime (#5890)

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

CHANGELOG.md

@@ -1,8 +1,6 @@
 # Changelog
 
 ## 23.7.3
-### Additions and Improvements
-- Add access to an immutable world view to start/end transaction hooks in the tracing API[#5836](https://github.com/hyperledger/besu/pull/5836)
 
 ### Breaking Changes
 - Removed support for Kotti network (ETC) [#5816](https://github.com/hyperledger/besu/pull/5816)
@@ -11,8 +9,10 @@
     - `--Xlayered-tx-pool-layer-max-capacity`, `--Xlayered-tx-pool-max-prioritized` and `--Xlayered-tx-pool-max-future-by-sender` just drop the `X` and keep the same behavior
 
 ### Additions and Improvements
+- Add access to an immutable world view to start/end transaction hooks in the tracing API[#5836](https://github.com/hyperledger/besu/pull/5836)
 - Layered transaction pool implementation is now stable and enabled by default. If you want still to use the legacy implementation, use `--tx-pool=legacy` [#5772](https://github.com/hyperledger/besu)
 - Tune G1GC to reduce Besu memory footprint, and new `besu-untuned` start scripts to run without any specific G1GC flags [#5879](https://github.com/hyperledger/besu/pull/5879)
+- Update Holesky config for re-launch [#5890](https://github.com/hyperledger/besu/pull/5890)
 
 ### Bug Fixes
 - do not create ignorable storage on revert storage-variables subcommand [#5830](https://github.com/hyperledger/besu/pull/5830) 

besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java

@@ -84,10 +84,9 @@ public class ForkIdsNetworkConfigTest {
           new Object[] {
             NetworkName.HOLESKY,
             List.of(
-                new ForkId(Bytes.ofUnsignedInt(0xa200f558L), 1694790240L),
-                new ForkId(Bytes.ofUnsignedInt(0x840a3b53L), 2000000000L),
-                new ForkId(Bytes.ofUnsignedInt(0x30771f90), 0L),
-                new ForkId(Bytes.ofUnsignedInt(0x30771f90), 0L))
+                new ForkId(Bytes.ofUnsignedInt(0xc61a6098L), 1696000704L),
+                new ForkId(Bytes.ofUnsignedInt(0xfd4f016bL), 0L),
+                new ForkId(Bytes.ofUnsignedInt(0xfd4f016bL), 0L))
           },
           new Object[] {
             NetworkName.GOERLI,

config/src/main/resources/holesky.json

@@ -13,9 +13,8 @@
     "londonBlock": 0,
     "preMergeForkBlock": 0,
     "terminalTotalDifficulty": 0,
-    "shanghaiTime": 1694790240,
+    "shanghaiTime": 1696000704,
     "ethash": {},
-    "cancunTime": 2000000000,
     "discovery": {
       "bootnodes": [
         "enode://ac906289e4b7f12df423d654c5a962b6ebe5b3a74cc9e06292a85221f9a64a6f1cfdd6b714ed6dacef51578f92b34c60ee91e9ede9c7f8fadc4d347326d95e2b@146.190.13.128:30303",
@@ -827,6 +826,7 @@
         "0x000000000000000000000000000000000000000000000000000000000000003e": "0x8869ff2c22b28cc10510d9853292803328be4fb0e80495e8bb8d271f5b889636",
         "0x000000000000000000000000000000000000000000000000000000000000003f": "0xb5fe28e79f1b850f8658246ce9b6a1e7b49fc06db7143e8fe0b4f2b0c5523a5c",
         "0x0000000000000000000000000000000000000000000000000000000000000040": "0x985e929f70af28d0bdd1a90a808f977f597c7c778c489e98d3bd8910d31ac0f7"
+      }
     },
     "0x0000006916a87b82333f4245046623b23794C65C": {
       "balance": "0x52b7d2dcc80cd2e4000000"
@@ -1008,15 +1008,14 @@
     "0x4BC656B34De23896fa6069C9862F355b740401aF": {
       "balance": "0x084595161401484a000000"
     }
-    }
   },
   "coinbase": "0x0000000000000000000000000000000000000000",
   "baseFeePerGas": "0x3B9ACA00",
   "difficulty": "0x01",
-  "extraData": "0x686f77206d7563682069732074686520666973683f",
+  "extraData": "",
   "gasLimit": "0x17D7840",
   "nonce": "0x1234",
   "mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",
   "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "timestamp": "1694786100"
+  "timestamp": "1695902100"
 }