Fix build

Consensys · Jun 14, 2024 · c0726e5 · c0726e5
1 parent 81f102a
commit c0726e5
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 9 deletions.
diff --git a/acceptance-tests/build.gradle b/acceptance-tests/build.gradle
@@ -62,6 +62,9 @@ dependencies {
   testImplementation project(":native:compress")
   testImplementation project(":sequencer")
   testImplementation "${besuArtifactGroup}.internal:dsl:$besuVersion"
+  testImplementation "${besuArtifactGroup}.internal:api:${besuVersion}"
+  testImplementation "${besuArtifactGroup}:plugin-api"
+  testImplementation "${besuArtifactGroup}.internal:algorithms:${besuVersion}"
   testImplementation "${besuArtifactGroup}:besu-datatypes:$besuVersion"
   testImplementation "${besuArtifactGroup}.internal:eth:$besuVersion"
   testImplementation "${besuArtifactGroup}.internal:eth:$besuVersion:test-support"

diff --git a/acceptance-tests/src/test/java/linea/plugin/acc/test/rpc/linea/EstimateGasTest.java b/acceptance-tests/src/test/java/linea/plugin/acc/test/rpc/linea/EstimateGasTest.java
@@ -31,7 +31,7 @@
 import net.consensys.linea.bl.TransactionProfitabilityCalculator;
 import net.consensys.linea.config.LineaProfitabilityCliOptions;
 import net.consensys.linea.config.LineaProfitabilityConfiguration;
-import net.consensys.linea.rpc.linea.LineaEstimateGas;
+import net.consensys.linea.rpc.LineaEstimateGas;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.units.bigints.UInt64;
 import org.bouncycastle.crypto.digests.KeccakDigest;

diff --git a/acceptance-tests/src/test/resources/txOverflowModuleLimits.toml b/acceptance-tests/src/test/resources/txOverflowModuleLimits.toml
@@ -17,7 +17,7 @@ EC_DATA             = 4096
 EUC                 = 16384 # can probably be lower
 EXP                 = 32760
 EXT                 = 20
-HUB                 = 30
+HUB                 = 33
 INSTRUCTION_DECODER = 256 # Ugly hack, TODO: @franklin
 MMIO                = 1048576
 MMU                 = 524288

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,6 @@
-releaseVersion=0.1.4-SNAPSHOT
+releaseVersion=0.1.5-SNAPSHOT
 besuVersion=24.6-develop-711dff7
+arithmetizationVersion=0.1.4-TEST-20240613.063642-1
 besuArtifactGroup=io.consensys.linea-besu
 distributionIdentifier=besu-sequencer-plugins
 distributionBaseUrl=https://artifacts.consensys.net/public/linea-besu/raw/names/linea-besu.tar.gz/versions/

diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle
@@ -59,13 +59,17 @@ dependencyManagement {
   }
 
   dependencies {
-    dependency 'net.consensys.linea.zktracer:arithmetization:0.1.4-SNAPSHOT'
+    dependencySet(group: "net.consensys.linea.zktracer", version: "${arithmetizationVersion}") {
+      entry "arithmetization"
+    }
+
 
     // Besu dependencies
     dependencySet(group: "${besuArtifactGroup}", version: "${besuVersion}") {
       entry "besu-datatypes"
       entry "evm"
       entry "plugin-api"
+      entry "internal"
     }
 
     dependency 'com.fasterxml.jackson.core:jackson-databind:2.16.1'

diff --git a/gradle/dist.gradle b/gradle/dist.gradle
@@ -70,12 +70,12 @@ jar {
     )
   }
 
-  from {
+/*  from {
     configurations.runtimeClasspath.filter( {! (it.name =~ /log4j.*\.jar/ )} )
             .collect {it.isDirectory() ? it : zipTree(it) }
   }
   exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA'
-  duplicatesStrategy(DuplicatesStrategy.INCLUDE)
+  duplicatesStrategy(DuplicatesStrategy.INCLUDE)*/
 }
 
 // Takes the version, and if -SNAPSHOT is part of it replaces SNAPSHOT

diff --git a/sequencer/src/main/java/net/consensys/linea/extradata/LineaExtraDataHandler.java b/sequencer/src/main/java/net/consensys/linea/extradata/LineaExtraDataHandler.java
@@ -24,7 +24,7 @@
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.units.bigints.UInt32;
 import org.hyperledger.besu.datatypes.Wei;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
+import org.hyperledger.besu.datatypes.rpc.JsonRpcResponseType;
 import org.hyperledger.besu.plugin.data.AddedBlockContext;
 import org.hyperledger.besu.plugin.data.BlockHeader;
 import org.hyperledger.besu.plugin.services.BesuEvents;

diff --git a/sequencer/src/main/java/net/consensys/linea/rpc/LineaEstimateGas.java b/sequencer/src/main/java/net/consensys/linea/rpc/LineaEstimateGas.java
@@ -43,6 +43,7 @@
 import org.bouncycastle.crypto.params.ECDomainParameters;
 import org.hyperledger.besu.crypto.SECPSignature;
 import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.datatypes.rpc.RpcMethodError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter;
@@ -55,7 +56,6 @@
 import org.hyperledger.besu.plugin.services.TransactionSimulationService;
 import org.hyperledger.besu.plugin.services.exception.PluginRpcEndpointException;
 import org.hyperledger.besu.plugin.services.rpc.PluginRpcRequest;
-import org.hyperledger.besu.plugin.services.rpc.RpcMethodError;
 
 @Slf4j
 public class LineaEstimateGas {

diff --git a/...et/consensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelector.java b/...et/consensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelector.java
@@ -159,7 +159,7 @@ public TransactionSelectionResult evaluateTransactionPostProcessing(
             transaction.getHash(),
             result.getModuleName(),
             result.getModuleLineCount(),
-            result.getModuleLineCount());
+            result.getModuleLineLimit());
         rememberOverLineCountLimitTransaction(transaction);
         return TX_MODULE_LINE_COUNT_OVERFLOW;
       case BLOCK_MODULE_LINE_COUNT_FULL: