From 32008054bbef12e4892388051bac2092bc71770c Mon Sep 17 00:00:00 2001 From: Roman Vaseev <4833306+Filter94@users.noreply.github.com> Date: Fri, 20 Sep 2024 08:31:48 +0200 Subject: [PATCH] Trying to use the updated tracer (#46) * Tracer update * Fixed permissions issue --------- Co-authored-by: FlorianHuc --- .github/workflows/reuse-run-e2e-tests.yml | 7 +++---- Makefile | 2 -- .../coordinator-docker-traces-v2-override.config.toml | 2 +- .../consensys/zkevm/coordinator/app/CoordinatorAppCli.kt | 2 +- docker/compose-local-dev-traces-v2.overrides.yml | 6 +++--- docker/compose.yml | 4 ++-- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/reuse-run-e2e-tests.yml b/.github/workflows/reuse-run-e2e-tests.yml index 7c17478a..8fcb3013 100644 --- a/.github/workflows/reuse-run-e2e-tests.yml +++ b/.github/workflows/reuse-run-e2e-tests.yml @@ -92,11 +92,10 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Setup Shomei directories + - name: Create directory for conflated traces run: | - mkdir -p ../tmp/zkbesu-shomei/plugins/ - mkdir -p ../tmp/local/shomei/ - mkdir -p ../tmp/local/shomei-frontend/ + mkdir -p tmp/local/traces/v2/conflated + chmod -R a+w tmp/local/traces/v2/conflated - name: Restore cached images id: restore-cached-images uses: actions/cache/restore@v4.0.2 diff --git a/Makefile b/Makefile index 55f9cf52..041a127d 100644 --- a/Makefile +++ b/Makefile @@ -52,11 +52,9 @@ start-whole-environment-with-finalized-tag-updater: docker compose -f docker/compose.yml -f docker/compose-local-dev.overrides.yml -f docker/compose-local-dev-finalized-tag-updater.overrides.yml --profile l1 --profile l2 up -d start-whole-environment-traces-v2: - mkdir -p tmp/local/traces/v2/conflated docker compose -f docker/compose.yml -f docker/compose-local-dev-traces-v2.overrides.yml --profile l1 --profile l2 up -d start-whole-environment-traces-v2-with-finalized-tag-updater: - mkdir -p tmp/local/traces/v2/conflated docker compose -f docker/compose.yml -f docker/compose-local-dev-traces-v2.overrides.yml -f docker/compose-local-dev-finalized-tag-updater.overrides.yml --profile l1 --profile l2 up -d pull-all-images: diff --git a/config/coordinator/coordinator-docker-traces-v2-override.config.toml b/config/coordinator/coordinator-docker-traces-v2-override.config.toml index 7ca39cdb..2c6a1fe7 100644 --- a/config/coordinator/coordinator-docker-traces-v2-override.config.toml +++ b/config/coordinator/coordinator-docker-traces-v2-override.config.toml @@ -14,7 +14,7 @@ eth-api="http://traces-node-v2:8545" [traces] switch-to-linea-besu=true -expected-traces-api-version-v2="v0.4.0-rc1" +expected-traces-api-version-v2="v0.6.0-rc5" [traces.counters-v2] endpoints=["http://traces-node-v2:8545/"] request-limit-per-endpoint=20 diff --git a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/CoordinatorAppCli.kt b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/CoordinatorAppCli.kt index 3494fb2c..e552add8 100644 --- a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/CoordinatorAppCli.kt +++ b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/CoordinatorAppCli.kt @@ -203,7 +203,7 @@ internal constructor(private val errorWriter: PrintWriter, private val startActi TracesCountersV2(tracesLimitsV2Configs.get()!!.tracesLimits) }.getOrElse { hasConfigError = true - logger.error("Traces limits file {} is incomplete. {}", tracesLimitsFile, it.message) + logger.error("Traces limits file {} is incomplete. {}", tracesLimitsV2File, it.message) } } diff --git a/docker/compose-local-dev-traces-v2.overrides.yml b/docker/compose-local-dev-traces-v2.overrides.yml index 1c3a40ed..a10f2efc 100644 --- a/docker/compose-local-dev-traces-v2.overrides.yml +++ b/docker/compose-local-dev-traces-v2.overrides.yml @@ -9,7 +9,7 @@ services: - ../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.3.0-rc2.2/linea-sequencer-v0.3.0-rc2.2.jar", "/linea-besu-sequencer" ] + command: [ "sh", "/file-downloader.sh", "https://github.com/Consensys/linea-sequencer/releases/download/v0.6.0-rc3.1/linea-sequencer-v0.6.0-rc3.1.jar", "/linea-besu-sequencer" ] traces-node: command: ['echo', 'forced exit as replaced by traces-node-v2'] @@ -54,7 +54,7 @@ services: - ./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/ + - ../tmp/local/:/data/:rw networks: linea: ipv4_address: 11.11.11.115 @@ -86,7 +86,7 @@ services: 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.4.0-rc1/linea-tracer-v0.4.0-rc1.jar", "/traces-node-v2" ] + command: [ "sh", "/file-downloader.sh", "https://github.com/Consensys/linea-tracer/releases/download/v0.6.0-rc5/linea-tracer-v0.6.0-rc5.jar", "/traces-node-v2" ] volumes: - ./scripts/file-downloader.sh:/file-downloader.sh:ro - ../tmp/traces-node-v2/plugins:/traces-node-v2/ diff --git a/docker/compose.yml b/docker/compose.yml index 0197c567..5f6cd7b0 100644 --- a/docker/compose.yml +++ b/docker/compose.yml @@ -23,7 +23,7 @@ services: sequencer: hostname: sequencer container_name: sequencer - image: consensys/linea-besu:${SEQUENCER_TAG:-linea-delivery-28} + image: consensys/linea-besu:${SEQUENCER_TAG:-24.9-delivery32} profiles: [ "l2", "l2-bc", "debug" ] depends_on: linea-besu-sequencer-plugin-downloader: @@ -71,7 +71,7 @@ services: 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-test32/besu-sequencer-plugins-v0.1.4-test32.jar", "/linea-besu-sequencer" ] + command: [ "sh", "/file-downloader.sh", "https://github.com/Consensys/linea-sequencer/releases/download/v0.1.4-test33/besu-sequencer-plugins-v0.1.4-test33.jar", "/linea-besu-sequencer" ] volumes: - ./scripts/file-downloader.sh:/file-downloader.sh:ro - ../tmp/linea-besu-sequencer/plugins:/linea-besu-sequencer/