vacp2p/linea-monorepo
1
0
Fork 0
mirror of https://github.com/vacp2p/linea-monorepo.git synced 2026-01-09 04:08:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Trying to use the updated tracer (#46)

Browse Source 
* Tracer update
* Fixed permissions issue

---------

Co-authored-by: FlorianHuc <florian.huc@gmail.com>
This commit is contained in:
Roman Vaseev
2024-09-20 08:31:48 +02:00
committed by GitHub
parent ce440d26e3
commit 32008054bb
6 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/reuse-run-e2e-tests.yml vendored
View File

@@ -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

2
Makefile
View File

@@ -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:

2
config/coordinator/coordinator-docker-traces-v2-override.config.toml
View File

@@ -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

2
coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/CoordinatorAppCli.kt
View File

@@ -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)
}
}

6
docker/compose-local-dev-traces-v2.overrides.yml
View File

@@ -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/

4
docker/compose.yml
View File

@@ -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/