From 8e2dbaf1f299a70c322a77283f78e2ec25400e1f Mon Sep 17 00:00:00 2001 From: Roman Vaseev <4833306+Filter94@users.noreply.github.com> Date: Thu, 12 Dec 2024 19:39:58 +0100 Subject: [PATCH] Using linea besu package (#437) * Using linea-besu-package for local env * Removed unnecessary containers --- .../compose-local-dev-traces-v2.overrides.yml | 18 +++---------- docker/compose.yml | 26 ++----------------- .../l2-node-besu/l2-node-besu-config.toml | 1 + .../sequencer.config.toml | 1 + .../traces-node-v2/traces-node-v2-config.toml | 1 + 5 files changed, 8 insertions(+), 39 deletions(-) diff --git a/docker/compose-local-dev-traces-v2.overrides.yml b/docker/compose-local-dev-traces-v2.overrides.yml index 4793383fc..f1c359310 100644 --- a/docker/compose-local-dev-traces-v2.overrides.yml +++ b/docker/compose-local-dev-traces-v2.overrides.yml @@ -3,16 +3,15 @@ services: sequencer: + image: consensys/linea-besu-package:devnet-0d2fbde volumes: - ../config/common/traces-limits-besu-v2.toml:/var/lib/besu/traces-limits.toml:ro l2-node-besu: + image: consensys/linea-besu-package:devnet-0d2fbde volumes: - ../config/common/traces-limits-besu-v2.toml:/var/lib/besu/traces-limits.toml:ro - linea-besu-sequencer-plugin-downloader: - command: [ "sh", "/file-downloader.sh", "https://github.com/Consensys/linea-sequencer/releases/download/v0.8.0-rc8.1/linea-sequencer-v0.8.0-rc8.1.jar", "/linea-besu-sequencer" ] - traces-node: entrypoint: ['echo', 'forced exit as replaced by traces-node-v2'] @@ -22,11 +21,9 @@ services: traces-node-v2: hostname: traces-node-v2 container_name: traces-node-v2 - image: consensys/linea-besu:24.12-delivery40 + image: consensys/linea-besu-package:devnet-0d2fbde profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ] depends_on: - traces-node-v2-plugin-downloader: - condition: service_completed_successfully sequencer: condition: service_healthy ports: @@ -56,7 +53,6 @@ services: - ./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/linea-local-dev-genesis-PoA-besu.json/:/var/lib/besu/genesis.json:ro - - ../tmp/traces-node-v2/plugins:/opt/besu/plugins/ - ../tmp/local/:/data/:rw networks: linea: @@ -86,14 +82,6 @@ services: linea: ipv4_address: 11.11.11.109 - traces-node-v2-plugin-downloader: - image: busybox:1.36.1 - # profiles: ["l2", "l2-bc"] this works locally but breakes on CI, maybe Docker compose version issue - command: [ "sh", "/file-downloader.sh", "https://github.com/Consensys/linea-tracer/releases/download/v0.8.0-rc8/linea-tracer-v0.8.0-rc8.jar", "/traces-node-v2" ] - volumes: - - ./scripts/file-downloader.sh:/file-downloader.sh:ro - - ../tmp/traces-node-v2/plugins:/traces-node-v2/ - coordinator: # ./gradlew :coordinator:app:shadowJar # docker build coordinator --build-context=jar=./coordinator/app/build/libs/ -t local/linea-coordinator:latest diff --git a/docker/compose.yml b/docker/compose.yml index 5abe86bb4..c0c5165f8 100644 --- a/docker/compose.yml +++ b/docker/compose.yml @@ -23,13 +23,8 @@ services: sequencer: hostname: sequencer container_name: sequencer - image: consensys/linea-besu:${SEQUENCER_TAG:-24.12-delivery40} + image: consensys/linea-besu-package:${SEQUENCER_TAG:-mainnet-2af649e} profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ] - depends_on: - linea-besu-sequencer-plugin-downloader: - condition: service_completed_successfully - linea-besu-sequencer-finalized-tag-updater-plugin-downloader: - condition: service_completed_successfully ports: - "8545:8545" - "8546:8546" @@ -64,27 +59,11 @@ services: - ./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-v1.toml:/var/lib/besu/traces-limits.toml:ro - - ../tmp/linea-besu-sequencer/plugins:/opt/besu/plugins/ networks: l1network: linea: ipv4_address: 11.11.11.101 - linea-besu-sequencer-plugin-downloader: - image: busybox:1.36.1 - # profiles: ["l2", "l2-bc"] this works locally but breakes on CI, maybe Docker compose version issue - command: [ "sh", "/file-downloader.sh", "https://github.com/Consensys/linea-sequencer/releases/download/v0.1.4-test38/besu-sequencer-plugins-v0.1.4-test38.jar", "/linea-besu-sequencer" ] - volumes: - - ./scripts/file-downloader.sh:/file-downloader.sh:ro - - ../tmp/linea-besu-sequencer/plugins:/linea-besu-sequencer/ - - linea-besu-sequencer-finalized-tag-updater-plugin-downloader: - image: busybox:1.36.1 - command: [ "sh", "/file-downloader.sh", "https://github.com/Consensys/linea-monorepo/releases/download/finalized-tag-updater-v0.0.3/finalized-tag-updater-v0.0.3.jar", "/linea-besu-sequencer" ] - volumes: - - ./scripts/file-downloader.sh:/file-downloader.sh:ro - - ../tmp/linea-besu-sequencer/plugins:/linea-besu-sequencer/ - l2-node: container_name: l2-node hostname: l2-node @@ -121,7 +100,7 @@ services: l2-node-besu: hostname: l2-node-besu container_name: l2-node-besu - image: consensys/linea-besu:24.12-delivery40 + image: consensys/linea-besu-package:${SEQUENCER_TAG:-mainnet-2af649e} profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ] depends_on: sequencer: @@ -160,7 +139,6 @@ services: - ./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-v1.toml:/var/lib/besu/traces-limits.toml:ro - - ../tmp/linea-besu-sequencer/plugins:/opt/besu/plugins/ - ../tmp/local/:/data/:rw networks: l1network: diff --git a/docker/config/l2-node-besu/l2-node-besu-config.toml b/docker/config/l2-node-besu/l2-node-besu-config.toml index d56e459f5..5fa47d0d9 100644 --- a/docker/config/l2-node-besu/l2-node-besu-config.toml +++ b/docker/config/l2-node-besu/l2-node-besu-config.toml @@ -36,6 +36,7 @@ metrics-port=9545 data-storage-format="BONSAI" # plugins +plugins=["LineaEstimateGasEndpointPlugin","L1FinalizationTagUpdaterPlugin","LineaExtraDataPlugin", "LineaTransactionPoolValidatorPlugin"] plugin-linea-module-limit-file-path="/var/lib/besu/traces-limits.toml" plugin-linea-deny-list-path="/var/lib/besu/deny-list.txt" plugin-linea-l1l2-bridge-contract="0xe537D669CA013d86EBeF1D64e40fC74CADC91987" diff --git a/docker/config/linea-besu-sequencer/sequencer.config.toml b/docker/config/linea-besu-sequencer/sequencer.config.toml index 7ff880083..6eb0a1e4a 100644 --- a/docker/config/linea-besu-sequencer/sequencer.config.toml +++ b/docker/config/linea-besu-sequencer/sequencer.config.toml @@ -45,6 +45,7 @@ api-gas-and-priority-fee-upper-bound-coefficient=300 poa-block-txs-selection-max-time=1000 # plugins +plugins=["LineaEstimateGasEndpointPlugin","L1FinalizationTagUpdaterPlugin","LineaExtraDataPlugin", "LineaTransactionPoolValidatorPlugin"] plugin-linea-module-limit-file-path="/var/lib/besu/traces-limits.toml" plugin-linea-deny-list-path="/var/lib/besu/deny-list.txt" plugin-linea-estimate-gas-compatibility-mode-enabled=false diff --git a/docker/config/traces-node-v2/traces-node-v2-config.toml b/docker/config/traces-node-v2/traces-node-v2-config.toml index 3eb29eff5..894983fc0 100644 --- a/docker/config/traces-node-v2/traces-node-v2-config.toml +++ b/docker/config/traces-node-v2/traces-node-v2-config.toml @@ -36,6 +36,7 @@ metrics-port=9545 data-storage-format="BONSAI" # plugins +plugins=["TracerReadinessPlugin","TracesEndpointServicePlugin","LineCountsEndpointServicePlugin","CaptureEndpointServicePlugin"] plugin-linea-conflated-trace-generation-traces-output-path="/data/traces/v2/conflated" plugin-linea-rpc-concurrent-requests-limit=1 plugin-linea-tracer-readiness-server-host="0.0.0.0"