fix errors in Falcon precompiled due to code updates

lacchain · Jul 6, 2023 · 71c7dc3 · 71c7dc3
1 parent 39d18fa
commit 71c7dc3
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 223 deletions.
diff --git a/build.gradle b/build.gradle
@@ -117,12 +117,13 @@ allprojects {
 
   repositories {
     maven {
-      name = "GitHubPackages"
-      url = uri("https://maven.pkg.github.com/lacchain/liboqs-java/")
+      url 'https://maven.pkg.github.com/lacchain/liboqs-java'
+      content { includeGroupByRegex('org\\.openquantumsafe(\\..*)?') }
       credentials {
         username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
         password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")
       }
+    }
     maven {
       url 'https://hyperledger.jfrog.io/hyperledger/besu-maven'
       content { includeGroupByRegex('org\\.hyperledger\\..*') }
@@ -739,8 +740,6 @@ task testDocker {
 }
 
 task dockerUpload {
-  dependsOn distDocker
-  def dockerBuildVersion = project.hasProperty('release.releaseVersion') ? project.property('release.releaseVersion') : "${rootProject.version}"
   def imageName = "ghcr.io/lacchain/besu"
   def azureImageName = "hyperledger.azurecr.io/besu"
   def image = "${imageName}:${dockerBuildVersion}"
@@ -750,6 +749,10 @@ task dockerUpload {
     additionalTags.add('develop')
   }
 
+  if (!isInterimBuild(dockerBuildVersion)) {
+    additionalTags.add(dockerBuildVersion.split(/\./)[0..1].join('.'))
+  }
+
   doLast {
     for (def variant in dockerVariants) {
       def variantImage = "${image}-${variant}"

diff --git a/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java
@@ -368,6 +368,9 @@ public OptionalLong getThanosBlockNumber() {
   @Override
   public OptionalLong getLacchainPostQuantumBlockNumber() {
     return getOptionalLong("lacchainpqblock");
+  }
+
+  @Override
   public OptionalLong getMagnetoBlockNumber() {
     return getOptionalLong("magnetoblock");
   }

diff --git a/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java
@@ -306,6 +306,8 @@ public OptionalLong getThanosBlockNumber() {
   public OptionalLong getLacchainPostQuantumBlockNumber() {
     return lacchainPostQuantumBlockNumber;
   }
+
+  @Override
   public OptionalLong getMagnetoBlockNumber() {
     return magnetoBlockNumber;
   }

diff --git a/datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java b/datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java
@@ -70,6 +70,8 @@ public class Address extends DelegatingBytes {
   public static final Address BLS12_MAP_FP_TO_G1 = Address.precompiled(0x11);
   /** The constant BLS12_MAP_FP2_TO_G2. */
   public static final Address BLS12_MAP_FP2_TO_G2 = Address.precompiled(0x12);
+  /** Constant for Precompiled Falcon verification signature. */
+  public static final Address LACCHAIN_FALCON = Address.precompiled(0x13);
   /** The constant KZG_POINT_EVAL. */
   public static final Address KZG_POINT_EVAL = Address.precompiled(0x14);
   /** The constant ZERO. */

diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Address.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Address.java
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/LacchainProtocolSpecs.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/LacchainProtocolSpecs.java
@@ -14,9 +14,10 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.FalconPrecompiledContract;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.precompile.FalconPrecompiledContract;
+import org.hyperledger.besu.evm.precompile.PrecompileContractRegistry;
 
 import java.math.BigInteger;
 import java.util.Optional;
@@ -27,21 +28,19 @@ public static ProtocolSpecBuilder postQuantumDefinition(
       final Optional<BigInteger> chainId,
       final OptionalInt contractSizeLimit,
       final OptionalInt configStackSizeLimit,
-      final boolean enableRevertReason,
-      final boolean quorumCompatibilityMode) {
+      final boolean enableRevertReason) {
     return MainnetProtocolSpecs.istanbulDefinition(
             chainId,
             contractSizeLimit,
             configStackSizeLimit,
             enableRevertReason,
-            quorumCompatibilityMode)
+            EvmConfiguration.DEFAULT)
         .precompileContractRegistryBuilder(
             precompiledContractConfiguration -> {
               PrecompileContractRegistry lacchainContractsRegistry =
                   MainnetPrecompiledContractRegistries.istanbul(precompiledContractConfiguration);
               lacchainContractsRegistry.put(
                   Address.LACCHAIN_FALCON,
-                  Account.DEFAULT_VERSION,
                   new FalconPrecompiledContract(
                       precompiledContractConfiguration.getGasCalculator()));
               return lacchainContractsRegistry;

diff --git a/.../core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecFactory.java b/.../core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecFactory.java
@@ -210,6 +210,11 @@ public ProtocolSpecBuilder experimentalEipsDefinition(
         evmConfiguration);
   }
 
+  public ProtocolSpecBuilder lacchainDefinition() {
+    return LacchainProtocolSpecs.postQuantumDefinition(
+        chainId, contractSizeLimit, evmStackSize, isRevertReasonEnabled);
+  }
+
   ////////////////////////////////////////////////////////////////////////////////////////////////
   ////////////////////////////////////////////////////////////////////////////////////////////////
   // Classic Protocol Specs

diff --git a/...eum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java b/...eum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java
@@ -309,6 +309,8 @@ private Stream<Optional<BuilderMapEntry>> createMilestones(
             config.getGrayGlacierBlockNumber(), specFactory.grayGlacierDefinition(config)),
         blockNumberMilestone(
             config.getMergeNetSplitBlockNumber(), specFactory.parisDefinition(config)),
+        blockNumberMilestone(
+            config.getLacchainPostQuantumBlockNumber(), specFactory.lacchainDefinition()),
         // Timestamp Forks
         timestampMilestone(config.getShanghaiTime(), specFactory.shanghaiDefinition(config)),
         timestampMilestone(config.getCancunTime(), specFactory.cancunDefinition(config)),

diff --git a/evm/build.gradle b/evm/build.gradle
@@ -40,6 +40,7 @@ dependencies {
   implementation 'com.github.ben-manes.caffeine:caffeine'
   implementation 'com.google.guava:guava'
   implementation 'net.java.dev.jna:jna'
+  implementation 'org.openquantumsafe:liboqs-java'
   implementation 'org.apache.tuweni:tuweni-bytes'
   implementation 'org.apache.tuweni:tuweni-units'
   implementation 'org.hyperledger.besu:arithmetic'

diff --git a/...recompiles/FalconPrecompiledContract.java → ...precompile/FalconPrecompiledContract.java b/...recompiles/FalconPrecompiledContract.java → ...precompile/FalconPrecompiledContract.java
@@ -12,21 +12,19 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
+package org.hyperledger.besu.evm.precompile;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import org.hyperledger.besu.crypto.Hash;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.AbstractPrecompiledContract;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.openquantumsafe.Signature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * note: Liboqs - random number generation defaults to /dev/urandom a better form is to use the
@@ -35,7 +33,7 @@
  */
 public class FalconPrecompiledContract extends AbstractPrecompiledContract {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractBLS12PrecompiledContract.class);
 
   private static final Bytes METHOD_ABI =
       Hash.keccak256(Bytes.of("verify(bytes,bytes,bytes)".getBytes(UTF_8))).slice(0, 4);
@@ -47,8 +45,9 @@ public FalconPrecompiledContract(final GasCalculator gasCalculator) {
   }
 
   @Override
-  public Gas gasRequirement(final Bytes input) {
-    return gasCalculator().sha256PrecompiledContractGasCost(input);
+  public long gasRequirement(final Bytes input) {
+    long value = gasCalculator().sha256PrecompiledContractGasCost(input);
+    return value;
   }
 
   @Override