Fix build

Signed-off-by: Gabriel-Trintinalia <[email protected]>
Consensys · Apr 23, 2024 · f338ab1 · f338ab1
1 parent 4eed40b
commit f338ab1
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 59 deletions.
diff --git a/sequencer/build.gradle b/sequencer/build.gradle
@@ -40,7 +40,7 @@ dependencies {
   compileOnly 'com.google.auto.service:auto-service'
   compileOnly 'com.google.auto.service:auto-service-annotations'
 
-  implementation 'net.consensys.linea.zktracer:arithmetization:0.1.4-20240421.234102-3'
+
   implementation "${besuArtifactGroup}:evm"
   implementation "${besuArtifactGroup}:plugin-api"
   implementation "${besuArtifactGroup}:besu-datatypes"
@@ -69,6 +69,9 @@ dependencies {
   testImplementation "${besuArtifactGroup}.internal:core:${besuVersion}"
   testImplementation "${besuArtifactGroup}.internal:rlp:${besuVersion}"
   testImplementation "${besuArtifactGroup}.internal:core:${besuVersion}"
+  implementation ('net.consensys.linea.zktracer:arithmetization:0.1.4-20240421.234102-3'){
+    transitive = false
+  }
 }
 
 configurations {
@@ -79,3 +82,7 @@ configurations {
 
 apply from: rootProject.file("gradle/dist.gradle")
 apply from: rootProject.file("gradle/publishing.gradle")
+
+jar {
+  zip64=true
+}
diff --git a/sequencer/src/main/java/net/consensys/linea/continoustracing/ContinuousTracer.java b/sequencer/src/main/java/net/consensys/linea/continoustracing/ContinuousTracer.java
@@ -53,7 +53,7 @@ public CorsetValidator.Result verifyTraceOfBlock(
     } catch (final Exception e) {
       throw new TraceVerificationException(blockHash, e.getMessage());
     } finally {
-      zkTracer.traceEndConflation();
+      // zkTracer.traceEndConflation();
     }
 
     for (final TransactionTraceResult transactionTraceResult :

diff --git a/sequencer/src/main/java/net/consensys/linea/continoustracing/TraceFailureHandler.java b/sequencer/src/main/java/net/consensys/linea/continoustracing/TraceFailureHandler.java
@@ -18,10 +18,10 @@
 
 import lombok.extern.slf4j.Slf4j;
 import net.consensys.linea.continoustracing.exception.InvalidTraceHandlerException;
+import net.consensys.linea.corset.CorsetValidator;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.plugin.data.BlockHeader;
 
-
 @Slf4j
 public class TraceFailureHandler {
   final SlackNotificationService slackNotificationService;

diff --git a/sequencer/src/main/java/net/consensys/linea/rpc/capture/CaptureToFile.java b/sequencer/src/main/java/net/consensys/linea/rpc/capture/CaptureToFile.java
@@ -69,7 +69,7 @@ public Capture execute(final PluginRpcRequest request) {
           tracer.setWorld(worldStateBeforeTracing);
           tracer.traceStartConflation(toBlock - fromBlock + 1);
         },
-        worldStateAfterTracing -> tracer.traceEndConflation(),
+        tracer::traceEndConflation,
         tracer);
     log.info("[CAPTURE] capture for {}-{} computed in {}", fromBlock, toBlock, sw);
     return new Capture(tracer.toJson());

diff --git a/sequencer/src/main/java/net/consensys/linea/rpc/counters/GenerateCountersV0.java b/sequencer/src/main/java/net/consensys/linea/rpc/counters/GenerateCountersV0.java
@@ -90,7 +90,7 @@ public Counters execute(final PluginRpcRequest request) {
                             blockNumber,
                             blockNumber,
                             worldStateBeforeTracing -> tracer.traceStartConflation(1),
-                            worldStateAfterTracing -> tracer.traceEndConflation(),
+                            tracer::traceEndConflation,
                             tracer);
 
                         return tracer.getModulesLineCount();

diff --git a/...ncer/src/main/java/net/consensys/linea/rpc/tracegeneration/GenerateConflatedTracesV0.java b/...ncer/src/main/java/net/consensys/linea/rpc/tracegeneration/GenerateConflatedTracesV0.java
@@ -78,7 +78,7 @@ public TraceFile execute(final PluginRpcRequest request) {
           fromBlock,
           toBlock,
           worldStateBeforeTracing -> tracer.traceStartConflation(toBlock - fromBlock + 1),
-          worldStateAfterTracing -> tracer.traceEndConflation(),
+          tracer::traceEndConflation,
           tracer);
       log.info("[TRACING] trace for {}-{} computed in {}", fromBlock, toBlock, sw);
       sw.reset().start();

diff --git a/...er/src/main/java/net/consensys/linea/txpoolvalidation/validators/SimulationValidator.java b/...er/src/main/java/net/consensys/linea/txpoolvalidation/validators/SimulationValidator.java
@@ -81,12 +81,13 @@ public Optional<String> validateTransaction(
         if (simulationResult.isInvalid()) {
           return Optional.of(
               "Invalid transaction"
-                  + simulationResult.getInvalidReason().map(ir -> ": " + ir).orElse(""));
+                  + simulationResult.result().getInvalidReason().map(ir -> ": " + ir).orElse(""));
         }
         if (!simulationResult.isSuccessful()) {
           return Optional.of(
               "Reverted transaction"
                   + simulationResult
+                      .result()
                       .getRevertReason()
                       .map(rr -> ": " + rr.toHexString())
                       .orElse(""));

diff --git a/sequencer/src/main/resources/spillings.toml b/sequencer/src/main/resources/spillings.toml
diff --git a/...rc/test/java/net/consensys/linea/txpoolvalidation/validators/SimulationValidatorTest.java b/...rc/test/java/net/consensys/linea/txpoolvalidation/validators/SimulationValidatorTest.java
@@ -33,7 +33,7 @@
 import net.consensys.linea.config.LineaTracerConfiguration;
 import net.consensys.linea.config.LineaTransactionPoolValidatorConfiguration;
 import net.consensys.linea.modulelimit.ModuleLineCountValidator;
-import net.consensys.linea.sequencer.txselection.selectors.TraceLineLimitTransactionSelectorTest;
+import net.consensys.linea.txselection.selectors.TraceLineLimitTransactionSelectorTest;
 import org.apache.tuweni.bytes.Bytes;
 import org.bouncycastle.asn1.sec.SECNamedCurves;
 import org.bouncycastle.asn1.x9.X9ECParameters;

diff --git a/...et/consensys/linea/txselection/selectors/MaxBlockCallDataSizeTransactionSelectorTest.java b/...et/consensys/linea/txselection/selectors/MaxBlockCallDataSizeTransactionSelectorTest.java
@@ -12,15 +12,14 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package net.consensys.linea.sequencer.txselection.selectors;
+package net.consensys.linea.txselection.selectors;
 
 import static net.consensys.linea.txselection.LineaTransactionSelectionResult.BLOCK_CALLDATA_OVERFLOW;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hyperledger.besu.plugin.data.TransactionSelectionResult.SELECTED;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import net.consensys.linea.txselection.selectors.MaxBlockCallDataTransactionSelector;
 import org.apache.tuweni.bytes.Bytes;
 import org.hyperledger.besu.datatypes.PendingTransaction;
 import org.hyperledger.besu.datatypes.Transaction;

diff --git a/...st/java/net/consensys/linea/txselection/selectors/MaxBlockGasTransactionSelectorTest.java b/...st/java/net/consensys/linea/txselection/selectors/MaxBlockGasTransactionSelectorTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package net.consensys.linea.sequencer.txselection.selectors;
+package net.consensys.linea.txselection.selectors;
 
 import static net.consensys.linea.txselection.LineaTransactionSelectionResult.TX_GAS_EXCEEDS_USER_MAX_BLOCK_GAS;
 import static net.consensys.linea.txselection.LineaTransactionSelectionResult.TX_TOO_LARGE_FOR_REMAINING_USER_GAS;
@@ -21,7 +21,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import net.consensys.linea.txselection.selectors.MaxBlockGasTransactionSelector;
 import org.hyperledger.besu.datatypes.PendingTransaction;
 import org.hyperledger.besu.datatypes.Transaction;
 import org.hyperledger.besu.plugin.data.TransactionProcessingResult;

diff --git a/...est/java/net/consensys/linea/txselection/selectors/ProfitableTransactionSelectorTest.java b/...est/java/net/consensys/linea/txselection/selectors/ProfitableTransactionSelectorTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package net.consensys.linea.sequencer.txselection.selectors;
+package net.consensys.linea.txselection.selectors;
 
 import static net.consensys.linea.txselection.LineaTransactionSelectionResult.TX_UNPROFITABLE;
 import static net.consensys.linea.txselection.LineaTransactionSelectionResult.TX_UNPROFITABLE_MIN_GAS_PRICE_NOT_DECREASED;
@@ -27,7 +27,6 @@
 import net.consensys.linea.config.LineaProfitabilityConfiguration;
 import net.consensys.linea.config.LineaTransactionSelectorCliOptions;
 import net.consensys.linea.config.LineaTransactionSelectorConfiguration;
-import net.consensys.linea.txselection.selectors.ProfitableTransactionSelector;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.bouncycastle.crypto.digests.KeccakDigest;

diff --git a/...test/java/net/consensys/linea/txselection/selectors/TestTransactionEvaluationContext.java b/...test/java/net/consensys/linea/txselection/selectors/TestTransactionEvaluationContext.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package net.consensys.linea.sequencer.txselection.selectors;
+package net.consensys.linea.txselection.selectors;
 
 import com.google.common.base.Stopwatch;
 import org.hyperledger.besu.datatypes.PendingTransaction;

diff --git a/...java/net/consensys/linea/txselection/selectors/TraceLineLimitTransactionSelectorTest.java b/...java/net/consensys/linea/txselection/selectors/TraceLineLimitTransactionSelectorTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package net.consensys.linea.sequencer.txselection.selectors;
+package net.consensys.linea.txselection.selectors;
 
 import static net.consensys.linea.txselection.LineaTransactionSelectionResult.TX_MODULE_LINE_COUNT_OVERFLOW;
 import static net.consensys.linea.txselection.LineaTransactionSelectionResult.TX_MODULE_LINE_COUNT_OVERFLOW_CACHED;
@@ -31,7 +31,6 @@
 import net.consensys.linea.config.LineaTracerConfiguration;
 import net.consensys.linea.config.LineaTransactionSelectorConfiguration;
 import net.consensys.linea.modulelimit.ModuleLineCountValidator;
-import net.consensys.linea.txselection.selectors.TraceLineLimitTransactionSelector;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.hyperledger.besu.datatypes.Address;

diff --git a/sequencer/src/test/resources/sequencer/line-limits.toml b/sequencer/src/test/resources/sequencer/line-limits.toml
@@ -6,6 +6,7 @@ ADD                 = 524286
 BIN                 = 262128
 BIN_RT              = 262144
 EC_DATA             = 4084
+EXP                 = 32760
 EXT                 = 32760
 HUB                 = 2097150
 INSTRUCTION_DECODER = 512 # Ugly hack, TODO: @franklin