feat: remove switch-to-linea-besu, counter-v1, conflation-v1, file-ma… (#952)

* feat: remove switch-to-linea-besu, counter-v1, conflation-v1, file-manager related configs and their reference codes in L1DependentApp * fix: spotless * feat: remove traces-api-facade module * feat: remove traces-counter-v1 from coordinator config and removed TracesFileManager, TracesRpcClientV1, TraceCounterV1WatcherClient classes * feat: removed TracesCounterV1 and update tests * feat: removed TracingModuleV1 and traces-limits-v1 toml files * feat: removed TracesClientV1, TracesClientV2Adapter, and revised codes accordingly * feat: removed FileManager in CoordinatorConfig and updated test case for assertConsecutiveBlocksRange * feat: updated l2-node-besu docker-compose configs * feat: rename traces-node-v2 to traces-node in all places * feat: use prover v3 compression proofs for tests * fix: spotless
2026-01-09 04:08:01 -05:00 · 2025-05-09 19:52:46 +08:00
parent 5b7a84185d
commit 47a9d07d4f
96 changed files with 444 additions and 7940 deletions
--- a/config/common/traces-limits-besu-v1.toml
+++ b/config/common/traces-limits-besu-v1.toml
@@ -1,73 +0,0 @@
-[traces-limits]
-#
-# Arithmetization module limits
-#
-ADD                 = 524288
-BIN                 = 262144
-#BIN_RT              = 262144
-EC_DATA             = 4096
-EUC                 = 1
-EXT                 = 131072
-HUB                 = 2097152
-INSTRUCTION_DECODER = 512 # Ugly hack, TODO: @franklin
-MMIO                = 1048576
-MMU                 = 524288
-#MMU_ID              = 256
-MOD                 = 131072
-MUL                 = 65536
-MXP                 = 524288
-#PHONEY_RLP          = 65536 # can probably get lower
-PUB_HASH            = 32768
-PUB_HASH_INFO       = 8192
-#OLD_PUB_HASH        = 32768
-#OLD_PUB_HASH_INFO   = 8192
-PUB_LOG             = 16384
-PUB_LOG_INFO        = 16384
-#RLP                 = 128
-ROM                 = 1048576
-ROM_LEX             = 1048576
-SHF                 = 65536
-#SHF_RT              = 262144
-TX_RLP              = 131072
-TRM                 = 131072
-WCP                 = 262144
-#LOG_DATA            = 262144
-#LOG_INFO            = 262144
-RLP_ADDR            = 262144
-#RLP_TXN             = 262144
-RLP_TXRCPT          = 262144
-TXN_DATA            = 262144
-STP                 = 262144
-
-#
-# Block-specific limits
-#
-BLOCK_TX       = 200 # max number of tx in an L2 block
-BLOCK_L2L1LOGS = 16
-BLOCK_KECCAK   = 8192
-BLOCK_L1SIZE   = 1000000
-
-#
-# Precompiles limits
-#
-PRECOMPILE_ECRECOVER = 10000
-PRECOMPILE_ECRECOVER_EFFECTIVE_CALL = 1000000
-PRECOMPILE_SHA2      = 10000
-PRECOMPILE_SHA2_BLOCKS = 1000000
-PRECOMPILE_SHA2_EFFECTIVE_CALL = 1000000
-PRECOMPILE_RIPEMD    = 10000
-PRECOMPILE_RIPEMD_EFFECTIVE_CALL = 1000000
-PRECOMPILE_RIPEMD_BLOCKS = 1000000
-PRECOMPILE_IDENTITY  = 10000
-PRECOMPILE_MODEXP    = 10000
-PRECOMPILE_MODEXP_EFFECTIVE_CALL = 1000
-PRECOMPILE_ECADD     = 10000
-PRECOMPILE_ECADD_EFFECTIVE_CALL     = 1000000
-PRECOMPILE_ECMUL     = 10000
-PRECOMPILE_ECMUL_EFFECTIVE_CALL     = 1000000
-PRECOMPILE_ECPAIRING = 10000
-PRECOMPILE_ECPAIRING_EFFECTIVE_CALL = 1000000
-PRECOMPILE_ECPAIRING_MILLER_LOOP = 1000000
-#PRECOMPILE_ECPAIRING_WEIGHTED = 10000
-PRECOMPILE_BLAKE2F   = 512
-PRECOMPILE_BLAKE2F_ROUNDS = 1000000
--- a/config/common/traces-limits-v1.toml
+++ b/config/common/traces-limits-v1.toml
@@ -1,55 +0,0 @@
-##
-# This file specifies prover limit by each EVM module
-# WARN: The prover/arithmetization team has the owneship of this.
-# Changing this values may compromise the system.
-# issue: https://github.com/ConsenSys/zkevm-monorepo/issues/525
-##
-
-[traces-limits]
-#
-# Arithmetization module limits
-#
-ADD = 524288
-BIN = 262144
-BIN_RT = 262144
-EC_DATA = 4096
-EXT = 131072
-HUB = 2097152
-INSTRUCTION_DECODER = 512
-MMIO = 131072
-MMU = 131072
-MMU_ID = 131072
-MOD = 131072
-MUL = 65536
-MXP = 524288
-PHONEY_RLP = 32768
-PUB_HASH = 32768
-PUB_HASH_INFO = 32768
-PUB_LOG = 16384
-PUB_LOG_INFO = 16384
-RLP = 512
-ROM = 4194304
-SHF = 65536
-SHF_RT = 4096
-TX_RLP = 131072
-WCP = 262144
-
-#
-# Block-specific limits
-#
-BLOCK_TX       = 200 # max number of tx in an L2 block
-BLOCK_L2L1LOGS = 16
-BLOCK_KECCAK   = 8192
-
-#
-# Precompiles limits
-#
-PRECOMPILE_ECRECOVER = 10000
-PRECOMPILE_SHA2      = 10000
-PRECOMPILE_RIPEMD    = 10000
-PRECOMPILE_IDENTITY  = 10000
-PRECOMPILE_MODEXP    = 10000
-PRECOMPILE_ECADD     = 10000
-PRECOMPILE_ECMUL     = 10000
-PRECOMPILE_ECPAIRING = 10000
-PRECOMPILE_BLAKE2F   = 512
--- a/config/coordinator/coordinator-docker-testnet.config.overrides.toml
+++ b/config/coordinator/coordinator-docker-testnet.config.overrides.toml
@@ -1,16 +0,0 @@
-# Can override any of this propeties in CLI as follows:
-# -Dconfig.override.sequencer.engine-api=http://127.0.0.1:8650
-
-#[sequencer]
-#version="0.0.1"
-#engine-api="http://traces-node:8550"
-#eth-api="http://traces-node:8545"
-
-# Config of Traces API Facade endpoint
-[traces]
-endpoints=["http://traces-api:8080/"]
-[traces.file-manager]
-polling-interval="PT0S"
-
-[l1]
-disabled=true
--- a/config/coordinator/coordinator-docker-traces-v2-override.config.toml
+++ b/config/coordinator/coordinator-docker-traces-v2-override.config.toml
@@ -10,16 +10,15 @@ fs-requests-directory = "/data/prover/v3/aggregation/requests"
 fs-responses-directory = "/data/prover/v3/aggregation/responses"

 [traces]
-switch-to-linea-besu=true
 blob-compressor-version="V1_0_1"
 expected-traces-api-version-v2="beta-v2.1-rc14"
 [traces.counters-v2]
-endpoints=["http://traces-node-v2:8545/"]
+endpoints=["http://traces-node:8545/"]
 request-limit-per-endpoint=1
 request-retry.backoff-delay="PT1S"
 request-retry.failures-warning-threshold=2
 [traces.conflation-v2]
-endpoints=["http://traces-node-v2:8545/"]
+endpoints=["http://traces-node:8545/"]
 request-limit-per-endpoint=1
 request-retry.backoff-delay="PT1S"
 request-retry.failures-warning-threshold=2
--- a/config/coordinator/coordinator-docker.config.toml
+++ b/config/coordinator/coordinator-docker.config.toml
@@ -56,30 +56,20 @@ fs-responses-directory = "/data/prover/v2/aggregation/responses"
 #fs-responses-directory = "/data/prover/v3/aggregation/responses"

 [traces]
-switch-to-linea-besu=false
 blob-compressor-version="V0_1_0"
 raw-execution-traces-version="0.2.0"
-expected-traces-api-version="0.2.0"
-[traces.counters]
-endpoints=["http://traces-api:8080/"]
-request-limit-per-endpoint=2
+expected-traces-api-version-v2="beta-v2.1-rc14"
+[traces.counters-v2]
+endpoints=["http://traces-node:8545/"]
+request-limit-per-endpoint=1
 request-retry.backoff-delay="PT1S"
 request-retry.failures-warning-threshold=2
-[traces.conflation]
-endpoints=["http://traces-api:8080/"]
-request-limit-per-endpoint=2
+[traces.conflation-v2]
+endpoints=["http://traces-node:8545/"]
+request-limit-per-endpoint=1
 request-retry.backoff-delay="PT1S"
 request-retry.failures-warning-threshold=2

-
-[traces.file-manager]
-traces-file-extension="json.gz"
-raw-traces-directory="/data/traces/raw"
-non-canonical-raw-traces-directory="/data/traces/raw-non-canonical"
-create-non-canonical-directory=true
-polling-interval="PT1S"
-traces-file-creation-wait-timeout="PT2M"
-
 [state-manager]
 version="2.3.0"
 endpoints=["http://shomei:8888/"]
--- a/config/coordinator/coordinator-local-dev.config.overrides.toml
+++ b/config/coordinator/coordinator-local-dev.config.overrides.toml
@@ -12,25 +12,23 @@ endpoint="http://127.0.0.1:9000"

 [prover]
 [prover.execution]
-fs-requests-directory = "tmp/local/prover/v2/execution/requests"
-fs-responses-directory = "tmp/local/prover/v2/execution/responses"
+fs-requests-directory = "tmp/local/prover/v3/execution/requests"
+fs-responses-directory = "tmp/local/prover/v3/execution/responses"
 [prover.blob-compression]
-fs-requests-directory = "tmp/local/prover/v2/compression/requests"
-fs-responses-directory = "tmp/local/prover/v2/compression/responses"
+fs-requests-directory = "tmp/local/prover/v3/compression/requests"
+fs-responses-directory = "tmp/local/prover/v3/compression/responses"
 [prover.proof-aggregation]
 fs-requests-directory = "tmp/local/prover/v2/aggregation/requests"
 fs-responses-directory = "tmp/local/prover/v2/aggregation/responses"

 # Config of Traces API Facade endpoint
 [traces]
-[traces.counters]
-endpoints=["http://127.0.0.1:8080/"]
-[traces.conflation]
-endpoints=["http://127.0.0.1:8080/"]
-[traces.file-manager]
-traces-file-extension = "json.gz"
-raw-traces-directory = "tmp/local/traces/raw"
-non-canonical-raw-traces-directory = "tmp/local/traces/raw-non-canonical"
+blob-compressor-version="V1_0_1"
+expected-traces-api-version-v2="beta-v2.1-rc14"
+[traces.counters-v2]
+endpoints=["http://127.0.0.1:8745/"]
+[traces.conflation-v2]
+endpoints=["http://127.0.0.1:8745/"]

 [state-manager]
 endpoints=["http://127.0.0.1:8998/"]
@@ -54,7 +52,7 @@ finalized-block-tag="finalized"
 earliestBlock=0

 [l2]
-rpc-endpoint="http://127.0.0.1:8645"
+rpc-endpoint="http://127.0.0.1:8845"
 blocks-to-finalization=0

 [database]