timestamp set for dencun on mainnet. (#6545)

* timestamp set for dencun on mainnet, lfg. --------- Signed-off-by: Justin Florentine <justin+github@florentine.us>
hyperledger · Feb 9, 2024 · c23eb24 · c23eb24
1 parent 40d1e76
commit c23eb24
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java
@@ -107,8 +107,9 @@ public static Collection<Object[]> parameters() {
               new ForkId(Bytes.ofUnsignedInt(0xb715077dL), 13773000L),
               new ForkId(Bytes.ofUnsignedInt(0x20c327fcL), 15050000L),
               new ForkId(Bytes.ofUnsignedInt(0xf0afd0e3L), 1681338455L),
-              new ForkId(Bytes.ofUnsignedInt(0xdce96c2dL), 0L),
-              new ForkId(Bytes.ofUnsignedInt(0xdce96c2dL), 0L))
+              new ForkId(Bytes.ofUnsignedInt(0xdce96c2dL), 1710338135L),
+              new ForkId(Bytes.ofUnsignedInt(0x9f3d2254L), 0L),
+              new ForkId(Bytes.ofUnsignedInt(0x9f3d2254L), 0L))
         },
         new Object[] {
           NetworkName.MORDOR,

diff --git a/config/src/main/resources/mainnet.json b/config/src/main/resources/mainnet.json
@@ -15,6 +15,7 @@
     "grayGlacierBlock": 15050000,
     "terminalTotalDifficulty": 58750000000000000000000,
     "shanghaiTime": 1681338455,
+    "cancunTime": 1710338135,
     "ethash": {
     },
     "discovery": {

diff --git a/.../reference-test/java/org/hyperledger/besu/ethereum/mainnet/DifficultyCalculatorTests.java b/.../reference-test/java/org/hyperledger/besu/ethereum/mainnet/DifficultyCalculatorTests.java
@@ -31,6 +31,8 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Stream;
 
@@ -46,12 +48,15 @@
 public class DifficultyCalculatorTests {
 
   public static Stream<Arguments> getTestParametersForConfig() throws IOException {
+    Map<String, String> postMergeOverrides = new HashMap<>();
+    postMergeOverrides.put("shanghaiTime", "999999999999");
+    postMergeOverrides.put("cancunTime","999999999999");
     return Stream.of(
         Arguments.of(
             "/BasicTests/difficultyMainNetwork.json",
             MainnetProtocolSchedule.fromConfig(
                 GenesisConfigFile.mainnet()
-                    .getConfigOptions(Map.of("shanghaiTime", "999999999999")),
+                    .getConfigOptions(postMergeOverrides),
                 EvmConfiguration.DEFAULT)),
         Arguments.of(
           "/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierForkBlock.json",

diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/KZGPointEvalPrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/KZGPointEvalPrecompiledContract.java
@@ -79,8 +79,6 @@ public static void init() {
           "Loading network trusted setup from classpath resource {}", trustedSetupResourceName);
       CKZG4844JNI.loadTrustedSetupFromResource(
           trustedSetupResourceName, KZGPointEvalPrecompiledContract.class);
-    } else {
-      throw new IllegalStateException("KZG trusted setup was already loaded");
     }
   }