Merge branch 'arith-dev' into 1728-blockdata-calls-to-wcp-are-not-cou…

…nted-for-trace-file-limit
Consensys · Jan 23, 2025 · 49708b2 · 49708b2
2 parents 0402ad4 + 18eaeb4
commit 49708b2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/arithmetization/src/main/java/net/consensys/linea/blockcapture/BlockCapturer.java b/arithmetization/src/main/java/net/consensys/linea/blockcapture/BlockCapturer.java
@@ -69,8 +69,9 @@ public void traceStartConflation(long numBlocksInConflation) {}
   public void traceEndConflation(WorldView state) {}
 
   @Override
-  public void traceStartBlock(BlockHeader blockHeader, BlockBody blockBody) {
-    this.reaper.enterBlock(blockHeader, blockBody);
+  public void traceStartBlock(
+      BlockHeader blockHeader, BlockBody blockBody, Address miningBeneficiary) {
+    this.reaper.enterBlock(blockHeader, blockBody, miningBeneficiary);
   }
 
   @Override

diff --git a/arithmetization/src/main/java/net/consensys/linea/blockcapture/reapers/Reaper.java b/arithmetization/src/main/java/net/consensys/linea/blockcapture/reapers/Reaper.java
@@ -69,10 +69,11 @@ public class Reaper {
   /** Collect the account address read / written by the current transaction */
   private AddressReaper txAddresses = null;
 
-  public void enterBlock(final BlockHeader header, final BlockBody body) {
+  public void enterBlock(
+      final BlockHeader header, final BlockBody body, final Address miningBeneficiary) {
     this.blocks.add(
         BlockSnapshot.of((org.hyperledger.besu.ethereum.core.BlockHeader) header, body));
-    this.conflationAddresses.touch(header.getCoinbase());
+    this.conflationAddresses.touch(miningBeneficiary);
     txIndex = 0; // reset
   }
 

diff --git a/...ation/src/main/java/net/consensys/linea/zktracer/types/TransactionProcessingMetadata.java b/...ation/src/main/java/net/consensys/linea/zktracer/types/TransactionProcessingMetadata.java
@@ -144,8 +144,10 @@ public TransactionProcessingMetadata(
     // Note: Besu's dataCost computation contains
     // - the 21_000 transaction cost (we deduce it)
     // - the contract creation cost in case of deployment (we set deployment to false to not add it)
+    // - the baseline gas (gas for access lists and 7702 authorizations) is set to zero, because we
+    // only consider the cost of the transaction payload
     dataCost =
-        ZkTracer.gasCalculator.transactionIntrinsicGasCost(besuTransaction.getPayload(), false)
+        ZkTracer.gasCalculator.transactionIntrinsicGasCost(besuTransaction.getPayload(), false, 0)
             - GAS_CONST_G_TRANSACTION;
     accessListCost =
         besuTransaction.getAccessList().map(ZkTracer.gasCalculator::accessListGasCost).orElse(0L);

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 releaseVersion=beta-v1.2.0-rc0
-besuVersion=25.1-delivery42
+besuVersion=25.1-develop-448d1a9
 besuArtifactGroup=io.consensys.linea-besu
 distributionIdentifier=linea-tracer
 distributionBaseUrl=https://artifacts.consensys.net/public/linea-besu/raw/names/linea-besu.tar.gz/versions/