Update besu to 24.6-develop-711dff7 (#18)

* Update besu to 24.6-develop-711dff7 * update overridden traceEndTransaction methods
Consensys · Jun 14, 2024 · a71a239 · a71a239
1 parent 21dd7bd
commit a71a239
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 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
@@ -16,6 +16,7 @@
 package net.consensys.linea.blockcapture;
 
 import java.util.List;
+import java.util.Set;
 
 import com.google.gson.Gson;
 import net.consensys.linea.blockcapture.reapers.Reaper;
@@ -79,6 +80,7 @@ public void traceEndTransaction(
       Bytes output,
       List<Log> logs,
       long gasUsed,
+      Set<Address> selfDestructs,
       long timeNs) {
     this.reaper.exitTransaction(status);
   }

diff --git a/arithmetization/src/main/java/net/consensys/linea/sequencer/TracerAggregator.java b/arithmetization/src/main/java/net/consensys/linea/sequencer/TracerAggregator.java
@@ -17,8 +17,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 import org.apache.tuweni.bytes.Bytes;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Transaction;
 import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
 import org.hyperledger.besu.evm.frame.MessageFrame;
@@ -118,9 +120,11 @@ public void traceEndTransaction(
       Bytes output,
       List<Log> logs,
       long gasUsed,
+      Set<Address> selfDestructs,
       long timeNs) {
     for (OperationTracer tracer : tracers) {
-      tracer.traceEndTransaction(worldView, tx, status, output, logs, gasUsed, timeNs);
+      tracer.traceEndTransaction(
+          worldView, tx, status, output, logs, gasUsed, selfDestructs, timeNs);
     }
   }
 

diff --git a/arithmetization/src/main/java/net/consensys/linea/zktracer/ZkTracer.java b/arithmetization/src/main/java/net/consensys/linea/zktracer/ZkTracer.java
@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -34,6 +35,7 @@
 import net.consensys.linea.zktracer.module.hub.Hub;
 import net.consensys.linea.zktracer.types.Utils;
 import org.apache.tuweni.bytes.Bytes;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.PendingTransaction;
 import org.hyperledger.besu.datatypes.Transaction;
@@ -176,6 +178,7 @@ public void traceEndTransaction(
       Bytes output,
       List<Log> logs,
       long gasUsed,
+      Set<Address> selfDestructs,
       long timeNs) {
     this.hub.traceEndTx(worldView, tx, status, output, logs, gasUsed);
   }

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