From 21dd7bd3fcc3b088827312b6362e0ec23d12bce1 Mon Sep 17 00:00:00 2001 From: anonployed <164473726+anonployed@users.noreply.github.com> Date: Thu, 13 Jun 2024 01:44:59 +0100 Subject: [PATCH 1/2] Update README.md (#21) Fixed typos in the documentation: - Changed "relating" to "related" for correct usage. - Corrected "build" to "built" for proper past tense. - Changed "than" to "then" for proper conditional usage. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6afe4a80..c5380748 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Besu Plugins relating to tracer and sequencer functionality +# Besu Plugins related to tracer and sequencer functionality A Linea tracing implementation for [Hyperledger Besu](https://github.com/hyperledger/besu) based on an [existing implementation in Go](https://github.com/Consensys/zk-evm/). @@ -38,7 +38,7 @@ Linux/MacOs Windows * Requirement [Docker Desktop WSL 2 backend on Windows](https://docs.docker.com/desktop/wsl/) -On release native libs are build for all the supported platforms, +On release native libs are built for all the supported platforms, if you want to test this process locally run `./gradlew -PreleaseNativeLibs jar`, jar is generated in `arithmetization/build/libs`. @@ -115,7 +115,7 @@ ______________________________________________________________________ NOTE > Please be aware if the reference test code generation tasks `blockchainReferenceTests` and -> `generalStateReferenceTests` do not generate any java code, than probably you are missing the Ethereum tests +> `generalStateReferenceTests` do not generate any java code, then probably you are missing the Ethereum tests" > submodule which you can clone via `git submodule update --init --recursive`. ______________________________________________________________________ From a71a239c52ac71a3c9188cc09dd1b6f7ea501c26 Mon Sep 17 00:00:00 2001 From: daniellehrner Date: Fri, 14 Jun 2024 10:27:19 +0200 Subject: [PATCH 2/2] Update besu to 24.6-develop-711dff7 (#18) * Update besu to 24.6-develop-711dff7 * update overridden traceEndTransaction methods --- .../net/consensys/linea/blockcapture/BlockCapturer.java | 2 ++ .../net/consensys/linea/sequencer/TracerAggregator.java | 6 +++++- .../main/java/net/consensys/linea/zktracer/ZkTracer.java | 3 +++ gradle.properties | 2 +- 4 files changed, 11 insertions(+), 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 index fb40ef8f..1427a7e5 100644 --- 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 logs, long gasUsed, + Set
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 index e9733312..14d18868 100644 --- 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 logs, long gasUsed, + Set
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 index 1d949f8b..bac5bc95 100644 --- 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 logs, long gasUsed, + Set
selfDestructs, long timeNs) { this.hub.traceEndTx(worldView, tx, status, output, logs, gasUsed); } diff --git a/gradle.properties b/gradle.properties index 48878dea..0b274583 100644 --- 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/