fix errors in Falcon precompiled due to code updates

lacchain · Jul 6, 2023 · 11c0f6d · 11c0f6d
1 parent 39d18fa
commit 11c0f6d
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 235 deletions.
diff --git a/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java
@@ -14,9 +14,9 @@
  */
 package org.hyperledger.besu.config;
 
-import static java.util.Collections.emptyMap;
-import static java.util.Objects.isNull;
-
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.ImmutableMap;
+import org.apache.tuweni.units.bigints.UInt256;
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.Wei;
@@ -31,9 +31,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.collect.ImmutableMap;
-import org.apache.tuweni.units.bigints.UInt256;
+import static java.util.Collections.emptyMap;
+import static java.util.Objects.isNull;
 
 /** The Json genesis config options. */
 public class JsonGenesisConfigOptions implements GenesisConfigOptions {
@@ -368,6 +367,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
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.config;
 
+import com.google.common.collect.ImmutableMap;
+import org.apache.tuweni.units.bigints.UInt256;
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.Wei;
@@ -26,9 +28,6 @@
 import java.util.OptionalInt;
 import java.util.OptionalLong;
 
-import com.google.common.collect.ImmutableMap;
-import org.apache.tuweni.units.bigints.UInt256;
-
 /** The Stub genesis config options. */
 public class StubGenesisConfigOptions implements GenesisConfigOptions, Cloneable {
 
@@ -306,6 +305,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
@@ -14,18 +14,17 @@
  */
 package org.hyperledger.besu.datatypes;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static org.hyperledger.besu.crypto.Hash.keccak256;
-
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.bytes.DelegatingBytes;
 import org.hyperledger.besu.crypto.SECPPublicKey;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPException;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.bytes.DelegatingBytes;
+import static com.google.common.base.Preconditions.checkArgument;
+import static org.hyperledger.besu.crypto.Hash.keccak256;
 
 /** A 160-bits account address. */
 public class Address extends DelegatingBytes {
@@ -70,6 +69,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'