update besu-package (#471)

* update besu-package and Shomei to 2.3.0
Consensys · Dec 19, 2024 · d37c5c0 · d37c5c0
1 parent 39663ae
commit d37c5c0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 21 deletions.
diff --git a/config/coordinator/coordinator-docker.config.toml b/config/coordinator/coordinator-docker.config.toml
@@ -67,7 +67,7 @@ polling-interval="PT1S"
 traces-file-creation-wait-timeout="PT2M"
 
 [state-manager]
-version="2.2.0"
+version="2.3.0"
 endpoints=["http://shomei:8888/"]
 request-limit-per-endpoint=2
 request-retry.backoff-delay="PT2S"

diff --git a/...r/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfigTest.kt b/...r/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfigTest.kt
@@ -283,7 +283,7 @@ class CoordinatorConfigTest {
       )
     )
     private val stateManagerConfig = StateManagerClientConfig(
-      version = "2.2.0",
+      version = "2.3.0",
       endpoints = listOf(
         URI("http://shomei:8888/").toURL()
       ),

diff --git a/docker/compose-local-dev-traces-v2.overrides.yml b/docker/compose-local-dev-traces-v2.overrides.yml
@@ -3,12 +3,12 @@
 
 services:
   sequencer:
-    image: consensys/linea-besu-package:devnet-9eb49a8
+    image: consensys/linea-besu-package:devnet-811f30b
     volumes:
       - ../config/common/traces-limits-besu-v2.toml:/var/lib/besu/traces-limits.toml:ro
 
   l2-node-besu:
-    image: consensys/linea-besu-package:devnet-9eb49a8
+    image: consensys/linea-besu-package:devnet-811f30b
     volumes:
       - ../config/common/traces-limits-besu-v2.toml:/var/lib/besu/traces-limits.toml:ro
 
@@ -21,7 +21,7 @@ services:
   traces-node-v2:
     hostname: traces-node-v2
     container_name: traces-node-v2
-    image: consensys/linea-besu-package:devnet-9eb49a8
+    image: consensys/linea-besu-package:devnet-811f30b
     profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ]
     depends_on:
       sequencer:

diff --git a/docker/compose.yml b/docker/compose.yml
@@ -23,7 +23,7 @@ services:
   sequencer:
     hostname: sequencer
     container_name: sequencer
-    image: consensys/linea-besu-package:${SEQUENCER_TAG:-mainnet-9eb49a8}
+    image: consensys/linea-besu-package:${SEQUENCER_TAG:-mainnet-811f30b}
     profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ]
     ports:
       - "8545:8545"
@@ -100,7 +100,7 @@ services:
   l2-node-besu:
     hostname: l2-node-besu
     container_name: l2-node-besu
-    image: consensys/linea-besu-package:${SEQUENCER_TAG:-mainnet-9eb49a8}
+    image: consensys/linea-besu-package:${SEQUENCER_TAG:-mainnet-811f30b}
     profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ]
     depends_on:
       sequencer:
@@ -467,13 +467,11 @@ services:
       - l1network
 
   zkbesu-shomei:
-    image: consensys/linea-besu:linea-delivery-27
+    image: consensys/linea-besu-package:${SEQUENCER_TAG:-devnet-811f30b}
     hostname: zkbesu-shomei
     container_name: zkbesu-shomei
     profiles: [ "l2", "l2-bc", "external-to-monorepo" ]
     depends_on:
-      shomei-plugin-downloader:
-        condition: service_completed_successfully
       sequencer:
         condition: service_healthy
     privileged: true
@@ -511,10 +509,9 @@ services:
       - ./config/zkbesu-shomei/zkbesu-config.toml:/var/lib/besu/zkbesu-config.toml:ro
       - ./config/zkbesu-shomei/log4j.xml:/var/lib/besu/log4j.xml:ro
       - ./config/linea-local-dev-genesis-PoA-besu.json/:/var/lib/besu/genesis.json:ro
-      - ../tmp/zkbesu-shomei/plugins:/opt/besu/plugins/
 
   shomei:
-    image: consensys/linea-shomei:2.2.0
+    image: consensys/linea-shomei:2.3.0
     hostname: shomei
     container_name: shomei
     profiles: [ "l2", "l2-bc", "external-to-monorepo" ]
@@ -592,15 +589,6 @@ services:
       - local-dev:/data/
       - ./config/shomei/log4j.xml:/log4j.xml:ro
 
-  shomei-plugin-downloader:
-    container_name: shomei-plugin-downloader
-    profiles: [ "l2", "l2-bc", "external-to-monorepo" ]
-    image: busybox:1.36.1
-    command: [ "sh", "/file-downloader.sh", "https://github.com/Consensys/besu-shomei-plugin/releases/download/v0.3.1/besu-shomei-plugin-v0.3.1.jar",  "/shomei-plugin" ]
-    volumes:
-      - ./scripts/file-downloader.sh:/file-downloader.sh:ro
-      - ../tmp/zkbesu-shomei/plugins:/shomei-plugin/
-
   l2-blockscout:
     container_name: l2-blockscout
     hostname: l2-blockscout

diff --git a/docker/config/zkbesu-shomei/zkbesu-config.toml b/docker/config/zkbesu-shomei/zkbesu-config.toml
@@ -34,3 +34,5 @@ metrics-port=9545
 
 # database
 data-storage-format="BONSAI"
+
+plugins=["BesuShomeiRpcPlugin", "ZkTrieLogPlugin"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,3 +34,5 @@ metrics-port=9545

		# database
		data-storage-format="BONSAI"

		plugins=["BesuShomeiRpcPlugin", "ZkTrieLogPlugin"]