Skip to content

Don't Register BLS12 precompiles for Berlin #2015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 13, 2021
Merged

Don't Register BLS12 precompiles for Berlin #2015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd5a5a3
Don't Register BLS12 precompiles for Berlin
shemnon Mar 13, 2021
68e52d5
update tests
shemnon Mar 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
}
Expand Down
1 change: 0 additions & 1 deletion ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,6 @@ static ProtocolSpecBuilder berlinDefinition(
chainId,
Set.of(TransactionType.FRONTIER, TransactionType.ACCESS_LIST),
quorumCompatibilityMode))
.precompileContractRegistryBuilder(MainnetPrecompiledContractRegistries::berlin)
.transactionReceiptFactory(
enableRevertReason
? MainnetProtocolSpecs::berlinTransactionReceiptFactoryWithReasonEnabled
Expand Down
2 changes: 1 addition & 1 deletion .../org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1AddPrecompiledContractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion .../org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MulPrecompiledContractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MultiExpPrecompiledContractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion .../org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2AddPrecompiledContractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion .../org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MulPrecompiledContractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MultiExpPrecompiledContractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFp2ToG2PrecompiledContractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion .../hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFpToG1PrecompiledContractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...rg/hyperledger/besu/ethereum/mainnet/precompiles/BLS12PairingPrecompiledContractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down