Provide SECP256R1 default to precompile (#9307)

Also remove sigleton pattern from ReferenceTestProtocolSchedules.

Author: lu-pinto

ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/CodeValidateSubCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright contributors to Besu.
  *
  * 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
@@ -91,7 +91,7 @@ public CodeValidateSubCommand() {
         Suppliers.memoize(
             () -> {
               if (parentCommand == null) {
-                return ReferenceTestProtocolSchedules.getInstance().geSpecByName(fork).getEvm();
+                return ReferenceTestProtocolSchedules.create().geSpecByName(fork).getEvm();
               }
               return ReferenceTestProtocolSchedules.create(parentCommand.getEvmConfiguration())
                   .geSpecByName(fork)

ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestProtocolSchedules.java

@@ -39,6 +39,11 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+/**
+ * Loads all available protocol schedules into memory and lets users select the appropriate one.
+ * Beware of the high memory usage and object allocation cost since **all** protocol schedules will
+ * be created and initialized for each created instance. This might cause your tests to slow down.
+ */
 public class ReferenceTestProtocolSchedules {
 
   static {
@@ -61,13 +66,8 @@ public class ReferenceTestProtocolSchedules {
           "eip158",
           "eip158tobyzantiumat5");
 
-  private static ReferenceTestProtocolSchedules INSTANCE;
-
-  public static ReferenceTestProtocolSchedules getInstance() {
-    if (INSTANCE == null) {
-      INSTANCE = create(new StubGenesisConfigOptions(), EvmConfiguration.DEFAULT);
-    }
-    return INSTANCE;
+  public static ReferenceTestProtocolSchedules create() {
+    return create(new StubGenesisConfigOptions(), EvmConfiguration.DEFAULT);
   }
 
   public static ReferenceTestProtocolSchedules create(final EvmConfiguration evmConfiguration) {

ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/core/TransactionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright contributors to Besu.
  *
  * 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
@@ -49,13 +49,17 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 public class TransactionTest {
+  private static final ReferenceTestProtocolSchedules PROTOCOL_SCHEDULES;
+
+  static {
+    PROTOCOL_SCHEDULES = ReferenceTestProtocolSchedules.create();
+  }
 
   private static TransactionValidator transactionValidator(final String name) {
-    return ReferenceTestProtocolSchedules.getInstance()
-        .getByName(name)
-        .getByBlockHeader(BlockHeaderBuilder.createDefault().buildBlockHeader())
-        .getTransactionValidatorFactory()
-        .get();
+    return PROTOCOL_SCHEDULES.getByName(name)
+      .getByBlockHeader(BlockHeaderBuilder.createDefault().buildBlockHeader())
+      .getTransactionValidatorFactory()
+      .get();
   }
 
   private static final String TEST_CONFIG_FILE_DIR_PATH = "TransactionTests/";

ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/eof/EOFReferenceTestTools.java

@@ -1,5 +1,5 @@
 /*
- * Copyright contributors to Hyperledger Besu.
+ * Copyright contributors to Besu.
  *
  * 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
@@ -40,11 +40,13 @@
 
 public class EOFReferenceTestTools {
   private static final List<String> EIPS_TO_RUN;
+  private static final ReferenceTestProtocolSchedules PROTOCOL_SCHEDULES;
 
   static {
     final String eips =
         System.getProperty("test.ethereum.eof.eips", "Osaka,Amsterdam,Bogota,Polis,Bangkok");
     EIPS_TO_RUN = Arrays.asList(eips.split(","));
+    PROTOCOL_SCHEDULES = ReferenceTestProtocolSchedules.create();
   }
 
   private static final JsonTestParameters<?, ?> params =
@@ -103,7 +105,7 @@ public static void executeTest(
       final Bytes code,
       final String containerKind,
       final EOFTestCaseSpec.TestResult expected) {
-    EVM evm = ReferenceTestProtocolSchedules.getInstance().geSpecByName(fork).getEvm();
+    EVM evm = PROTOCOL_SCHEDULES.geSpecByName(fork).getEvm();
     assertThat(evm).isNotNull();
 
     // hardwire in the magic byte transaction checks

ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java

@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright contributors to Besu.
  *
  * 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
@@ -71,6 +71,7 @@
 public class BlockchainReferenceTestTools {
 
   private static final List<String> NETWORKS_TO_RUN;
+  private static final ReferenceTestProtocolSchedules PROTOCOL_SCHEDULES;
 
   static {
     final String networks =
@@ -80,6 +81,7 @@ public class BlockchainReferenceTestTools {
                 + "Frontier,Homestead,EIP150,EIP158,Byzantium,Constantinople,ConstantinopleFix,Istanbul,Berlin,"
                 + "London,Merge,Paris,Shanghai,Cancun,Prague,Osaka,Amsterdam,Bogota,Polis,Bangkok");
     NETWORKS_TO_RUN = Arrays.asList(networks.split(","));
+    PROTOCOL_SCHEDULES = ReferenceTestProtocolSchedules.create();
   }
 
   private static final JsonTestParameters<?, ?> params =
@@ -136,8 +138,7 @@ public static void executeTest(final String name, final BlockchainReferenceTestC
             .getWorldState(WorldStateQueryParams.withStateRootAndBlockHashAndUpdateNodeHead(genesisBlockHeader.getStateRoot(), genesisBlockHeader.getHash()))
             .orElseThrow();
 
-    final ProtocolSchedule schedule =
-        ReferenceTestProtocolSchedules.getInstance().getByName(spec.getNetwork());
+    final ProtocolSchedule schedule = PROTOCOL_SCHEDULES.getByName(spec.getNetwork());
 
     final MutableBlockchain blockchain = spec.getBlockchain();
     final ProtocolContext context = spec.getProtocolContext();

ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTestTools.java

@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright contributors to Besu.
  *
  * 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
@@ -55,20 +55,16 @@
 public class GeneralStateReferenceTestTools {
   private static final Logger LOG = LoggerFactory.getLogger(GeneralStateReferenceTestTools.class);
 
-  private static final List<String> SPECS_PRIOR_TO_DELETING_EMPTY_ACCOUNTS =
-      Arrays.asList("Frontier", "Homestead", "EIP150");
-
   private static MainnetTransactionProcessor transactionProcessor(final String name) {
     return protocolSpec(name).getTransactionProcessor();
   }
 
   private static ProtocolSpec protocolSpec(final String name) {
-    return ReferenceTestProtocolSchedules.getInstance()
-        .getByName(name)
-        .getByBlockHeader(BlockHeaderBuilder.createDefault().buildBlockHeader());
+    return PROTOCOL_SCHEDULES.getByName(name).getByBlockHeader(BlockHeaderBuilder.createDefault().buildBlockHeader());
   }
 
   private static final List<String> EIPS_TO_RUN;
+  private static final ReferenceTestProtocolSchedules PROTOCOL_SCHEDULES;
 
   static {
     final String eips =
@@ -77,6 +73,7 @@ private static ProtocolSpec protocolSpec(final String name) {
             "Frontier,Homestead,EIP150,EIP158,Byzantium,Constantinople,ConstantinopleFix,Istanbul,Berlin,"
                 + "London,Merge,Paris,Shanghai,Cancun,Prague,Osaka,Amsterdam,Bogota,Polis,Bangkok");
     EIPS_TO_RUN = Arrays.asList(eips.split(","));
+    PROTOCOL_SCHEDULES = ReferenceTestProtocolSchedules.create();
   }
 
   private static final JsonTestParameters<?, ?> params =
@@ -184,7 +181,7 @@ public static void executeTest(final GeneralStateTestCaseEipSpec spec) {
         .isNull();
 
     final Account coinbase = worldStateUpdater.getOrCreate(spec.getBlockHeader().getCoinbase());
-    if (coinbase != null && coinbase.isEmpty() && shouldClearEmptyAccounts(spec.getFork())) {
+    if (coinbase != null && coinbase.isEmpty() && ReferenceTestProtocolSchedules.shouldClearEmptyAccounts(spec.getFork())) {
       worldStateUpdater.deleteAccount(coinbase.getAddress());
     }
     worldStateUpdater.commit();
@@ -222,10 +219,6 @@ public static void executeTest(final GeneralStateTestCaseEipSpec spec) {
             });
   }
 
-  private static boolean shouldClearEmptyAccounts(final String eip) {
-    return !SPECS_PRIOR_TO_DELETING_EMPTY_ACCOUNTS.contains(eip);
-  }
-
   private static void logWorldState(final ReferenceTestWorldState worldState) {
     ObjectMapper mapper = new ObjectMapper();
     ObjectNode worldStateJson = mapper.createObjectNode();

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

@@ -14,10 +14,12 @@
  */
 package org.hyperledger.besu.evm.precompile;
 
-import org.hyperledger.besu.crypto.SECP256R1;
+import static org.hyperledger.besu.crypto.SignatureAlgorithmType.SECP_256_R1_CURVE_NAME;
+
 import org.hyperledger.besu.crypto.SECPPublicKey;
 import org.hyperledger.besu.crypto.SECPSignature;
 import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmType;
 import org.hyperledger.besu.evm.frame.MessageFrame;
 import org.hyperledger.besu.evm.gascalculator.GasCalculator;
 import org.hyperledger.besu.nativelib.boringssl.BoringSSLPrecompiles;
@@ -41,6 +43,7 @@ public class P256VerifyPrecompiledContract extends AbstractPrecompiledContract {
   private static final Bytes32 VALID = Bytes32.leftPad(Bytes.of(1), (byte) 0);
   private static final Bytes INVALID = Bytes.EMPTY;
   private static final int SECP256R1_INPUT_LENGTH = 160;
+  private static final SignatureAlgorithm SECP256R1_SIGNATURE_ALGORITHM_INSTANCE;
 
   static final X9ECParameters R1_PARAMS = SECNamedCurves.getByName("secp256r1");
   static final BigInteger N = R1_PARAMS.getN();
@@ -52,6 +55,8 @@ public class P256VerifyPrecompiledContract extends AbstractPrecompiledContract {
 
   static {
     maybeEnableNativeBoringSSL();
+    SECP256R1_SIGNATURE_ALGORITHM_INSTANCE =
+        SignatureAlgorithmType.create(SECP_256_R1_CURVE_NAME).getInstance();
   }
 
   /**
@@ -98,7 +103,7 @@ public static boolean isNativeBoringSSL() {
    * @param gasCalculator the gas calculator
    */
   public P256VerifyPrecompiledContract(final GasCalculator gasCalculator) {
-    this(gasCalculator, new SECP256R1());
+    this(gasCalculator, SECP256R1_SIGNATURE_ALGORITHM_INSTANCE);
   }
 
   /**