From 0b863e2a6e4cacb3311d1bcae342648cb99a1e19 Mon Sep 17 00:00:00 2001 From: jonesho <81145364+jonesho@users.noreply.github.com> Date: Wed, 11 Jun 2025 00:09:20 +0800 Subject: [PATCH] feat: update trace-limits and besu images (#1129) * feat: update trace-limits and besu images * update prover image * feat: update trace-limits ROM to the power of 2 * feat: update trace-limits to be at max 2147483647 --------- Co-authored-by: gusiri --- config/common/traces-limits-besu-v2.toml | 61 ------------ config/common/traces-limits-v2.toml | 98 +++++++++---------- coordinator/app/build.gradle | 3 +- docker/compose-spec-l1-services.yml | 2 +- docker/compose-spec-l2-services.yml | 16 +-- .../config/trace-limits.mainnet.toml | 62 ++++++------ .../config/trace-limits.sepolia.toml | 62 ++++++------ ...tnet-sepolia.json => genesis.sepolia.json} | 0 .../linea-besu/profiles/advanced-sepolia.toml | 2 +- .../linea-besu/profiles/basic-sepolia.toml | 2 +- 10 files changed, 123 insertions(+), 185 deletions(-) delete mode 100644 config/common/traces-limits-besu-v2.toml rename linea-besu-package/linea-besu/genesis/{genesis.testnet-sepolia.json => genesis.sepolia.json} (100%) diff --git a/config/common/traces-limits-besu-v2.toml b/config/common/traces-limits-besu-v2.toml deleted file mode 100644 index 11b6b200..00000000 --- a/config/common/traces-limits-besu-v2.toml +++ /dev/null @@ -1,61 +0,0 @@ -[traces-limits] -# -# Arithmetization module limits -# -ADD = 524288 -BIN = 262144 -BLAKE_MODEXP_DATA = 16384 -BLOCK_DATA = 1024 -BLOCK_HASH = 512 -EC_DATA = 262144 -EUC = 65536 -EXP = 8192 -EXT = 1048576 -GAS = 65536 -HUB = 2097152 -LOG_DATA = 65536 -LOG_INFO = 4096 -MMIO = 4194304 -MMU = 4194304 -MOD = 131072 -MUL = 65536 -MXP = 524288 -OOB = 262144 -RLP_ADDR = 4096 -RLP_TXN = 131072 -RLP_TXN_RCPT = 65536 -ROM = 4194304 -ROM_LEX = 1024 -SHAKIRA_DATA = 32768 -SHF = 65536 -STP = 16384 -TRM = 32768 -TXN_DATA = 8192 -WCP = 262144 -# -# Reference table limits -# -BIN_REFERENCE_TABLE = 262144 -SHF_REFERENCE_TABLE = 4096 -INSTRUCTION_DECODER = 512 -# -# Precompiles limits -# -PRECOMPILE_ECRECOVER_EFFECTIVE_CALLS = 128 -PRECOMPILE_SHA2_BLOCKS = 671 -PRECOMPILE_RIPEMD_BLOCKS = 671 -PRECOMPILE_MODEXP_EFFECTIVE_CALLS = 4 -PRECOMPILE_ECADD_EFFECTIVE_CALLS = 16384 -PRECOMPILE_ECMUL_EFFECTIVE_CALLS = 32 -PRECOMPILE_ECPAIRING_FINAL_EXPONENTIATIONS = 16 -PRECOMPILE_ECPAIRING_G2_MEMBERSHIP_CALLS = 64 -PRECOMPILE_ECPAIRING_MILLER_LOOPS = 64 -PRECOMPILE_BLAKE_EFFECTIVE_CALLS = 600 -PRECOMPILE_BLAKE_ROUNDS = 600 -# -# Block-specific limits -# -BLOCK_KECCAK = 8192 -BLOCK_L1_SIZE = 1000000 -BLOCK_L2_L1_LOGS = 16 -BLOCK_TRANSACTIONS = 200 diff --git a/config/common/traces-limits-v2.toml b/config/common/traces-limits-v2.toml index 9e1d4285..03c2e1da 100644 --- a/config/common/traces-limits-v2.toml +++ b/config/common/traces-limits-v2.toml @@ -2,60 +2,60 @@ # # Arithmetization module limits # -ADD = 524288 -BIN = 262144 -BLAKE_MODEXP_DATA = 16384 -BLOCK_DATA = 1024 -BLOCK_HASH = 512 -EC_DATA = 262144 -EUC = 65536 -EXP = 8192 -EXT = 1048576 -GAS = 65536 -HUB = 2097152 -LOG_DATA = 65536 -LOG_INFO = 4096 -MMIO = 4194304 -MMU = 4194304 -MOD = 131072 -MUL = 65536 -MXP = 524288 -OOB = 262144 -RLP_ADDR = 4096 -RLP_TXN = 131072 -RLP_TXN_RCPT = 65536 -ROM = 4194304 -ROM_LEX = 1024 -SHAKIRA_DATA = 32768 -SHF = 65536 -STP = 16384 -TRM = 32768 -TXN_DATA = 8192 -WCP = 262144 +ADD = 262144 +BIN = 262144 +BLAKE_MODEXP_DATA = 16384 +BLOCK_DATA = 4096 +BLOCK_HASH = 2048 +EC_DATA = 65536 +EUC = 65536 +EXP = 65536 +EXT = 524288 +GAS = 65536 +HUB = 2097152 +LOG_DATA = 65536 +LOG_INFO = 4096 +MMIO = 2097152 +MMU = 1048576 +MOD = 131072 +MUL = 65536 +MXP = 524288 +OOB = 262144 +RLP_ADDR = 4096 +RLP_TXN = 131072 +RLP_TXN_RCPT = 65536 +ROM = 8388608 # Note: set as 6291456 in production as workaround +ROM_LEX = 1024 +SHAKIRA_DATA = 65536 +SHF = 262144 +STP = 16384 +TRM = 32768 +TXN_DATA = 8192 +WCP = 262144 # -# Reference table limits, set to UInt.MAX_VALUE +# Reference table limits, set to Integer.MAX_VALUE # -BIN_REFERENCE_TABLE = 4294967295 -SHF_REFERENCE_TABLE = 4294967295 -INSTRUCTION_DECODER = 4294967295 +BIN_REFERENCE_TABLE = 2147483647 +SHF_REFERENCE_TABLE = 2147483647 +INSTRUCTION_DECODER = 2147483647 # # Precompiles limits # -PRECOMPILE_ECRECOVER_EFFECTIVE_CALLS = 128 -PRECOMPILE_SHA2_BLOCKS = 671 -PRECOMPILE_RIPEMD_BLOCKS = 671 -PRECOMPILE_MODEXP_EFFECTIVE_CALLS = 4 -PRECOMPILE_ECADD_EFFECTIVE_CALLS = 16384 -PRECOMPILE_ECMUL_EFFECTIVE_CALLS = 32 -PRECOMPILE_ECPAIRING_FINAL_EXPONENTIATIONS = 16 -PRECOMPILE_ECPAIRING_G2_MEMBERSHIP_CALLS = 64 -PRECOMPILE_ECPAIRING_MILLER_LOOPS = 64 -PRECOMPILE_BLAKE_EFFECTIVE_CALLS = 600 -PRECOMPILE_BLAKE_ROUNDS = 600 +PRECOMPILE_ECRECOVER_EFFECTIVE_CALLS = 128 +PRECOMPILE_SHA2_BLOCKS = 200 +PRECOMPILE_RIPEMD_BLOCKS = 0 +PRECOMPILE_MODEXP_EFFECTIVE_CALLS = 32 +PRECOMPILE_ECADD_EFFECTIVE_CALLS = 1024 +PRECOMPILE_ECMUL_EFFECTIVE_CALLS = 40 +PRECOMPILE_ECPAIRING_FINAL_EXPONENTIATIONS = 16 +PRECOMPILE_ECPAIRING_G2_MEMBERSHIP_CALLS = 64 +PRECOMPILE_ECPAIRING_MILLER_LOOPS = 64 +PRECOMPILE_BLAKE_EFFECTIVE_CALLS = 0 +PRECOMPILE_BLAKE_ROUNDS = 0 # # Block-specific limits # -BLOCK_KECCAK = 8192 -BLOCK_L1_SIZE = 1000000 -BLOCK_L2_L1_LOGS = 16 -BLOCK_TRANSACTIONS = 200 +BLOCK_KECCAK = 8192 +BLOCK_L1_SIZE = 1000000 +BLOCK_L2_L1_LOGS = 16 +BLOCK_TRANSACTIONS = 300 diff --git a/coordinator/app/build.gradle b/coordinator/app/build.gradle index 7072a74b..08ee8fba 100644 --- a/coordinator/app/build.gradle +++ b/coordinator/app/build.gradle @@ -107,8 +107,7 @@ run { "config/common/smart-contract-errors.toml", "--gas-price-cap-time-of-day-multipliers", "config/common/gas-price-cap-time-of-day-multipliers.toml", - "config/coordinator/coordinator-config-v2.toml", - "config/coordinator/coordinator-config-v2-override-local-dev.toml" + "config/coordinator/coordinator-config-v2.toml" ] } diff --git a/docker/compose-spec-l1-services.yml b/docker/compose-spec-l1-services.yml index 614e0bfd..86a7e508 100644 --- a/docker/compose-spec-l1-services.yml +++ b/docker/compose-spec-l1-services.yml @@ -2,7 +2,7 @@ services: l1-el-node: container_name: l1-el-node hostname: l1-el-node - image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16.2-20250521124830-4d89458} + image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16.2-20250521134911-f6cb0f2} profiles: [ "l1", "debug", "external-to-monorepo" ] depends_on: l1-node-genesis-generator: diff --git a/docker/compose-spec-l2-services.yml b/docker/compose-spec-l2-services.yml index 1a2f3fec..800a948d 100644 --- a/docker/compose-spec-l2-services.yml +++ b/docker/compose-spec-l2-services.yml @@ -5,7 +5,7 @@ services: sequencer: hostname: sequencer container_name: sequencer - image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16.2-20250521124830-4d89458} + image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16.2-20250521134911-f6cb0f2} profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ] ports: - "8545:8545" @@ -37,7 +37,7 @@ services: - ./config/linea-local-dev-genesis-PoA-besu.json/:/var/lib/besu/genesis.json:ro - ./config/linea-besu-sequencer/key:/var/lib/besu/key:ro - ./config/linea-besu-sequencer/log4j.xml:/var/lib/besu/log4j.xml:ro - - ../config/common/traces-limits-besu-v2.toml:/var/lib/besu/traces-limits.toml:ro + - ../config/common/traces-limits-v2.toml:/var/lib/besu/traces-limits.toml:ro networks: l1network: linea: @@ -79,7 +79,7 @@ services: l2-node-besu: hostname: l2-node-besu container_name: l2-node-besu - image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16.2-20250521124830-4d89458} + image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16.2-20250521134911-f6cb0f2} profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ] depends_on: sequencer: @@ -113,7 +113,7 @@ services: - ./config/linea-besu-sequencer/deny-list.txt:/var/lib/besu/deny-list.txt:ro - ./config/l2-node-besu/log4j.xml:/var/lib/besu/log4j.xml:ro - ./config/linea-local-dev-genesis-PoA-besu.json/:/var/lib/besu/genesis.json:ro - - ../config/common/traces-limits-besu-v2.toml:/var/lib/besu/traces-limits.toml:ro + - ../config/common/traces-limits-v2.toml:/var/lib/besu/traces-limits.toml:ro - ../tmp/local/:/data/:rw networks: l1network: @@ -123,7 +123,7 @@ services: traces-node: hostname: traces-node container_name: traces-node - image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16.2-20250521124830-4d89458} + image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16.2-20250521134911-f6cb0f2} profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ] depends_on: sequencer: @@ -160,7 +160,7 @@ services: prover-v3: # prover compatible with the traces from zkbesu container_name: prover-v3 hostname: prover-v3 - image: consensys/linea-prover:${PROVER_TAG:-8a0bcc8} + image: consensys/linea-prover:${PROVER_TAG:-56c4809} platform: linux/amd64 # to avoid spinning up on CI for now profiles: [ "l2" ] @@ -285,7 +285,7 @@ services: - l1network zkbesu-shomei: - image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16.2-20250521124830-4d89458} + image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16.2-20250521134911-f6cb0f2} hostname: zkbesu-shomei container_name: zkbesu-shomei profiles: [ "l2", "l2-bc", "external-to-monorepo" ] @@ -502,7 +502,7 @@ services: ipv4_address: 10.10.10.205 zkbesu-shomei-sr: - image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16.2-20250521124830-4d89458} + image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16.2-20250521134911-f6cb0f2} hostname: zkbesu-shomei-sr container_name: zkbesu-shomei-sr profiles: [ "external-to-monorepo", "staterecovery" ] diff --git a/linea-besu-package/linea-besu/config/trace-limits.mainnet.toml b/linea-besu-package/linea-besu/config/trace-limits.mainnet.toml index ef868409..8a1069fb 100644 --- a/linea-besu-package/linea-besu/config/trace-limits.mainnet.toml +++ b/linea-besu-package/linea-besu/config/trace-limits.mainnet.toml @@ -2,21 +2,21 @@ # # Arithmetization module limits # -ADD = 524288 +ADD = 262144 BIN = 262144 -BLAKE_MODEXP_DATA = 16384 -BLOCK_DATA = 1024 -BLOCK_HASH = 512 -EC_DATA = 262144 +BLAKE_MODEXP_DATA = 16384 +BLOCK_DATA = 4096 +BLOCK_HASH = 2048 +EC_DATA = 65536 EUC = 65536 -EXP = 8192 -EXT = 1048576 -GAS = 65536 +EXP = 65536 +EXT = 524288 +GAS = 65536 HUB = 2097152 LOG_DATA = 65536 LOG_INFO = 4096 -MMIO = 4194304 -MMU = 4194304 +MMIO = 2097152 +MMU = 1048576 MOD = 131072 MUL = 65536 MXP = 524288 @@ -24,38 +24,38 @@ OOB = 262144 RLP_ADDR = 4096 RLP_TXN = 131072 RLP_TXN_RCPT = 65536 -ROM = 4194304 +ROM = 6291456 ROM_LEX = 1024 -SHAKIRA_DATA = 32768 -SHF = 65536 +SHAKIRA_DATA = 65536 +SHF = 262144 STP = 16384 TRM = 32768 TXN_DATA = 8192 WCP = 262144 # -# Reference table limits +# Reference table limits, set to Integer.MAX_VALUE # -BIN_REFERENCE_TABLE = 262144 -SHF_REFERENCE_TABLE = 4096 -INSTRUCTION_DECODER = 512 +BIN_REFERENCE_TABLE = 2147483647 +SHF_REFERENCE_TABLE = 2147483647 +INSTRUCTION_DECODER = 2147483647 # # Precompiles limits # -PRECOMPILE_ECRECOVER_EFFECTIVE_CALLS = 128 -PRECOMPILE_SHA2_BLOCKS = 671 -PRECOMPILE_RIPEMD_BLOCKS = 671 -PRECOMPILE_MODEXP_EFFECTIVE_CALLS = 4 -PRECOMPILE_ECADD_EFFECTIVE_CALLS = 16384 -PRECOMPILE_ECMUL_EFFECTIVE_CALLS = 32 -PRECOMPILE_ECPAIRING_FINAL_EXPONENTIATIONS = 16 +PRECOMPILE_ECRECOVER_EFFECTIVE_CALLS = 128 +PRECOMPILE_SHA2_BLOCKS = 200 +PRECOMPILE_RIPEMD_BLOCKS = 0 +PRECOMPILE_MODEXP_EFFECTIVE_CALLS = 32 +PRECOMPILE_ECADD_EFFECTIVE_CALLS = 1024 +PRECOMPILE_ECMUL_EFFECTIVE_CALLS = 40 +PRECOMPILE_ECPAIRING_FINAL_EXPONENTIATIONS = 16 PRECOMPILE_ECPAIRING_G2_MEMBERSHIP_CALLS = 64 -PRECOMPILE_ECPAIRING_MILLER_LOOPS = 64 -PRECOMPILE_BLAKE_EFFECTIVE_CALLS = 600 -PRECOMPILE_BLAKE_ROUNDS = 600 +PRECOMPILE_ECPAIRING_MILLER_LOOPS = 64 +PRECOMPILE_BLAKE_EFFECTIVE_CALLS = 0 +PRECOMPILE_BLAKE_ROUNDS = 0 # # Block-specific limits # -BLOCK_KECCAK = 8192 -BLOCK_L1_SIZE = 1000000 -BLOCK_L2_L1_LOGS = 16 -BLOCK_TRANSACTIONS = 200 \ No newline at end of file +BLOCK_KECCAK = 8192 +BLOCK_L1_SIZE = 1000000 +BLOCK_L2_L1_LOGS = 16 +BLOCK_TRANSACTIONS = 300 \ No newline at end of file diff --git a/linea-besu-package/linea-besu/config/trace-limits.sepolia.toml b/linea-besu-package/linea-besu/config/trace-limits.sepolia.toml index ef868409..8a1069fb 100644 --- a/linea-besu-package/linea-besu/config/trace-limits.sepolia.toml +++ b/linea-besu-package/linea-besu/config/trace-limits.sepolia.toml @@ -2,21 +2,21 @@ # # Arithmetization module limits # -ADD = 524288 +ADD = 262144 BIN = 262144 -BLAKE_MODEXP_DATA = 16384 -BLOCK_DATA = 1024 -BLOCK_HASH = 512 -EC_DATA = 262144 +BLAKE_MODEXP_DATA = 16384 +BLOCK_DATA = 4096 +BLOCK_HASH = 2048 +EC_DATA = 65536 EUC = 65536 -EXP = 8192 -EXT = 1048576 -GAS = 65536 +EXP = 65536 +EXT = 524288 +GAS = 65536 HUB = 2097152 LOG_DATA = 65536 LOG_INFO = 4096 -MMIO = 4194304 -MMU = 4194304 +MMIO = 2097152 +MMU = 1048576 MOD = 131072 MUL = 65536 MXP = 524288 @@ -24,38 +24,38 @@ OOB = 262144 RLP_ADDR = 4096 RLP_TXN = 131072 RLP_TXN_RCPT = 65536 -ROM = 4194304 +ROM = 6291456 ROM_LEX = 1024 -SHAKIRA_DATA = 32768 -SHF = 65536 +SHAKIRA_DATA = 65536 +SHF = 262144 STP = 16384 TRM = 32768 TXN_DATA = 8192 WCP = 262144 # -# Reference table limits +# Reference table limits, set to Integer.MAX_VALUE # -BIN_REFERENCE_TABLE = 262144 -SHF_REFERENCE_TABLE = 4096 -INSTRUCTION_DECODER = 512 +BIN_REFERENCE_TABLE = 2147483647 +SHF_REFERENCE_TABLE = 2147483647 +INSTRUCTION_DECODER = 2147483647 # # Precompiles limits # -PRECOMPILE_ECRECOVER_EFFECTIVE_CALLS = 128 -PRECOMPILE_SHA2_BLOCKS = 671 -PRECOMPILE_RIPEMD_BLOCKS = 671 -PRECOMPILE_MODEXP_EFFECTIVE_CALLS = 4 -PRECOMPILE_ECADD_EFFECTIVE_CALLS = 16384 -PRECOMPILE_ECMUL_EFFECTIVE_CALLS = 32 -PRECOMPILE_ECPAIRING_FINAL_EXPONENTIATIONS = 16 +PRECOMPILE_ECRECOVER_EFFECTIVE_CALLS = 128 +PRECOMPILE_SHA2_BLOCKS = 200 +PRECOMPILE_RIPEMD_BLOCKS = 0 +PRECOMPILE_MODEXP_EFFECTIVE_CALLS = 32 +PRECOMPILE_ECADD_EFFECTIVE_CALLS = 1024 +PRECOMPILE_ECMUL_EFFECTIVE_CALLS = 40 +PRECOMPILE_ECPAIRING_FINAL_EXPONENTIATIONS = 16 PRECOMPILE_ECPAIRING_G2_MEMBERSHIP_CALLS = 64 -PRECOMPILE_ECPAIRING_MILLER_LOOPS = 64 -PRECOMPILE_BLAKE_EFFECTIVE_CALLS = 600 -PRECOMPILE_BLAKE_ROUNDS = 600 +PRECOMPILE_ECPAIRING_MILLER_LOOPS = 64 +PRECOMPILE_BLAKE_EFFECTIVE_CALLS = 0 +PRECOMPILE_BLAKE_ROUNDS = 0 # # Block-specific limits # -BLOCK_KECCAK = 8192 -BLOCK_L1_SIZE = 1000000 -BLOCK_L2_L1_LOGS = 16 -BLOCK_TRANSACTIONS = 200 \ No newline at end of file +BLOCK_KECCAK = 8192 +BLOCK_L1_SIZE = 1000000 +BLOCK_L2_L1_LOGS = 16 +BLOCK_TRANSACTIONS = 300 \ No newline at end of file diff --git a/linea-besu-package/linea-besu/genesis/genesis.testnet-sepolia.json b/linea-besu-package/linea-besu/genesis/genesis.sepolia.json similarity index 100% rename from linea-besu-package/linea-besu/genesis/genesis.testnet-sepolia.json rename to linea-besu-package/linea-besu/genesis/genesis.sepolia.json diff --git a/linea-besu-package/linea-besu/profiles/advanced-sepolia.toml b/linea-besu-package/linea-besu/profiles/advanced-sepolia.toml index 1ea69221..02962a11 100644 --- a/linea-besu-package/linea-besu/profiles/advanced-sepolia.toml +++ b/linea-besu-package/linea-besu/profiles/advanced-sepolia.toml @@ -15,7 +15,7 @@ max-peers=50 # For node to be a sequencer, this key has to match the key used in genesis file node-private-key-file="/data/key" -genesis-file="genesis/genesis.testnet-sepolia.json" # Path to the custom genesis file +genesis-file="genesis/genesis.sepolia.json" # Path to the custom genesis file sync-mode="SNAP" Xbonsai-full-flat-db-enabled=true diff --git a/linea-besu-package/linea-besu/profiles/basic-sepolia.toml b/linea-besu-package/linea-besu/profiles/basic-sepolia.toml index 3e6c2926..2ac74996 100644 --- a/linea-besu-package/linea-besu/profiles/basic-sepolia.toml +++ b/linea-besu-package/linea-besu/profiles/basic-sepolia.toml @@ -1,5 +1,5 @@ # Chain -genesis-file="genesis/genesis.testnet-sepolia.json" # Path to the custom genesis file +genesis-file="genesis/genesis.sepolia.json" # Path to the custom genesis file # data data-path="/data"