Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
- Fast Sync

### Additions and Improvements
- Performance: Optimise EIP-196 AltBn128: EcAdd 33-128% faster, EcMul 8% faster [#9570](https://github.com/hyperledger/besu/pull/9570)

## 25.12.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

import java.util.Optional;

import com.sun.jna.ptr.IntByReference;
import jakarta.validation.constraints.NotNull;
import org.apache.tuweni.bytes.Bytes;
import org.slf4j.Logger;
Expand Down Expand Up @@ -73,6 +72,7 @@ public static boolean isNative() {

private final byte operationId;
private final int inputLimit;
private final int outputLength;

/**
* Instantiates a new Abstract alt bn precompiled contract.
Expand All @@ -81,15 +81,18 @@ public static boolean isNative() {
* @param gasCalculator the gas calculator
* @param operationId the operation id
* @param inputLen the input len
* @param outputLen the output len
*/
AbstractAltBnPrecompiledContract(
final String name,
final GasCalculator gasCalculator,
final byte operationId,
final int inputLen) {
final int inputLen,
final int outputLen) {
super(name, gasCalculator);
this.operationId = operationId;
this.inputLimit = inputLen + 1;
this.outputLength = outputLen;

if (!LibGnarkEIP196.ENABLED) {
LOG.info("Native alt bn128 not available");
Expand All @@ -107,29 +110,17 @@ public static boolean isNative() {
public PrecompileContractResult computeNative(
final @NotNull Bytes input, final MessageFrame messageFrame) {
final byte[] result = new byte[LibGnarkEIP196.EIP196_PREALLOCATE_FOR_RESULT_BYTES];
final byte[] error = new byte[LibGnarkEIP196.EIP196_PREALLOCATE_FOR_ERROR_BYTES];

final IntByReference o_len =
new IntByReference(LibGnarkEIP196.EIP196_PREALLOCATE_FOR_RESULT_BYTES);
final IntByReference err_len =
new IntByReference(LibGnarkEIP196.EIP196_PREALLOCATE_FOR_ERROR_BYTES);
final int inputSize = Math.min(inputLimit, input.size());
final int errorNo =
LibGnarkEIP196.eip196_perform_operation(
operationId,
input.slice(0, inputSize).toArrayUnsafe(),
inputSize,
result,
o_len,
error,
err_len);

if (errorNo == 0) {
return PrecompileContractResult.success(Bytes.wrap(result, 0, o_len.getValue()));
operationId, input.slice(0, inputSize).toArrayUnsafe(), inputSize, result);

if (errorNo == LibGnarkEIP196.EIP196_ERR_CODE_SUCCESS) {
return PrecompileContractResult.success(Bytes.wrap(result, 0, outputLength));
} else {
final String errorString = new String(error, 0, err_len.getValue(), UTF_8);
messageFrame.setRevertReason(Bytes.wrap(error, 0, err_len.getValue()));
LOG.trace("Error executing precompiled contract {}: '{}'", getName(), errorString);
messageFrame.setRevertReason(Bytes.wrap("error".getBytes(UTF_8)));
LOG.debug("Error executing precompiled contract {}: '{}'", getName(), errorNo);
return PrecompileContractResult.halt(
null, Optional.of(ExceptionalHaltReason.PRECOMPILE_ERROR));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ public class AltBN128AddPrecompiledContract extends AbstractAltBnPrecompiledCont
PRECOMPILE_NAME,
gasCalculator,
LibGnarkEIP196.EIP196_ADD_OPERATION_RAW_VALUE,
PARAMETER_LENGTH);
PARAMETER_LENGTH,
LibGnarkEIP196.EIP196_PREALLOCATE_FOR_RESULT_BYTES);
this.gasCost = gasCost;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ public class AltBN128MulPrecompiledContract extends AbstractAltBnPrecompiledCont
PRECOMPILE_NAME,
gasCalculator,
LibGnarkEIP196.EIP196_MUL_OPERATION_RAW_VALUE,
PARAMETER_LENGTH);
PARAMETER_LENGTH,
LibGnarkEIP196.EIP196_PREALLOCATE_FOR_RESULT_BYTES);
this.gasCost = gasCost;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ public class AltBN128PairingPrecompiledContract extends AbstractAltBnPrecompiled
PRECOMPILE_NAME,
gasCalculator,
LibGnarkEIP196.EIP196_PAIR_OPERATION_RAW_VALUE,
Integer.MAX_VALUE / PARAMETER_LENGTH * PARAMETER_LENGTH);
(Integer.MAX_VALUE / PARAMETER_LENGTH)
* PARAMETER_LENGTH, // round down to nearest multiple of 192
LibGnarkEIP196.EIP196_PAIR_PREALLOCATE_FOR_RESULT_BYTES);
this.pairingGasCost = pairingGasCost;
this.baseGasCost = baseGasCost;
}
Expand Down
144 changes: 40 additions & 104 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4821,20 +4821,12 @@
<sha256 value="e08aed198642584fe427117f1183f5304071accc91cc91631ff6ada2478d2a86" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.hyperledger.besu" name="arithmetic" version="1.4.0">
<artifact name="arithmetic-1.4.0.jar">
<sha256 value="8baeea1b1607e39f8d4e36083649b0779aa0dfef6eb507df22ca406127ded122" origin="Generated by Gradle"/>
<component group="org.hyperledger.besu" name="arithmetic" version="1.4.2">
<artifact name="arithmetic-1.4.2.jar">
<sha256 value="51dd399389e21db56934340da5429413500769f5f84c6396482deb39798ac484" origin="Generated by Gradle"/>
</artifact>
<artifact name="arithmetic-1.4.0.module">
<sha256 value="40685d42666e483702815970df430831e0275333678aef745ab41e2781dd10f1" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.hyperledger.besu" name="arithmetic" version="1.4.1">
<artifact name="arithmetic-1.4.1.jar">
<sha256 value="475c3439f240dd25e470c24ae57bc24e0911856e9d8073184f7c863c9631dacd" origin="Generated by Gradle"/>
</artifact>
<artifact name="arithmetic-1.4.1.module">
<sha256 value="67677f0f55315248ea24e1758619dd0b4cc631ab5d9608de67681877f43227eb" origin="Generated by Gradle"/>
<artifact name="arithmetic-1.4.2.module">
<sha256 value="745528cd3a78e97b5321544abd6a16f84851345e538da045c640f1bd01e2f87f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.hyperledger.besu" name="besu-errorprone-checks" version="1.2.0">
Expand All @@ -4845,116 +4837,60 @@
<sha256 value="ae7814672b6bb56ac51c9e9b6b45cda1055170245df5f5ff94482efb25c35e70" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.hyperledger.besu" name="besu-native-common" version="1.4.0">
<artifact name="besu-native-common-1.4.0.jar">
<sha256 value="3838f8caecbb446095ca107574c99d9e253aca8b5fb5185f8f978c9139f9d956" origin="Generated by Gradle"/>
</artifact>
<artifact name="besu-native-common-1.4.0.module">
<sha256 value="f8e58c39a53d91c565d37f4843805221b36c69525d23c63251a5c3bb1b6f4fc5" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.hyperledger.besu" name="besu-native-common" version="1.4.1">
<artifact name="besu-native-common-1.4.1.jar">
<sha256 value="d4c51b6c86a553ff355fc47e70da7661df77498efcd76894727f613a7b18187d" origin="Generated by Gradle"/>
</artifact>
<artifact name="besu-native-common-1.4.1.module">
<sha256 value="8c356a35a5f76b217d8f03f2aa4d2e72f330244a3286dd05cbb4b9d75a2da249" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.hyperledger.besu" name="blake2bf" version="1.4.0">
<artifact name="blake2bf-1.4.0.jar">
<sha256 value="0c4a3f8d0623b03895bc99790c8eba365cd782061c2a77b0f28252b0db0a8c4d" origin="Generated by Gradle"/>
</artifact>
<artifact name="blake2bf-1.4.0.module">
<sha256 value="9a7a2ce9292bb9a322c3dc7f710081c20f2bc9222acd71f430a5820fbfee0df0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.hyperledger.besu" name="blake2bf" version="1.4.1">
<artifact name="blake2bf-1.4.1.jar">
<sha256 value="7bbcf3424863180e9e00518f8d792b553ab85ad4ddf0ddcc256dcdc8205dd011" origin="Generated by Gradle"/>
</artifact>
<artifact name="blake2bf-1.4.1.module">
<sha256 value="38e0d77f07a4d81a035816a234aae4da9f93f1c82c577512bb4e060a16f09940" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.hyperledger.besu" name="boringssl" version="1.4.0">
<artifact name="boringssl-1.4.0.jar">
<sha256 value="6158e05b382f99e92ad40e5516e9f28fbd788b8fe8d3d27ca29aaee95ed228ae" origin="Generated by Gradle"/>
</artifact>
<artifact name="boringssl-1.4.0.module">
<sha256 value="d8507c494023f0834f8e2f5806f36fb2bd72c1b141e3cc6a9893842f52e308cb" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.hyperledger.besu" name="boringssl" version="1.4.1">
<artifact name="boringssl-1.4.1.jar">
<sha256 value="0d12535b07d383557891121733e98d09dced71b921df31775ff51d4308a0dbb6" origin="Generated by Gradle"/>
</artifact>
<artifact name="boringssl-1.4.1.module">
<sha256 value="bf35aa4d3ff8a491a35fa67b1b08d447e5e6dd3362051eb56b965b9ed65506e5" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.hyperledger.besu" name="gnark" version="1.4.0">
<artifact name="gnark-1.4.0.jar">
<sha256 value="9a1c06d7acfcbcb6cd514c3f2877c3f5d638569203e5e9210e4b154744bd10c5" origin="Generated by Gradle"/>
</artifact>
<artifact name="gnark-1.4.0.module">
<sha256 value="7299a9eefa4ec0366d1b565c86ea97b387fdd91e6c33531efc30a8d892179f2c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.hyperledger.besu" name="gnark" version="1.4.1">
<artifact name="gnark-1.4.1.jar">
<sha256 value="271f7a83c11cec285b937bf790768d72978be2b6b11b96e950ad0a1453f4d5ba" origin="Generated by Gradle"/>
<component group="org.hyperledger.besu" name="besu-native-common" version="1.4.2">
<artifact name="besu-native-common-1.4.2.jar">
<sha256 value="a80889c7bdf2c7e033c076b66d9e9a7fd0e6b509c45673739ac5060fbbfe9e9d" origin="Generated by Gradle"/>
</artifact>
<artifact name="gnark-1.4.1.module">
<sha256 value="6f9912d83f2f628f604b96751f718b2ee3f24fbe3ae03edb54aef800978ce7ff" origin="Generated by Gradle"/>
<artifact name="besu-native-common-1.4.2.module">
<sha256 value="bd0ace4dbad0beee3c23ad168ac96e8f6752332d6557f5fe31a40a056dc6923f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.hyperledger.besu" name="ipa-multipoint" version="1.4.0">
<artifact name="ipa-multipoint-1.4.0.jar">
<sha256 value="86ad3be69194d3188597c80e8f14ad87018495c8dfadc812e62ec9a69098b195" origin="Generated by Gradle"/>
<component group="org.hyperledger.besu" name="blake2bf" version="1.4.2">
<artifact name="blake2bf-1.4.2.jar">
<sha256 value="bbdf68450ef7255349dcc539a7e67dafddfb064c11e07ed7912f81200c234a75" origin="Generated by Gradle"/>
</artifact>
<artifact name="ipa-multipoint-1.4.0.module">
<sha256 value="2418a8b20479b76cca7a05e1f514273be0622979aa0b1f9b5f7a6764c365a0c9" origin="Generated by Gradle"/>
<artifact name="blake2bf-1.4.2.module">
<sha256 value="561ff83bb7e010416933d1902c7332c7bd00ebb11a27bce8e36dcfa5363bdaab" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.hyperledger.besu" name="ipa-multipoint" version="1.4.1">
<artifact name="ipa-multipoint-1.4.1.jar">
<sha256 value="42bee3c5cc282dfa9191197b812529dc047b43c77f199a9b728caf602b2fcf08" origin="Generated by Gradle"/>
<component group="org.hyperledger.besu" name="boringssl" version="1.4.2">
<artifact name="boringssl-1.4.2.jar">
<sha256 value="1c9b8495d7b1f048590a1bc1824f51970272cb2b90a0b858314603d593b4d321" origin="Generated by Gradle"/>
</artifact>
<artifact name="ipa-multipoint-1.4.1.module">
<sha256 value="6719ddc248218cfe6020d32077dd37758c40583ad6ea1cad0606dabdc6a6a2e6" origin="Generated by Gradle"/>
<artifact name="boringssl-1.4.2.module">
<sha256 value="fd2e99bd5252de153940d0263527c03896c9bc4deb8e2d0bef0ac609084de83c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.hyperledger.besu" name="secp256k1" version="1.4.0">
<artifact name="secp256k1-1.4.0.jar">
<sha256 value="d960081703806441453585eff9441962279f52861484c9827af33fb9e6bd3e3e" origin="Generated by Gradle"/>
<component group="org.hyperledger.besu" name="gnark" version="1.4.2">
<artifact name="gnark-1.4.2.jar">
<sha256 value="2be191d83fba5b242361a44629ebaeaca979fd61132543a5b70ca6e2e3ef7d2a" origin="Generated by Gradle"/>
</artifact>
<artifact name="secp256k1-1.4.0.module">
<sha256 value="67b112419d4e053e9ad42bc3e165546af87411c7d4b8d770b6b9e5b984bcaa5b" origin="Generated by Gradle"/>
<artifact name="gnark-1.4.2.module">
<sha256 value="10c4b531782e4c20c362e0c65a77db08cf2ebc54cfdcf1aa61ffb9ec355e29e4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.hyperledger.besu" name="secp256k1" version="1.4.1">
<artifact name="secp256k1-1.4.1.jar">
<sha256 value="4d61cb2ae93214c07a8731e6c5508c09c41e81eda273167794bfdc013844ffdc" origin="Generated by Gradle"/>
<component group="org.hyperledger.besu" name="ipa-multipoint" version="1.4.2">
<artifact name="ipa-multipoint-1.4.2.jar">
<sha256 value="9e7caf0a0c9f87bb94c0baa591c9c4043924d96ee1479e0657967708d98ee58c" origin="Generated by Gradle"/>
</artifact>
<artifact name="secp256k1-1.4.1.module">
<sha256 value="caef91435fe17d97c747c311efc228c060a6bf26e236b812437c82144bcfa5d9" origin="Generated by Gradle"/>
<artifact name="ipa-multipoint-1.4.2.module">
<sha256 value="62dc3bb4296110dfc74c0635412135574cdc0745ffe66e8bc739c7d3a61d3d20" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.hyperledger.besu" name="secp256r1" version="1.4.0">
<artifact name="secp256r1-1.4.0.jar">
<sha256 value="5145b0f7a6a799740db476a715a132d7708e35bd675f62c0cc7627e2782db48a" origin="Generated by Gradle"/>
<component group="org.hyperledger.besu" name="secp256k1" version="1.4.2">
<artifact name="secp256k1-1.4.2.jar">
<sha256 value="665b03c7983c4d60a05edac24b5dc71012b23d356456804b14654298ee7b4342" origin="Generated by Gradle"/>
</artifact>
<artifact name="secp256r1-1.4.0.module">
<sha256 value="672b07fa29953a039e67010b956330aeb6c5af4c3552c3999a3ea1df66877b59" origin="Generated by Gradle"/>
<artifact name="secp256k1-1.4.2.module">
<sha256 value="0fddd001a3ed3af16124f88d247cbcaf7963e3bc3c53d9bd430298713f8a2dbd" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.hyperledger.besu" name="secp256r1" version="1.4.1">
<artifact name="secp256r1-1.4.1.jar">
<sha256 value="81c6ed6bc37ae02f81b8d94aee3cad0650bc0bb7d05fd45a504103850a7e64ba" origin="Generated by Gradle"/>
<component group="org.hyperledger.besu" name="secp256r1" version="1.4.2">
<artifact name="secp256r1-1.4.2.jar">
<sha256 value="f0c1c23c5794caf618cbef08db04d9e5ebe62f56007d0571edd32c53ee0943f4" origin="Generated by Gradle"/>
</artifact>
<artifact name="secp256r1-1.4.1.module">
<sha256 value="58f75e18efc25dde02efed4f47761365279d806337484f803c805fcf6fce8ff7" origin="Generated by Gradle"/>
<artifact name="secp256r1-1.4.2.module">
<sha256 value="11d954042988a1a82e8c50a34bce7ec5605bb8c68da5885be9d11b1a09480704" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.immutables" name="bom" version="2.10.1">
Expand Down
17 changes: 8 additions & 9 deletions platform/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,14 @@ dependencies {

api 'org.hibernate.validator:hibernate-validator:8.0.2.Final'

api 'org.hyperledger.besu:besu-native-common:1.4.1'
api 'org.hyperledger.besu:arithmetic:1.4.1'
api 'org.hyperledger.besu:blake2bf:1.4.1'
api 'org.hyperledger.besu:gnark:1.4.1'
api 'org.hyperledger.besu:ipa-multipoint:1.4.1'
api 'org.hyperledger.besu:secp256k1:1.4.1'
api 'org.hyperledger.besu:secp256r1:1.4.1'
api 'org.hyperledger.besu:boringssl:1.4.1'

api 'org.hyperledger.besu:besu-native-common:1.4.2'
api 'org.hyperledger.besu:arithmetic:1.4.2'
api 'org.hyperledger.besu:blake2bf:1.4.2'
api 'org.hyperledger.besu:gnark:1.4.2'
api 'org.hyperledger.besu:ipa-multipoint:1.4.2'
api 'org.hyperledger.besu:secp256k1:1.4.2'
api 'org.hyperledger.besu:secp256r1:1.4.2'
api 'org.hyperledger.besu:boringssl:1.4.2'
api 'org.hyperledger.besu:besu-errorprone-checks:1.2.0'

api 'org.jacoco:org.jacoco.agent:0.8.12'
Expand Down