From 419f65431e2d7286baf20a978f72a21adc8a8703 Mon Sep 17 00:00:00 2001 From: Tsvetan Dimitrov Date: Tue, 9 Jul 2024 18:08:43 +0300 Subject: [PATCH] feat: enable creation of traces output directory on GenerateConflatedTracesV2 RPC endpoint and set it up as a CLI option (#830) Resolves: #829 Signed-off-by: Tsvetan Dimitrov --- .../AbstractLineaRequiredPlugin.java | 2 +- .../AbstractLineaSharedOptionsPlugin.java | 6 ++-- .../config/LineaL1L2BridgeCliOptions.java | 6 ++-- .../config/LineaL1L2BridgeConfiguration.java | 2 +- .../config/LineaTracerCliOptions.java | 18 ++++++++-- .../config/LineaTracerConfiguration.java | 4 +-- .../config/converters/AddressConverter.java | 2 +- .../config/converters/BytesConverter.java | 2 +- .../config/converters/WeiConverter.java | 2 +- .../continoustracing/ContinuousTracer.java | 8 ++--- .../ContinuousTracingBlockAddedListener.java | 8 ++--- .../ContinuousTracingCliOptions.java | 10 +++--- .../ContinuousTracingConfiguration.java | 2 +- .../ContinuousTracingPlugin.java | 2 +- .../SlackNotificationService.java | 2 +- .../continoustracing/TraceFailureHandler.java | 4 +-- .../exception/InvalidBlockTraceException.java | 2 +- .../InvalidTraceHandlerException.java | 2 +- .../exception/TraceOutputException.java | 2 +- .../exception/TraceVerificationException.java | 2 +- .../{ => plugins}/rpc/capture/Capture.java | 2 +- .../capture/CaptureEndpointServicePlugin.java | 4 +-- .../rpc/capture/CaptureParams.java | 2 +- .../rpc/capture/CaptureToFile.java | 2 +- .../{ => plugins}/rpc/counters/Counters.java | 2 +- .../CountersEndpointServicePlugin.java | 4 +-- .../rpc/counters/CountersRequestParams.java | 2 +- .../rpc/counters/GenerateCountersV2.java | 2 +- .../GenerateConflatedTracesV2.java | 30 +++------------- .../rpc/tracegeneration/TraceFile.java | 2 +- .../tracegeneration/TraceRequestParams.java | 2 +- .../TracesEndpointServicePlugin.java | 36 +++++++++++++++++-- .../consensys/linea/zktracer/ZkTracer.java | 2 +- .../ContinuousTracerTest.java | 6 ++-- gradle.properties | 2 +- 35 files changed, 107 insertions(+), 81 deletions(-) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/AbstractLineaRequiredPlugin.java (97%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/AbstractLineaSharedOptionsPlugin.java (92%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/config/LineaL1L2BridgeCliOptions.java (93%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/config/LineaL1L2BridgeConfiguration.java (96%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/config/LineaTracerCliOptions.java (74%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/config/LineaTracerConfiguration.java (91%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/config/converters/AddressConverter.java (94%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/config/converters/BytesConverter.java (94%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/config/converters/WeiConverter.java (94%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/continoustracing/ContinuousTracer.java (93%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/continoustracing/ContinuousTracingBlockAddedListener.java (91%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/continoustracing/ContinuousTracingCliOptions.java (89%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/continoustracing/ContinuousTracingConfiguration.java (93%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/continoustracing/ContinuousTracingPlugin.java (98%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/continoustracing/SlackNotificationService.java (98%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/continoustracing/TraceFailureHandler.java (93%) rename arithmetization/src/main/java/net/consensys/linea/{continoustracing => plugins}/exception/InvalidBlockTraceException.java (94%) rename arithmetization/src/main/java/net/consensys/linea/{continoustracing => plugins}/exception/InvalidTraceHandlerException.java (93%) rename arithmetization/src/main/java/net/consensys/linea/{continoustracing => plugins}/exception/TraceOutputException.java (93%) rename arithmetization/src/main/java/net/consensys/linea/{continoustracing => plugins}/exception/TraceVerificationException.java (94%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/rpc/capture/Capture.java (94%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/rpc/capture/CaptureEndpointServicePlugin.java (95%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/rpc/capture/CaptureParams.java (96%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/rpc/capture/CaptureToFile.java (98%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/rpc/counters/Counters.java (95%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/rpc/counters/CountersEndpointServicePlugin.java (95%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/rpc/counters/CountersRequestParams.java (96%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/rpc/counters/GenerateCountersV2.java (98%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/rpc/tracegeneration/GenerateConflatedTracesV2.java (84%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/rpc/tracegeneration/TraceFile.java (94%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/rpc/tracegeneration/TraceRequestParams.java (96%) rename arithmetization/src/main/java/net/consensys/linea/{ => plugins}/rpc/tracegeneration/TracesEndpointServicePlugin.java (67%) diff --git a/arithmetization/src/main/java/net/consensys/linea/AbstractLineaRequiredPlugin.java b/arithmetization/src/main/java/net/consensys/linea/plugins/AbstractLineaRequiredPlugin.java similarity index 97% rename from arithmetization/src/main/java/net/consensys/linea/AbstractLineaRequiredPlugin.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/AbstractLineaRequiredPlugin.java index 27ec17621c..4281b8717e 100644 --- a/arithmetization/src/main/java/net/consensys/linea/AbstractLineaRequiredPlugin.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/AbstractLineaRequiredPlugin.java @@ -13,7 +13,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea; +package net.consensys.linea.plugins; import lombok.extern.slf4j.Slf4j; import org.hyperledger.besu.plugin.BesuContext; diff --git a/arithmetization/src/main/java/net/consensys/linea/AbstractLineaSharedOptionsPlugin.java b/arithmetization/src/main/java/net/consensys/linea/plugins/AbstractLineaSharedOptionsPlugin.java similarity index 92% rename from arithmetization/src/main/java/net/consensys/linea/AbstractLineaSharedOptionsPlugin.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/AbstractLineaSharedOptionsPlugin.java index 7e1c4b27d5..fb8d044c19 100644 --- a/arithmetization/src/main/java/net/consensys/linea/AbstractLineaSharedOptionsPlugin.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/AbstractLineaSharedOptionsPlugin.java @@ -13,11 +13,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea; +package net.consensys.linea.plugins; import lombok.extern.slf4j.Slf4j; -import net.consensys.linea.config.LineaTracerCliOptions; -import net.consensys.linea.config.LineaTracerConfiguration; +import net.consensys.linea.plugins.config.LineaTracerCliOptions; +import net.consensys.linea.plugins.config.LineaTracerConfiguration; import org.hyperledger.besu.plugin.BesuContext; import org.hyperledger.besu.plugin.BesuPlugin; import org.hyperledger.besu.plugin.services.PicoCLIOptions; diff --git a/arithmetization/src/main/java/net/consensys/linea/config/LineaL1L2BridgeCliOptions.java b/arithmetization/src/main/java/net/consensys/linea/plugins/config/LineaL1L2BridgeCliOptions.java similarity index 93% rename from arithmetization/src/main/java/net/consensys/linea/config/LineaL1L2BridgeCliOptions.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/config/LineaL1L2BridgeCliOptions.java index cfd6c1db50..1ba8e839cb 100644 --- a/arithmetization/src/main/java/net/consensys/linea/config/LineaL1L2BridgeCliOptions.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/config/LineaL1L2BridgeCliOptions.java @@ -13,11 +13,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.config; +package net.consensys.linea.plugins.config; import com.google.common.base.MoreObjects; -import net.consensys.linea.config.converters.AddressConverter; -import net.consensys.linea.config.converters.BytesConverter; +import net.consensys.linea.plugins.config.converters.AddressConverter; +import net.consensys.linea.plugins.config.converters.BytesConverter; import org.apache.tuweni.bytes.Bytes; import org.hyperledger.besu.datatypes.Address; import picocli.CommandLine; diff --git a/arithmetization/src/main/java/net/consensys/linea/config/LineaL1L2BridgeConfiguration.java b/arithmetization/src/main/java/net/consensys/linea/plugins/config/LineaL1L2BridgeConfiguration.java similarity index 96% rename from arithmetization/src/main/java/net/consensys/linea/config/LineaL1L2BridgeConfiguration.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/config/LineaL1L2BridgeConfiguration.java index fb4e74d280..b478dd0153 100644 --- a/arithmetization/src/main/java/net/consensys/linea/config/LineaL1L2BridgeConfiguration.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/config/LineaL1L2BridgeConfiguration.java @@ -13,7 +13,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.config; +package net.consensys.linea.plugins.config; import lombok.Builder; import org.apache.tuweni.bytes.Bytes; diff --git a/arithmetization/src/main/java/net/consensys/linea/config/LineaTracerCliOptions.java b/arithmetization/src/main/java/net/consensys/linea/plugins/config/LineaTracerCliOptions.java similarity index 74% rename from arithmetization/src/main/java/net/consensys/linea/config/LineaTracerCliOptions.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/config/LineaTracerCliOptions.java index 0d75650ee8..326d4069d4 100644 --- a/arithmetization/src/main/java/net/consensys/linea/config/LineaTracerCliOptions.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/config/LineaTracerCliOptions.java @@ -12,7 +12,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.config; +package net.consensys.linea.plugins.config; import com.google.common.base.MoreObjects; import picocli.CommandLine; @@ -21,6 +21,8 @@ public class LineaTracerCliOptions { public static final String MODULE_LIMIT_FILE_PATH = "--plugin-linea-module-limit-file-path"; public static final String DEFAULT_MODULE_LIMIT_FILE_PATH = "moduleLimitFile.toml"; + public static final String CONFLATED_TRACE_GENERATION_TRACES_OUTPUT_PATH = + "--plugin-linea-conflated-trace-generation-traces-output-path"; @CommandLine.Option( names = {MODULE_LIMIT_FILE_PATH}, @@ -30,6 +32,13 @@ public class LineaTracerCliOptions { "Path to the toml file containing the module limits (default: ${DEFAULT-VALUE})") private String moduleLimitFilePath = DEFAULT_MODULE_LIMIT_FILE_PATH; + @CommandLine.Option( + names = {CONFLATED_TRACE_GENERATION_TRACES_OUTPUT_PATH}, + hidden = true, + paramLabel = "", + description = "Path to where traces will be written") + private String tracesOutputPath = null; + private LineaTracerCliOptions() {} /** @@ -50,6 +59,7 @@ public static LineaTracerCliOptions create() { public static LineaTracerCliOptions fromConfig(final LineaTracerConfiguration config) { final LineaTracerCliOptions options = create(); options.moduleLimitFilePath = config.moduleLimitsFilePath(); + options.tracesOutputPath = config.tracesOutputPath(); return options; } @@ -59,13 +69,17 @@ public static LineaTracerCliOptions fromConfig(final LineaTracerConfiguration co * @return the Linea factory configuration */ public LineaTracerConfiguration toDomainObject() { - return LineaTracerConfiguration.builder().moduleLimitsFilePath(moduleLimitFilePath).build(); + return LineaTracerConfiguration.builder() + .tracesOutputPath(tracesOutputPath) + .moduleLimitsFilePath(moduleLimitFilePath) + .build(); } @Override public String toString() { return MoreObjects.toStringHelper(this) .add(MODULE_LIMIT_FILE_PATH, moduleLimitFilePath) + .add(CONFLATED_TRACE_GENERATION_TRACES_OUTPUT_PATH, tracesOutputPath) .toString(); } } diff --git a/arithmetization/src/main/java/net/consensys/linea/config/LineaTracerConfiguration.java b/arithmetization/src/main/java/net/consensys/linea/plugins/config/LineaTracerConfiguration.java similarity index 91% rename from arithmetization/src/main/java/net/consensys/linea/config/LineaTracerConfiguration.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/config/LineaTracerConfiguration.java index a9b690334c..d79f960672 100644 --- a/arithmetization/src/main/java/net/consensys/linea/config/LineaTracerConfiguration.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/config/LineaTracerConfiguration.java @@ -13,10 +13,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.config; +package net.consensys.linea.plugins.config; import lombok.Builder; /** The Linea tracer configuration. */ @Builder(toBuilder = true) -public record LineaTracerConfiguration(String moduleLimitsFilePath) {} +public record LineaTracerConfiguration(String moduleLimitsFilePath, String tracesOutputPath) {} diff --git a/arithmetization/src/main/java/net/consensys/linea/config/converters/AddressConverter.java b/arithmetization/src/main/java/net/consensys/linea/plugins/config/converters/AddressConverter.java similarity index 94% rename from arithmetization/src/main/java/net/consensys/linea/config/converters/AddressConverter.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/config/converters/AddressConverter.java index a1c3c457c4..8e2540bc43 100644 --- a/arithmetization/src/main/java/net/consensys/linea/config/converters/AddressConverter.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/config/converters/AddressConverter.java @@ -12,7 +12,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.config.converters; +package net.consensys.linea.plugins.config.converters; import org.hyperledger.besu.datatypes.Address; import picocli.CommandLine; diff --git a/arithmetization/src/main/java/net/consensys/linea/config/converters/BytesConverter.java b/arithmetization/src/main/java/net/consensys/linea/plugins/config/converters/BytesConverter.java similarity index 94% rename from arithmetization/src/main/java/net/consensys/linea/config/converters/BytesConverter.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/config/converters/BytesConverter.java index 28d73c0122..7915e42de1 100644 --- a/arithmetization/src/main/java/net/consensys/linea/config/converters/BytesConverter.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/config/converters/BytesConverter.java @@ -12,7 +12,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.config.converters; +package net.consensys.linea.plugins.config.converters; import org.apache.tuweni.bytes.Bytes; import picocli.CommandLine; diff --git a/arithmetization/src/main/java/net/consensys/linea/config/converters/WeiConverter.java b/arithmetization/src/main/java/net/consensys/linea/plugins/config/converters/WeiConverter.java similarity index 94% rename from arithmetization/src/main/java/net/consensys/linea/config/converters/WeiConverter.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/config/converters/WeiConverter.java index 33ea66181b..1487eb0cd9 100644 --- a/arithmetization/src/main/java/net/consensys/linea/config/converters/WeiConverter.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/config/converters/WeiConverter.java @@ -12,7 +12,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.config.converters; +package net.consensys.linea.plugins.config.converters; import java.math.BigInteger; diff --git a/arithmetization/src/main/java/net/consensys/linea/continoustracing/ContinuousTracer.java b/arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/ContinuousTracer.java similarity index 93% rename from arithmetization/src/main/java/net/consensys/linea/continoustracing/ContinuousTracer.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/ContinuousTracer.java index 82d64e8d27..801652732c 100644 --- a/arithmetization/src/main/java/net/consensys/linea/continoustracing/ContinuousTracer.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/ContinuousTracer.java @@ -12,7 +12,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.continoustracing; +package net.consensys.linea.plugins.continoustracing; import java.io.IOException; import java.nio.file.Files; @@ -21,10 +21,10 @@ import java.util.Optional; import lombok.extern.slf4j.Slf4j; -import net.consensys.linea.continoustracing.exception.InvalidBlockTraceException; -import net.consensys.linea.continoustracing.exception.TraceOutputException; -import net.consensys.linea.continoustracing.exception.TraceVerificationException; import net.consensys.linea.corset.CorsetValidator; +import net.consensys.linea.plugins.exception.InvalidBlockTraceException; +import net.consensys.linea.plugins.exception.TraceOutputException; +import net.consensys.linea.plugins.exception.TraceVerificationException; import net.consensys.linea.zktracer.ZkTracer; import org.apache.commons.io.FileUtils; import org.hyperledger.besu.datatypes.Hash; diff --git a/arithmetization/src/main/java/net/consensys/linea/continoustracing/ContinuousTracingBlockAddedListener.java b/arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/ContinuousTracingBlockAddedListener.java similarity index 91% rename from arithmetization/src/main/java/net/consensys/linea/continoustracing/ContinuousTracingBlockAddedListener.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/ContinuousTracingBlockAddedListener.java index 970cdef96e..bb4571b454 100644 --- a/arithmetization/src/main/java/net/consensys/linea/continoustracing/ContinuousTracingBlockAddedListener.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/ContinuousTracingBlockAddedListener.java @@ -12,7 +12,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.continoustracing; +package net.consensys.linea.plugins.continoustracing; import java.io.IOException; import java.nio.file.Files; @@ -22,10 +22,10 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import net.consensys.linea.continoustracing.exception.InvalidBlockTraceException; -import net.consensys.linea.continoustracing.exception.InvalidTraceHandlerException; -import net.consensys.linea.continoustracing.exception.TraceVerificationException; import net.consensys.linea.corset.CorsetValidator; +import net.consensys.linea.plugins.exception.InvalidBlockTraceException; +import net.consensys.linea.plugins.exception.InvalidTraceHandlerException; +import net.consensys.linea.plugins.exception.TraceVerificationException; import net.consensys.linea.zktracer.ZkTracer; import org.hyperledger.besu.datatypes.Hash; import org.hyperledger.besu.plugin.data.AddedBlockContext; diff --git a/arithmetization/src/main/java/net/consensys/linea/continoustracing/ContinuousTracingCliOptions.java b/arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/ContinuousTracingCliOptions.java similarity index 89% rename from arithmetization/src/main/java/net/consensys/linea/continoustracing/ContinuousTracingCliOptions.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/ContinuousTracingCliOptions.java index c0cd403d7d..afe24004bd 100644 --- a/arithmetization/src/main/java/net/consensys/linea/continoustracing/ContinuousTracingCliOptions.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/ContinuousTracingCliOptions.java @@ -12,7 +12,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.continoustracing; +package net.consensys.linea.plugins.continoustracing; import com.google.common.base.MoreObjects; import picocli.CommandLine; @@ -24,7 +24,7 @@ public class ContinuousTracingCliOptions { "--plugin-linea-continuous-tracing-zk-evm-bin"; public static final String CONTINUOUS_TRACING_TRACES_DIR = - "--plugin-linea-continuous-tracing-traces-dir"; + "--plugin-linea-continuous-tracing-traces-output-path"; @CommandLine.Option( names = {CONTINUOUS_TRACING_ENABLED}, @@ -45,7 +45,7 @@ public class ContinuousTracingCliOptions { hidden = true, paramLabel = "", description = "Path to where traces will be written") - private String tracesDir = null; + private String tracesOutputPath = null; private ContinuousTracingCliOptions() {} @@ -54,7 +54,7 @@ public static ContinuousTracingCliOptions create() { } public ContinuousTracingConfiguration toDomainObject() { - return new ContinuousTracingConfiguration(continuousTracingEnabled, zkEvmBin, tracesDir); + return new ContinuousTracingConfiguration(continuousTracingEnabled, zkEvmBin, tracesOutputPath); } @Override @@ -62,7 +62,7 @@ public String toString() { return MoreObjects.toStringHelper(this) .add(CONTINUOUS_TRACING_ENABLED, continuousTracingEnabled) .add(CONTINUOUS_TRACING_ZK_EVM_BIN, zkEvmBin) - .add(CONTINUOUS_TRACING_TRACES_DIR, tracesDir) + .add(CONTINUOUS_TRACING_TRACES_DIR, tracesOutputPath) .toString(); } } diff --git a/arithmetization/src/main/java/net/consensys/linea/continoustracing/ContinuousTracingConfiguration.java b/arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/ContinuousTracingConfiguration.java similarity index 93% rename from arithmetization/src/main/java/net/consensys/linea/continoustracing/ContinuousTracingConfiguration.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/ContinuousTracingConfiguration.java index b803ae997d..870a7e46ab 100644 --- a/arithmetization/src/main/java/net/consensys/linea/continoustracing/ContinuousTracingConfiguration.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/ContinuousTracingConfiguration.java @@ -12,7 +12,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.continoustracing; +package net.consensys.linea.plugins.continoustracing; public record ContinuousTracingConfiguration( boolean continuousTracing, String zkEvmBin, String tracesDir) {} diff --git a/arithmetization/src/main/java/net/consensys/linea/continoustracing/ContinuousTracingPlugin.java b/arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/ContinuousTracingPlugin.java similarity index 98% rename from arithmetization/src/main/java/net/consensys/linea/continoustracing/ContinuousTracingPlugin.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/ContinuousTracingPlugin.java index 7972732a58..5d254266c3 100644 --- a/arithmetization/src/main/java/net/consensys/linea/continoustracing/ContinuousTracingPlugin.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/ContinuousTracingPlugin.java @@ -12,7 +12,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.continoustracing; +package net.consensys.linea.plugins.continoustracing; import java.util.Optional; diff --git a/arithmetization/src/main/java/net/consensys/linea/continoustracing/SlackNotificationService.java b/arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/SlackNotificationService.java similarity index 98% rename from arithmetization/src/main/java/net/consensys/linea/continoustracing/SlackNotificationService.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/SlackNotificationService.java index d3a10eabc6..300c0caeb3 100644 --- a/arithmetization/src/main/java/net/consensys/linea/continoustracing/SlackNotificationService.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/SlackNotificationService.java @@ -12,7 +12,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.continoustracing; +package net.consensys.linea.plugins.continoustracing; import static com.slack.api.model.block.Blocks.asBlocks; import static com.slack.api.model.block.Blocks.divider; diff --git a/arithmetization/src/main/java/net/consensys/linea/continoustracing/TraceFailureHandler.java b/arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/TraceFailureHandler.java similarity index 93% rename from arithmetization/src/main/java/net/consensys/linea/continoustracing/TraceFailureHandler.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/TraceFailureHandler.java index ed62584ef9..4a3e63742c 100644 --- a/arithmetization/src/main/java/net/consensys/linea/continoustracing/TraceFailureHandler.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/continoustracing/TraceFailureHandler.java @@ -12,13 +12,13 @@ * * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.continoustracing; +package net.consensys.linea.plugins.continoustracing; import java.io.IOException; import lombok.extern.slf4j.Slf4j; -import net.consensys.linea.continoustracing.exception.InvalidTraceHandlerException; import net.consensys.linea.corset.CorsetValidator; +import net.consensys.linea.plugins.exception.InvalidTraceHandlerException; import org.hyperledger.besu.datatypes.Hash; import org.hyperledger.besu.plugin.data.BlockHeader; diff --git a/arithmetization/src/main/java/net/consensys/linea/continoustracing/exception/InvalidBlockTraceException.java b/arithmetization/src/main/java/net/consensys/linea/plugins/exception/InvalidBlockTraceException.java similarity index 94% rename from arithmetization/src/main/java/net/consensys/linea/continoustracing/exception/InvalidBlockTraceException.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/exception/InvalidBlockTraceException.java index 80847cf15f..8495e1b7f4 100644 --- a/arithmetization/src/main/java/net/consensys/linea/continoustracing/exception/InvalidBlockTraceException.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/exception/InvalidBlockTraceException.java @@ -12,7 +12,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.continoustracing.exception; +package net.consensys.linea.plugins.exception; import org.hyperledger.besu.datatypes.Hash; diff --git a/arithmetization/src/main/java/net/consensys/linea/continoustracing/exception/InvalidTraceHandlerException.java b/arithmetization/src/main/java/net/consensys/linea/plugins/exception/InvalidTraceHandlerException.java similarity index 93% rename from arithmetization/src/main/java/net/consensys/linea/continoustracing/exception/InvalidTraceHandlerException.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/exception/InvalidTraceHandlerException.java index 5e4b2f4ecb..efa3a268bc 100644 --- a/arithmetization/src/main/java/net/consensys/linea/continoustracing/exception/InvalidTraceHandlerException.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/exception/InvalidTraceHandlerException.java @@ -12,7 +12,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.continoustracing.exception; +package net.consensys.linea.plugins.exception; public class InvalidTraceHandlerException extends Throwable { public InvalidTraceHandlerException(Throwable t) { diff --git a/arithmetization/src/main/java/net/consensys/linea/continoustracing/exception/TraceOutputException.java b/arithmetization/src/main/java/net/consensys/linea/plugins/exception/TraceOutputException.java similarity index 93% rename from arithmetization/src/main/java/net/consensys/linea/continoustracing/exception/TraceOutputException.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/exception/TraceOutputException.java index c99c494c4a..cbde89bfb8 100644 --- a/arithmetization/src/main/java/net/consensys/linea/continoustracing/exception/TraceOutputException.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/exception/TraceOutputException.java @@ -12,7 +12,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.continoustracing.exception; +package net.consensys.linea.plugins.exception; public class TraceOutputException extends RuntimeException { public TraceOutputException(final String message) { diff --git a/arithmetization/src/main/java/net/consensys/linea/continoustracing/exception/TraceVerificationException.java b/arithmetization/src/main/java/net/consensys/linea/plugins/exception/TraceVerificationException.java similarity index 94% rename from arithmetization/src/main/java/net/consensys/linea/continoustracing/exception/TraceVerificationException.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/exception/TraceVerificationException.java index 5fb13608c5..a6926c4794 100644 --- a/arithmetization/src/main/java/net/consensys/linea/continoustracing/exception/TraceVerificationException.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/exception/TraceVerificationException.java @@ -12,7 +12,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.continoustracing.exception; +package net.consensys.linea.plugins.exception; import org.hyperledger.besu.datatypes.Hash; diff --git a/arithmetization/src/main/java/net/consensys/linea/rpc/capture/Capture.java b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/capture/Capture.java similarity index 94% rename from arithmetization/src/main/java/net/consensys/linea/rpc/capture/Capture.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/rpc/capture/Capture.java index 7277bdd99b..12f3ec2294 100644 --- a/arithmetization/src/main/java/net/consensys/linea/rpc/capture/Capture.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/capture/Capture.java @@ -13,7 +13,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.rpc.capture; +package net.consensys.linea.plugins.rpc.capture; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/arithmetization/src/main/java/net/consensys/linea/rpc/capture/CaptureEndpointServicePlugin.java b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/capture/CaptureEndpointServicePlugin.java similarity index 95% rename from arithmetization/src/main/java/net/consensys/linea/rpc/capture/CaptureEndpointServicePlugin.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/rpc/capture/CaptureEndpointServicePlugin.java index 3868fb07c4..d77574cbc6 100644 --- a/arithmetization/src/main/java/net/consensys/linea/rpc/capture/CaptureEndpointServicePlugin.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/capture/CaptureEndpointServicePlugin.java @@ -13,13 +13,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.rpc.capture; +package net.consensys.linea.plugins.rpc.capture; import java.util.Optional; import com.google.auto.service.AutoService; import lombok.extern.slf4j.Slf4j; -import net.consensys.linea.AbstractLineaRequiredPlugin; +import net.consensys.linea.plugins.AbstractLineaRequiredPlugin; import org.hyperledger.besu.plugin.BesuContext; import org.hyperledger.besu.plugin.BesuPlugin; import org.hyperledger.besu.plugin.services.RpcEndpointService; diff --git a/arithmetization/src/main/java/net/consensys/linea/rpc/capture/CaptureParams.java b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/capture/CaptureParams.java similarity index 96% rename from arithmetization/src/main/java/net/consensys/linea/rpc/capture/CaptureParams.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/rpc/capture/CaptureParams.java index a9973d99ee..7f5f091d6b 100644 --- a/arithmetization/src/main/java/net/consensys/linea/rpc/capture/CaptureParams.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/capture/CaptureParams.java @@ -13,7 +13,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.rpc.capture; +package net.consensys.linea.plugins.rpc.capture; import java.security.InvalidParameterException; diff --git a/arithmetization/src/main/java/net/consensys/linea/rpc/capture/CaptureToFile.java b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/capture/CaptureToFile.java similarity index 98% rename from arithmetization/src/main/java/net/consensys/linea/rpc/capture/CaptureToFile.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/rpc/capture/CaptureToFile.java index ad7144270f..ce1b2bff5f 100644 --- a/arithmetization/src/main/java/net/consensys/linea/rpc/capture/CaptureToFile.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/capture/CaptureToFile.java @@ -13,7 +13,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.rpc.capture; +package net.consensys.linea.plugins.rpc.capture; import com.google.common.base.Stopwatch; import lombok.extern.slf4j.Slf4j; diff --git a/arithmetization/src/main/java/net/consensys/linea/rpc/counters/Counters.java b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/counters/Counters.java similarity index 95% rename from arithmetization/src/main/java/net/consensys/linea/rpc/counters/Counters.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/rpc/counters/Counters.java index 9e1d2e3610..f5ee7a0bfb 100644 --- a/arithmetization/src/main/java/net/consensys/linea/rpc/counters/Counters.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/counters/Counters.java @@ -13,7 +13,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.rpc.counters; +package net.consensys.linea.plugins.rpc.counters; import java.util.Map; diff --git a/arithmetization/src/main/java/net/consensys/linea/rpc/counters/CountersEndpointServicePlugin.java b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/counters/CountersEndpointServicePlugin.java similarity index 95% rename from arithmetization/src/main/java/net/consensys/linea/rpc/counters/CountersEndpointServicePlugin.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/rpc/counters/CountersEndpointServicePlugin.java index 27e6f5490b..fbae00f0d9 100644 --- a/arithmetization/src/main/java/net/consensys/linea/rpc/counters/CountersEndpointServicePlugin.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/counters/CountersEndpointServicePlugin.java @@ -13,10 +13,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.rpc.counters; +package net.consensys.linea.plugins.rpc.counters; import com.google.auto.service.AutoService; -import net.consensys.linea.AbstractLineaSharedOptionsPlugin; +import net.consensys.linea.plugins.AbstractLineaSharedOptionsPlugin; import org.hyperledger.besu.plugin.BesuContext; import org.hyperledger.besu.plugin.BesuPlugin; import org.hyperledger.besu.plugin.services.RpcEndpointService; diff --git a/arithmetization/src/main/java/net/consensys/linea/rpc/counters/CountersRequestParams.java b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/counters/CountersRequestParams.java similarity index 96% rename from arithmetization/src/main/java/net/consensys/linea/rpc/counters/CountersRequestParams.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/rpc/counters/CountersRequestParams.java index 6fcea1fa42..55dfdf959d 100644 --- a/arithmetization/src/main/java/net/consensys/linea/rpc/counters/CountersRequestParams.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/counters/CountersRequestParams.java @@ -13,7 +13,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.rpc.counters; +package net.consensys.linea.plugins.rpc.counters; import java.security.InvalidParameterException; diff --git a/arithmetization/src/main/java/net/consensys/linea/rpc/counters/GenerateCountersV2.java b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/counters/GenerateCountersV2.java similarity index 98% rename from arithmetization/src/main/java/net/consensys/linea/rpc/counters/GenerateCountersV2.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/rpc/counters/GenerateCountersV2.java index 22159734c0..178f607471 100644 --- a/arithmetization/src/main/java/net/consensys/linea/rpc/counters/GenerateCountersV2.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/counters/GenerateCountersV2.java @@ -13,7 +13,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.rpc.counters; +package net.consensys.linea.plugins.rpc.counters; import java.security.InvalidParameterException; import java.util.Map; diff --git a/arithmetization/src/main/java/net/consensys/linea/rpc/tracegeneration/GenerateConflatedTracesV2.java b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/tracegeneration/GenerateConflatedTracesV2.java similarity index 84% rename from arithmetization/src/main/java/net/consensys/linea/rpc/tracegeneration/GenerateConflatedTracesV2.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/rpc/tracegeneration/GenerateConflatedTracesV2.java index 3c04c34678..6cd237ec44 100644 --- a/arithmetization/src/main/java/net/consensys/linea/rpc/tracegeneration/GenerateConflatedTracesV2.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/tracegeneration/GenerateConflatedTracesV2.java @@ -13,7 +13,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.rpc.tracegeneration; +package net.consensys.linea.plugins.rpc.tracegeneration; import java.nio.file.Files; import java.nio.file.Path; @@ -27,7 +27,6 @@ import net.consensys.linea.zktracer.json.JsonConverter; import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType; import org.hyperledger.besu.plugin.BesuContext; -import org.hyperledger.besu.plugin.services.BesuConfiguration; import org.hyperledger.besu.plugin.services.TraceService; import org.hyperledger.besu.plugin.services.exception.PluginRpcEndpointException; import org.hyperledger.besu.plugin.services.rpc.PluginRpcRequest; @@ -44,7 +43,7 @@ public class GenerateConflatedTracesV2 { private static final JsonConverter CONVERTER = JsonConverter.builder().build(); private final BesuContext besuContext; - private Path tracesPath; + private final Path tracesOutputPath; private TraceService traceService; public String getNamespace() { @@ -66,9 +65,6 @@ public TraceFile execute(final PluginRpcRequest request) { if (this.traceService == null) { this.traceService = getTraceService(); } - if (this.tracesPath == null) { - this.tracesPath = getTracesPath(); - } final Object[] rawParams = request.getParams(); @@ -104,22 +100,6 @@ public TraceFile execute(final PluginRpcRequest request) { } } - private Path getTracesPath() { - final String envVar = System.getenv("TRACES_DIR"); - if (envVar == null) { - return this.besuContext - .getService(BesuConfiguration.class) - .map(BesuConfiguration::getDataPath) - .map(x -> x.resolve("traces")) - .orElseThrow( - () -> - new RuntimeException( - "Unable to find data path. Please ensure BesuConfiguration is registered.")); - } else { - return Paths.get(envVar); - } - } - private TraceService getTraceService() { return this.besuContext .getService(TraceService.class) @@ -137,14 +117,14 @@ private String writeTraceToFile( } private Path generateOutputFileName(final TraceRequestParams traceRequestParams) { - if (!Files.isDirectory(tracesPath) && !tracesPath.toFile().mkdirs()) { + if (!Files.isDirectory(tracesOutputPath) && !tracesOutputPath.toFile().mkdirs()) { throw new RuntimeException( String.format( "Trace directory '%s' does not exist and could not be made.", - tracesPath.toAbsolutePath())); + tracesOutputPath.toAbsolutePath())); } - return tracesPath.resolve( + return tracesOutputPath.resolve( Paths.get( String.format( "%s-%s.conflated.%s.%s", diff --git a/arithmetization/src/main/java/net/consensys/linea/rpc/tracegeneration/TraceFile.java b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/tracegeneration/TraceFile.java similarity index 94% rename from arithmetization/src/main/java/net/consensys/linea/rpc/tracegeneration/TraceFile.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/rpc/tracegeneration/TraceFile.java index 69cb2457be..083983a4be 100644 --- a/arithmetization/src/main/java/net/consensys/linea/rpc/tracegeneration/TraceFile.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/tracegeneration/TraceFile.java @@ -13,7 +13,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.rpc.tracegeneration; +package net.consensys.linea.plugins.rpc.tracegeneration; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/arithmetization/src/main/java/net/consensys/linea/rpc/tracegeneration/TraceRequestParams.java b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/tracegeneration/TraceRequestParams.java similarity index 96% rename from arithmetization/src/main/java/net/consensys/linea/rpc/tracegeneration/TraceRequestParams.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/rpc/tracegeneration/TraceRequestParams.java index 83200f1b2d..20d32574cb 100644 --- a/arithmetization/src/main/java/net/consensys/linea/rpc/tracegeneration/TraceRequestParams.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/tracegeneration/TraceRequestParams.java @@ -13,7 +13,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.rpc.tracegeneration; +package net.consensys.linea.plugins.rpc.tracegeneration; import java.security.InvalidParameterException; diff --git a/arithmetization/src/main/java/net/consensys/linea/rpc/tracegeneration/TracesEndpointServicePlugin.java b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/tracegeneration/TracesEndpointServicePlugin.java similarity index 67% rename from arithmetization/src/main/java/net/consensys/linea/rpc/tracegeneration/TracesEndpointServicePlugin.java rename to arithmetization/src/main/java/net/consensys/linea/plugins/rpc/tracegeneration/TracesEndpointServicePlugin.java index 5b47239480..957467588f 100644 --- a/arithmetization/src/main/java/net/consensys/linea/rpc/tracegeneration/TracesEndpointServicePlugin.java +++ b/arithmetization/src/main/java/net/consensys/linea/plugins/rpc/tracegeneration/TracesEndpointServicePlugin.java @@ -13,11 +13,19 @@ * SPDX-License-Identifier: Apache-2.0 */ -package net.consensys.linea.rpc.tracegeneration; +package net.consensys.linea.plugins.rpc.tracegeneration; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Optional; import com.google.auto.service.AutoService; import lombok.extern.slf4j.Slf4j; -import net.consensys.linea.AbstractLineaSharedOptionsPlugin; +import net.consensys.linea.plugins.AbstractLineaSharedOptionsPlugin; +import net.consensys.linea.plugins.config.LineaTracerCliOptions; +import net.consensys.linea.plugins.exception.TraceOutputException; import org.hyperledger.besu.plugin.BesuContext; import org.hyperledger.besu.plugin.BesuPlugin; import org.hyperledger.besu.plugin.services.RpcEndpointService; @@ -55,11 +63,33 @@ public void register(final BesuContext context) { @Override public void beforeExternalServices() { super.beforeExternalServices(); - GenerateConflatedTracesV2 method = new GenerateConflatedTracesV2(besuContext); + + final Optional tracesOutputPath = initTracesOutputPath(); + if (tracesOutputPath.isEmpty()) { + throw new TraceOutputException( + "Traces output path is null, please specify a valid path with %s CLI option or in a toml config file" + .formatted(LineaTracerCliOptions.CONFLATED_TRACE_GENERATION_TRACES_OUTPUT_PATH)); + } + + GenerateConflatedTracesV2 method = + new GenerateConflatedTracesV2(besuContext, tracesOutputPath.get()); createAndRegister(method, rpcEndpointService); } + private Optional initTracesOutputPath() { + final Optional tracesOutputPath = + Optional.of(Paths.get(tracerConfiguration.tracesOutputPath())); + + try { + Files.createDirectories(tracesOutputPath.get()); + } catch (IOException e) { + throw new TraceOutputException(e.getMessage()); + } + + return tracesOutputPath; + } + /** * Create and register the RPC service. * 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 44ff78a468..d080dd1160 100644 --- a/arithmetization/src/main/java/net/consensys/linea/zktracer/ZkTracer.java +++ b/arithmetization/src/main/java/net/consensys/linea/zktracer/ZkTracer.java @@ -35,7 +35,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import net.consensys.linea.config.LineaL1L2BridgeConfiguration; +import net.consensys.linea.plugins.config.LineaL1L2BridgeConfiguration; import net.consensys.linea.zktracer.module.Module; import net.consensys.linea.zktracer.module.Pin55; import net.consensys.linea.zktracer.module.hub.Hub; diff --git a/arithmetization/src/test/java/net/consensys/linea/continoustracing/ContinuousTracerTest.java b/arithmetization/src/test/java/net/consensys/linea/continoustracing/ContinuousTracerTest.java index 60834aa23b..05d4fe3b17 100644 --- a/arithmetization/src/test/java/net/consensys/linea/continoustracing/ContinuousTracerTest.java +++ b/arithmetization/src/test/java/net/consensys/linea/continoustracing/ContinuousTracerTest.java @@ -22,9 +22,11 @@ import java.nio.file.Path; import java.util.List; -import net.consensys.linea.continoustracing.exception.InvalidBlockTraceException; -import net.consensys.linea.continoustracing.exception.TraceVerificationException; import net.consensys.linea.corset.CorsetValidator; +import net.consensys.linea.plugins.continoustracing.ContinuousTracer; +import net.consensys.linea.plugins.continoustracing.ContinuousTracingConfiguration; +import net.consensys.linea.plugins.exception.InvalidBlockTraceException; +import net.consensys.linea.plugins.exception.TraceVerificationException; import net.consensys.linea.zktracer.ZkTracer; import org.hyperledger.besu.datatypes.Hash; import org.hyperledger.besu.plugin.data.BlockTraceResult; diff --git a/gradle.properties b/gradle.properties index 4e0b3b1cea..c952ca70a2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -releaseVersion=0.1.5-rc2 +releaseVersion=0.1.5-rc6 besuVersion=24.6-develop-752aeff besuArtifactGroup=io.consensys.linea-besu distributionIdentifier=linea-arithmetization