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

feat: update local compose file for linea-besu delivery39 and plugins (#397)

Browse Source
This commit is contained in:
jonesho
2024-12-05 17:21:56 +08:00
committed by GitHub
parent 2acf6bc0b6
commit 62f552b57d
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ eth-api="http://traces-node-v2:8545"
[traces]
switch-to-linea-besu=true
blob-compressor-version="V1_0_1"
expected-traces-api-version-v2="v0.8.0-rc3"
expected-traces-api-version-v2="v0.8.0-rc6"
[traces.counters-v2]
endpoints=["http://traces-node-v2:8545/"]
request-limit-per-endpoint=2

2
coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfigTest.kt
View File

@@ -835,7 +835,7 @@ class CoordinatorConfigTest {
traces = tracesConfig.copy(
switchToLineaBesu = true,
blobCompressorVersion = BlobCompressorVersion.V1_0_1,
expectedTracesApiVersionV2 = "v0.8.0-rc3",
expectedTracesApiVersionV2 = "v0.8.0-rc6",
conflationV2 = tracesConfig.conflation.copy(
endpoints = listOf(URI("http://traces-node-v2:8545/").toURL())
),

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

@@ -11,7 +11,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.8.0-rc4.1/linea-sequencer-v0.8.0-rc4.1.jar", "/linea-besu-sequencer" ]
command: [ "sh", "/file-downloader.sh", "https://github.com/Consensys/linea-sequencer/releases/download/v0.8.0-rc6.1/linea-sequencer-v0.8.0-rc6.1.jar", "/linea-besu-sequencer" ]
traces-node:
command: ['echo', 'forced exit as replaced by traces-node-v2']
@@ -22,7 +22,7 @@ services:
traces-node-v2:
hostname: traces-node-v2
container_name: traces-node-v2
image: consensys/linea-besu:24.9-delivery32
image: consensys/linea-besu:24.11-delivery39.1
profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ]
depends_on:
traces-node-v2-plugin-downloader:
@@ -68,7 +68,7 @@ services:
prover-v3: # prover compatible with the traces from zkbesu
container_name: prover-v3
hostname: prover-v3
image: consensys/linea-prover:${PROVER_TAG:-bb7cd3d}
image: consensys/linea-prover:${PROVER_TAG:-31389b1}
platform: linux/amd64
# to avoid spinning up on CI for now
profiles: [ "l2" ]
@@ -89,7 +89,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.8.0-rc3/linea-tracer-v0.8.0-rc3.jar", "/traces-node-v2" ]
command: [ "sh", "/file-downloader.sh", "https://github.com/Consensys/linea-tracer/releases/download/v0.8.0-rc6/linea-tracer-v0.8.0-rc6.jar", "/traces-node-v2" ]
volumes:
- ./scripts/file-downloader.sh:/file-downloader.sh:ro
- ../tmp/traces-node-v2/plugins:/traces-node-v2/

8
docker/compose.yml
View File

@@ -23,7 +23,7 @@ services:
sequencer:
hostname: sequencer
container_name: sequencer
image: consensys/linea-besu:${SEQUENCER_TAG:-24.10-delivery34}
image: consensys/linea-besu:${SEQUENCER_TAG:-24.11-delivery39.1}
profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ]
depends_on:
linea-besu-sequencer-plugin-downloader:
@@ -73,14 +73,14 @@ 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-test35/besu-sequencer-plugins-v0.1.4-test35.jar", "/linea-besu-sequencer" ]
command: [ "sh", "/file-downloader.sh", "https://github.com/Consensys/linea-sequencer/releases/download/v0.1.4-test37/besu-sequencer-plugins-v0.1.4-test37.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.2/finalized-tag-updater-v0.0.2.jar", "/linea-besu-sequencer" ]
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/
@@ -121,7 +121,7 @@ services:
l2-node-besu:
hostname: l2-node-besu
container_name: l2-node-besu
image: consensys/linea-besu:24.10-delivery34
image: consensys/linea-besu:24.11-delivery39.1
profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ]
depends_on:
sequencer: