add new forkids for testnets, update forkid test to Junit5, no longer need named network specific trusted setups (#6322)

Signed-off-by: jflo <justin+github@florentine.us>

besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java

@@ -1795,7 +1795,7 @@ public class BesuCommand implements DefaultCommandValues, Runnable {
       if (kzgTrustedSetupFile != null) {
         KZGPointEvalPrecompiledContract.init(kzgTrustedSetupFile);
       } else {
-        KZGPointEvalPrecompiledContract.init(network.name());
+        KZGPointEvalPrecompiledContract.init();
       }
     } else if (kzgTrustedSetupFile != null) {
       throw new ParameterException(

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

@@ -45,26 +45,14 @@ import java.util.stream.Stream;
 
 import com.google.common.collect.Streams;
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
+import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.experimental.runners.Enclosed;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-@RunWith(Enclosed.class)
+@RunWith(Parameterized.class)
 public class ForkIdsNetworkConfigTest {
 
-  public static class NotParameterized {
-    @Test
-    public void testFromRaw() {
-      final ForkId forkId = new ForkId(Bytes.ofUnsignedInt(0xfe3366e7L), 1735371L);
-      final List<List<Bytes>> forkIdAsBytesList = List.of(forkId.getForkIdAsBytesList());
-      assertThat(ForkId.fromRawForkId(forkIdAsBytesList).get()).isEqualTo(forkId);
-    }
-  }
-
-  @RunWith(Parameterized.class)
-  public static class ParametrizedForkIdTest {
-
   @Parameterized.Parameter public NetworkName chainName;
 
   @Parameterized.Parameter(1)
@@ -78,15 +66,17 @@ public class ForkIdsNetworkConfigTest {
           List.of(
               new ForkId(Bytes.ofUnsignedInt(0xfe3366e7L), 1735371L),
               new ForkId(Bytes.ofUnsignedInt(0xb96cbd13L), 1677557088L),
-                new ForkId(Bytes.ofUnsignedInt(0xf7f9bc08L), 0L),
+              new ForkId(Bytes.ofUnsignedInt(0xf7f9bc08L), 1706655072L),
-                new ForkId(Bytes.ofUnsignedInt(0xf7f9bc08L), 0L))
+              new ForkId(Bytes.ofUnsignedInt(0x88cf81d9L), 0L),
+              new ForkId(Bytes.ofUnsignedInt(0x88cf81d9L), 0L))
         },
         new Object[] {
           NetworkName.HOLESKY,
           List.of(
               new ForkId(Bytes.ofUnsignedInt(0xc61a6098L), 1696000704L),
-                new ForkId(Bytes.ofUnsignedInt(0xfd4f016bL), 0L),
+              new ForkId(Bytes.ofUnsignedInt(0xfd4f016bL), 1707305664L),
-                new ForkId(Bytes.ofUnsignedInt(0xfd4f016bL), 0L))
+              new ForkId(Bytes.ofUnsignedInt(0x9b192ad0L), 0L),
+              new ForkId(Bytes.ofUnsignedInt(0x9b192ad0L), 0L))
         },
         new Object[] {
           NetworkName.GOERLI,
@@ -95,8 +85,9 @@ public class ForkIdsNetworkConfigTest {
               new ForkId(Bytes.ofUnsignedInt(0xc25efa5cL), 4460644L),
               new ForkId(Bytes.ofUnsignedInt(0x757a1c47L), 5062605L),
               new ForkId(Bytes.ofUnsignedInt(0xb8c6299dL), 1678832736L),
-                new ForkId(Bytes.ofUnsignedInt(0xf9843abfL), 0L),
+              new ForkId(Bytes.ofUnsignedInt(0xf9843abfL), 1705473120),
-                new ForkId(Bytes.ofUnsignedInt(0xf9843abfL), 0L))
+              new ForkId(Bytes.ofUnsignedInt(0x70cc14e2L), 0L),
+              new ForkId(Bytes.ofUnsignedInt(0x70cc14e2L), 0L))
         },
         new Object[] {
           NetworkName.MAINNET,
@@ -153,12 +144,12 @@ public class ForkIdsNetworkConfigTest {
         });
   }
 
-    @Test
+  @ParameterizedTest
-    public void testForkId() {
+  @MethodSource("parameters")
+  public void testForkId(final NetworkName chainName, final List<ForkId> expectedForkIds) {
     final GenesisConfigFile genesisConfigFile =
         GenesisConfigFile.fromConfig(EthNetworkConfig.jsonConfig(chainName));
-      final MilestoneStreamingTransitionProtocolSchedule schedule =
+    final MilestoneStreamingTransitionProtocolSchedule schedule = createSchedule(genesisConfigFile);
-          createSchedule(genesisConfigFile);
     final GenesisState genesisState = GenesisState.fromConfig(genesisConfigFile, schedule);
     final Blockchain mockBlockchain = mock(Blockchain.class);
     final BlockHeader mockBlockHeader = mock(BlockHeader.class);
@@ -223,5 +214,4 @@ public class ForkIdsNetworkConfigTest {
           MilestoneStreamingProtocolSchedule::streamMilestoneBlocks);
     }
   }
-  }
 }

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

@@ -0,0 +1,34 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.ethereum.forkid.ForkId;
+
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+
+public class RawForkIdTest {
+  @Test
+  public void testFromRaw() {
+    final ForkId forkId = new ForkId(Bytes.ofUnsignedInt(0xfe3366e7L), 1735371L);
+    final List<List<Bytes>> forkIdAsBytesList = List.of(forkId.getForkIdAsBytesList());
+    assertThat(ForkId.fromRawForkId(forkIdAsBytesList).get()).isEqualTo(forkId);
+  }
+}

config/src/main/resources/goerli.json

@@ -7,6 +7,7 @@
     "londonBlock":5062605,
     "terminalTotalDifficulty": 10790000,
     "shanghaiTime": 1678832736,
+    "cancunTime": 1705473120,
     "clique":{
       "blockperiodseconds":15,
       "epochlength":30000

config/src/main/resources/holesky.json

@@ -14,6 +14,7 @@
     "preMergeForkBlock": 0,
     "terminalTotalDifficulty": 0,
     "shanghaiTime": 1696000704,
+    "cancunTime": 1707305664,
     "ethash": {},
     "discovery": {
       "bootnodes": [

config/src/main/resources/sepolia.json

@@ -14,6 +14,7 @@
     "mergeNetSplitBlock": 1735371,
     "terminalTotalDifficulty": 17000000000000000,
     "shanghaiTime": 1677557088,
+    "cancunTime": 1706655072,
     "ethash":{},
     "discovery": {
       "dns": "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.sepolia.ethdisco.net",

evm/src/main/java/org/hyperledger/besu/evm/precompile/KZGPointEvalPrecompiledContract.java

@@ -39,7 +39,7 @@ public class KZGPointEvalPrecompiledContract implements PrecompiledContract {
 
   private static Bytes successResult;
 
-  private static void init() {
+  private static void loadLib() {
     CKZG4844JNI.loadNativeLibrary();
     Bytes fieldElementsPerBlob =
         Bytes32.wrap(Words.intBytes(CKZG4844JNI.FIELD_ELEMENTS_PER_BLOB).xor(Bytes32.ZERO));
@@ -57,7 +57,7 @@ public class KZGPointEvalPrecompiledContract implements PrecompiledContract {
    */
   public static void init(final Path trustedSetupFile) {
     if (loaded.compareAndSet(false, true)) {
-      init();
+      loadLib();
       final String trustedSetupResourceName = trustedSetupFile.toAbsolutePath().toString();
       LOG.info("Loading trusted setup from user-specified resource {}", trustedSetupResourceName);
       CKZG4844JNI.loadTrustedSetup(trustedSetupResourceName);
@@ -67,17 +67,14 @@ public class KZGPointEvalPrecompiledContract implements PrecompiledContract {
   }
 
   /**
-   * Init the C-KZG native lib using a resource identified by the passed network name as trusted
+   * Init the C-KZG native lib using mainnet trusted setup
-   * setup
    *
-   * @param networkName used to select the resource in /kzg-trusted-setups/ to use.
    * @throws IllegalStateException is the trusted setup was already loaded
    */
-  public static void init(final String networkName) {
+  public static void init() {
     if (loaded.compareAndSet(false, true)) {
-      init();
+      loadLib();
-      final String trustedSetupResourceName =
+      final String trustedSetupResourceName = "/kzg-trusted-setups/mainnet.txt";
-          "/kzg-trusted-setups/" + networkName.toLowerCase() + ".txt";
       LOG.info(
           "Loading network trusted setup from classpath resource {}", trustedSetupResourceName);
       CKZG4844JNI.loadTrustedSetupFromResource(

evm/src/test/java/org/hyperledger/besu/evm/precompile/KZGPointEvalPrecompileContractTest.java

@@ -44,7 +44,7 @@ public class KZGPointEvalPrecompileContractTest {
 
   @BeforeAll
   public static void init() {
-    KZGPointEvalPrecompiledContract.init("mainnet");
+    KZGPointEvalPrecompiledContract.init();
     contract = new KZGPointEvalPrecompiledContract();
   }
 
@@ -55,7 +55,7 @@ public class KZGPointEvalPrecompileContractTest {
 
   @ParameterizedTest(name = "{index}")
   @MethodSource("getPointEvaluationPrecompileTestVectors")
-  public void testComputePrecompile(final PrecompileTestParameters parameters) {
+  void testComputePrecompile(final PrecompileTestParameters parameters) {
     when(toRun.getVersionedHashes()).thenReturn(Optional.of(List.of(parameters.versionedHash)));
     PrecompiledContract.PrecompileContractResult result =
         contract.computePrecompile(parameters.input, toRun);