diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java index b492b225e38..54fe31ea20d 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java @@ -124,7 +124,7 @@ public static PrecompileContractRegistry istanbul( return registry; } - private static void populateForBerlin( + private static void populateForBLS12( final PrecompileContractRegistry registry, final GasCalculator gasCalculator, final int accountVersion) { @@ -153,10 +153,10 @@ private static void populateForBerlin( new BLS12MapFp2ToG2PrecompiledContract()); } - public static PrecompileContractRegistry berlin( + public static PrecompileContractRegistry bls12( final PrecompiledContractConfiguration precompiledContractConfiguration) { final PrecompileContractRegistry registry = new PrecompileContractRegistry(); - populateForBerlin( + populateForBLS12( registry, precompiledContractConfiguration.getGasCalculator(), Account.DEFAULT_VERSION); return registry; } diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java index 1c912adf413..6e26d003ff7 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java @@ -443,7 +443,6 @@ static ProtocolSpecBuilder berlinDefinition( chainId, Set.of(TransactionType.FRONTIER, TransactionType.ACCESS_LIST), quorumCompatibilityMode)) - .precompileContractRegistryBuilder(MainnetPrecompiledContractRegistries::berlin) .transactionReceiptFactory( enableRevertReason ? MainnetProtocolSpecs::berlinTransactionReceiptFactoryWithReasonEnabled diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1AddPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1AddPrecompiledContractTest.java index 99230156788..809e968521b 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1AddPrecompiledContractTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1AddPrecompiledContractTest.java @@ -40,7 +40,7 @@ public class BLS12G1AddPrecompiledContractTest extends AbstractPrecompiledContractTest { public BLS12G1AddPrecompiledContractTest() { - super(MainnetPrecompiledContractRegistries::berlin, Address.BLS12_G1ADD); + super(MainnetPrecompiledContractRegistries::bls12, Address.BLS12_G1ADD); } private final MessageFrame messageFrame = mock(MessageFrame.class); diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MulPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MulPrecompiledContractTest.java index 94b9d35fbd6..eb6b7546af7 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MulPrecompiledContractTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MulPrecompiledContractTest.java @@ -40,7 +40,7 @@ public class BLS12G1MulPrecompiledContractTest extends AbstractPrecompiledContractTest { public BLS12G1MulPrecompiledContractTest() { - super(MainnetPrecompiledContractRegistries::berlin, Address.BLS12_G1MUL); + super(MainnetPrecompiledContractRegistries::bls12, Address.BLS12_G1MUL); } private final MessageFrame messageFrame = mock(MessageFrame.class); diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MultiExpPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MultiExpPrecompiledContractTest.java index 29d8414f13f..6eda162cb3a 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MultiExpPrecompiledContractTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MultiExpPrecompiledContractTest.java @@ -40,7 +40,7 @@ public class BLS12G1MultiExpPrecompiledContractTest extends AbstractPrecompiledContractTest { public BLS12G1MultiExpPrecompiledContractTest() { - super(MainnetPrecompiledContractRegistries::berlin, Address.BLS12_G1MULTIEXP); + super(MainnetPrecompiledContractRegistries::bls12, Address.BLS12_G1MULTIEXP); } private final MessageFrame messageFrame = mock(MessageFrame.class); diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2AddPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2AddPrecompiledContractTest.java index 66e3b38564a..dbada917542 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2AddPrecompiledContractTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2AddPrecompiledContractTest.java @@ -40,7 +40,7 @@ public class BLS12G2AddPrecompiledContractTest extends AbstractPrecompiledContractTest { public BLS12G2AddPrecompiledContractTest() { - super(MainnetPrecompiledContractRegistries::berlin, Address.BLS12_G2ADD); + super(MainnetPrecompiledContractRegistries::bls12, Address.BLS12_G2ADD); } private final MessageFrame messageFrame = mock(MessageFrame.class); diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MulPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MulPrecompiledContractTest.java index a52872802d1..558c8553260 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MulPrecompiledContractTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MulPrecompiledContractTest.java @@ -40,7 +40,7 @@ public class BLS12G2MulPrecompiledContractTest extends AbstractPrecompiledContractTest { public BLS12G2MulPrecompiledContractTest() { - super(MainnetPrecompiledContractRegistries::berlin, Address.BLS12_G2MUL); + super(MainnetPrecompiledContractRegistries::bls12, Address.BLS12_G2MUL); } private final MessageFrame messageFrame = mock(MessageFrame.class); diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MultiExpPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MultiExpPrecompiledContractTest.java index 8f6a24ef732..17df1029a09 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MultiExpPrecompiledContractTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MultiExpPrecompiledContractTest.java @@ -40,7 +40,7 @@ public class BLS12G2MultiExpPrecompiledContractTest extends AbstractPrecompiledContractTest { public BLS12G2MultiExpPrecompiledContractTest() { - super(MainnetPrecompiledContractRegistries::berlin, Address.BLS12_G2MULTIEXP); + super(MainnetPrecompiledContractRegistries::bls12, Address.BLS12_G2MULTIEXP); } private final MessageFrame messageFrame = mock(MessageFrame.class); diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFp2ToG2PrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFp2ToG2PrecompiledContractTest.java index d985f27f220..9bdeec10365 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFp2ToG2PrecompiledContractTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFp2ToG2PrecompiledContractTest.java @@ -40,7 +40,7 @@ public class BLS12MapFp2ToG2PrecompiledContractTest extends AbstractPrecompiledContractTest { public BLS12MapFp2ToG2PrecompiledContractTest() { - super(MainnetPrecompiledContractRegistries::berlin, Address.BLS12_MAP_FP2_TO_G2); + super(MainnetPrecompiledContractRegistries::bls12, Address.BLS12_MAP_FP2_TO_G2); } private final MessageFrame messageFrame = mock(MessageFrame.class); diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFpToG1PrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFpToG1PrecompiledContractTest.java index 83dfa8f3291..b601449f6da 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFpToG1PrecompiledContractTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFpToG1PrecompiledContractTest.java @@ -40,7 +40,7 @@ public class BLS12MapFpToG1PrecompiledContractTest extends AbstractPrecompiledContractTest { public BLS12MapFpToG1PrecompiledContractTest() { - super(MainnetPrecompiledContractRegistries::berlin, Address.BLS12_MAP_FP_TO_G1); + super(MainnetPrecompiledContractRegistries::bls12, Address.BLS12_MAP_FP_TO_G1); } private final MessageFrame messageFrame = mock(MessageFrame.class); diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12PairingPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12PairingPrecompiledContractTest.java index 32758c6f472..395e7af60b5 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12PairingPrecompiledContractTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12PairingPrecompiledContractTest.java @@ -41,7 +41,7 @@ public class BLS12PairingPrecompiledContractTest extends AbstractPrecompiledContractTest { public BLS12PairingPrecompiledContractTest() { - super(MainnetPrecompiledContractRegistries::berlin, Address.BLS12_PAIRING); + super(MainnetPrecompiledContractRegistries::bls12, Address.BLS12_PAIRING); } private final MessageFrame messageFrame = mock(MessageFrame.class);