mirror of
https://github.com/vacp2p/linea-monorepo.git
synced 2026-01-09 23:47:55 -05:00
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
This commit is contained in:
@@ -126,9 +126,9 @@ services:
|
||||
linea:
|
||||
ipv4_address: 11.11.11.119
|
||||
|
||||
traces-node-v2:
|
||||
hostname: traces-node-v2
|
||||
container_name: traces-node-v2
|
||||
traces-node:
|
||||
hostname: traces-node
|
||||
container_name: traces-node
|
||||
image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-sepolia-3e31c8f}
|
||||
profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ]
|
||||
depends_on:
|
||||
@@ -154,12 +154,12 @@ services:
|
||||
- -c
|
||||
- |
|
||||
/opt/besu/bin/besu \
|
||||
--config-file=/var/lib/besu/traces-node-v2.config.toml \
|
||||
--config-file=/var/lib/besu/traces-node.config.toml \
|
||||
--genesis-file=/var/lib/besu/genesis.json \
|
||||
--bootnodes=enode://14408801a444dafc44afbccce2eb755f902aed3b5743fed787b3c790e021fef28b8c827ed896aa4e8fb46e22bd67c39f994a73768b4b382f8597b0d44370e15d@11.11.11.101:30303
|
||||
volumes:
|
||||
- ./config/traces-node-v2/traces-node-v2-config.toml:/var/lib/besu/traces-node-v2.config.toml:ro
|
||||
- ./config/traces-node-v2/log4j.xml:/var/lib/besu/log4j.xml:ro
|
||||
- ./config/traces-node/traces-node-config.toml:/var/lib/besu/traces-node.config.toml:ro
|
||||
- ./config/traces-node/log4j.xml:/var/lib/besu/log4j.xml:ro
|
||||
- ./config/linea-local-dev-genesis-PoA-besu.json/:/var/lib/besu/genesis.json:ro
|
||||
- ../tmp/local/:/data/:rw
|
||||
networks:
|
||||
@@ -228,11 +228,15 @@ services:
|
||||
ports:
|
||||
- "9545:9545"
|
||||
restart: on-failure
|
||||
command: [ 'java', '-Dvertx.configurationFile=/var/lib/coordinator/vertx-options.json', '-Dlog4j2.configurationFile=/var/lib/coordinator/log4j2-dev.xml', '-jar', 'libs/coordinator.jar', '--traces-limits', 'config/traces-limits-v1.toml', '--smart-contract-errors', 'config/smart-contract-errors.toml', '--gas-price-cap-time-of-day-multipliers', 'config/gas-price-cap-time-of-day-multipliers.toml', 'config/coordinator-docker.config.toml', 'config/coordinator-docker-web3signer-override.config.toml' ]
|
||||
environment:
|
||||
config__override__l2-network-gas-pricing__json-rpc-pricing-propagation__disabled: ${DISABLE_JSON_RPC_PRICING_PROPAGATION:-true}
|
||||
config__override__type2-state-proof-provider__endpoints: # leave empty to disable
|
||||
command: [ 'java', '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005','-Dvertx.configurationFile=/var/lib/coordinator/vertx-options.json', '-Dlog4j2.configurationFile=/var/lib/coordinator/log4j2-dev.xml', '-jar', 'libs/coordinator.jar', '--traces-limits-v2', 'config/traces-limits-v2.toml', '--smart-contract-errors', 'config/smart-contract-errors.toml', '--gas-price-cap-time-of-day-multipliers', 'config/gas-price-cap-time-of-day-multipliers.toml', 'config/coordinator-docker.config.toml', 'config/coordinator-docker-traces-v2-override.config.toml' ]
|
||||
volumes:
|
||||
- ../config/coordinator/coordinator-docker.config.toml:/opt/consensys/linea/coordinator/config/coordinator-docker.config.toml:ro
|
||||
- ../config/coordinator/coordinator-docker-web3signer-override.config.toml:/opt/consensys/linea/coordinator/config/coordinator-docker-web3signer-override.config.toml:ro
|
||||
- ../config/common/traces-limits-v1.toml:/opt/consensys/linea/coordinator/config/traces-limits-v1.toml:ro
|
||||
- ../config/coordinator/coordinator-docker-traces-v2-override.config.toml:/opt/consensys/linea/coordinator/config/coordinator-docker-traces-v2-override.config.toml:ro
|
||||
- ../config/common/traces-limits-v2.toml:/opt/consensys/linea/coordinator/config/traces-limits-v2.toml:ro
|
||||
- ../config/common/smart-contract-errors.toml:/opt/consensys/linea/coordinator/config/smart-contract-errors.toml:ro
|
||||
- ../config/common/gas-price-cap-time-of-day-multipliers.toml:/opt/consensys/linea/coordinator/config/gas-price-cap-time-of-day-multipliers.toml:ro
|
||||
- ../config/coordinator/vertx-options.json:/var/lib/coordinator/vertx-options.json:ro
|
||||
|
||||
@@ -11,12 +11,6 @@ services:
|
||||
extends:
|
||||
file: compose-spec-l2-services.yml
|
||||
service: l2-node-besu
|
||||
environment:
|
||||
BESU_PLUGIN_LINEA_BUNDLES_FORWARD_URLS: "http://sequencer:8545"
|
||||
BESU_PLUGIN_LINEA_BUNDLES_FORWARD_RETRY_DELAY: 1000
|
||||
BESU_PLUGIN_LINEA_BUNDLES_FORWARD_TIMEOUT: 5000
|
||||
volumes:
|
||||
- ../config/common/traces-limits-besu-v2.toml:/var/lib/besu/traces-limits.toml:ro
|
||||
|
||||
shomei-frontend:
|
||||
extends:
|
||||
|
||||
@@ -41,10 +41,10 @@ services:
|
||||
file: compose-spec-l2-services.yml
|
||||
service: sequencer
|
||||
|
||||
traces-node-v2:
|
||||
traces-node:
|
||||
extends:
|
||||
file: compose-spec-l2-services.yml
|
||||
service: traces-node-v2
|
||||
service: traces-node
|
||||
|
||||
prover-v3:
|
||||
extends:
|
||||
@@ -60,14 +60,6 @@ services:
|
||||
extends:
|
||||
file: compose-spec-l2-services.yml
|
||||
service: coordinator
|
||||
environment:
|
||||
config__override__l2-network-gas-pricing__json-rpc-pricing-propagation__disabled: ${DISABLE_JSON_RPC_PRICING_PROPAGATION:-true}
|
||||
config__override__type2-state-proof-provider__endpoints: # leave empty to disable
|
||||
command: [ 'java', '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005','-Dvertx.configurationFile=/var/lib/coordinator/vertx-options.json', '-Dlog4j2.configurationFile=/var/lib/coordinator/log4j2-dev.xml', '-jar', 'libs/coordinator.jar', '--traces-limits-v2', 'config/traces-limits-v2.toml', '--smart-contract-errors', 'config/smart-contract-errors.toml', '--gas-price-cap-time-of-day-multipliers', 'config/gas-price-cap-time-of-day-multipliers.toml', 'config/coordinator-docker.config.toml', 'config/coordinator-docker-traces-v2-override.config.toml' ]
|
||||
volumes:
|
||||
- ../config/common/traces-limits-v2.toml:/opt/consensys/linea/coordinator/config/traces-limits-v2.toml:ro
|
||||
- ../config/coordinator/coordinator-docker-traces-v2-override.config.toml:/opt/consensys/linea/coordinator/config/coordinator-docker-traces-v2-override.config.toml:ro
|
||||
- ../tmp/local/:/data/
|
||||
|
||||
web3signer:
|
||||
extends:
|
||||
|
||||
@@ -53,6 +53,9 @@ plugin-linea-variable-gas-cost-wei=1000000000
|
||||
plugin-linea-extra-data-set-min-gas-price-enabled=true
|
||||
plugin-linea-estimate-gas-compatibility-mode-enabled=false
|
||||
plugin-linea-estimate-gas-min-margin="1.2"
|
||||
plugin-linea-bundles-forward-urls=["http://sequencer:8545"]
|
||||
plugin-linea-bundles-forward-retry-delay=1000
|
||||
plugin-linea-bundles-forward-timeout=5000
|
||||
|
||||
bonsai-limit-trie-logs-enabled=false
|
||||
bonsai-historical-block-limit=1024
|
||||
|
||||
Reference in New Issue
Block a user