Merge branch 'unstable' of github.com:chainbound/bolt-v0 into unstable

chainbound · Jul 22, 2024 · 4e42b33 · 4e42b33
2 parents e5f9379 + b18f450
commit 4e42b33
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 25 deletions.
diff --git a/Justfile b/Justfile
@@ -27,6 +27,11 @@ restart:
 	@just build-images
 	@just up
 
+_restart-sidecar:
+    @just down
+    @just _build-sidecar
+    @just up
+
 # show the running containers and port mappings for the bolt devnet
 inspect:
 	kurtosis enclave inspect bolt-devnet
@@ -51,6 +56,11 @@ sidecar-logs:
     @id=$(docker ps -n 100 | grep sidecar | awk -F' ' '{print $1}') && \
     docker logs -f $id
 
+# show the logs for the bolt devnet for beacon node
+beacon-logs:
+    @id=$(docker ps -n 100 | grep 'cl-1-lighthouse-geth' | awk -F' ' '{print $1}') && \
+    docker logs -f $id
+
 # show the logs for the bolt devnet for beacon node
 beacon-dump:
     @id=$(docker ps -n 100 | grep 'cl-1-lighthouse-geth' | awk -F' ' '{print $1}') && \

diff --git a/testnets/helder/docker-compose.pbs.yml b/testnets/helder/docker-compose.pbs.yml
@@ -13,7 +13,7 @@ services:
     image: postgres
     restart: unless-stopped
     volumes:
-      - 'psql_data:/var/lib/postgresql/data'
+      - "psql_data:/var/lib/postgresql/data"
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
@@ -25,43 +25,43 @@ services:
     depends_on:
       - db
     ports:
-      - '8093:8080'
+      - "8093:8080"
     environment:
       ADMINER_PLUGINS: tables-filter tinymce
 
   builder:
-    image: ghcr.io/chainbound/bolt-builder:v0.1.0
+    image: ghcr.io/chainbound/bolt-builder:v0.1.2-alpha
     restart: unless-stopped
     volumes:
-      - 'chaindata:/var/lib/chaindata'
-      - './shared:/var/lib/shared'
-      - './network-configs:/var/lib/network-configs'
-      - './scripts/run-builder.sh:/scripts/run-builder.sh'
+      - "chaindata:/var/lib/chaindata"
+      - "./shared:/var/lib/shared"
+      - "./network-configs:/var/lib/network-configs"
+      - "./scripts/run-builder.sh:/scripts/run-builder.sh"
     environment:
       BUILDER_TX_SIGNING_KEY: "0x53321db7c1e331d93a11a41d16f004d7ff63972ec8ec7c25db329728ceeb1710"
     ports:
       # - '8545:8545'
       # - '8546:8546'
-      - '30310:30303/tcp'
-      - '30310:30303/udp'
+      - "30310:30303/tcp"
+      - "30310:30303/udp"
     # entrypoint is builder
     entrypoint: /scripts/run-builder.sh
 
   beacon:
     image: sigp/lighthouse:latest
     restart: unless-stopped
     volumes:
-      - 'chaindata:/var/lib/chaindata'
-      - './shared:/var/lib/shared'
-      - './network-configs:/var/lib/network-configs'
-      - './scripts/run-bn.sh:/scripts/run-bn.sh'
+      - "chaindata:/var/lib/chaindata"
+      - "./shared:/var/lib/shared"
+      - "./network-configs:/var/lib/network-configs"
+      - "./scripts/run-bn.sh:/scripts/run-bn.sh"
     ports:
-      - '50050:50050/tcp'
-      - '50050:50050/udp'
+      - "50050:50050/tcp"
+      - "50050:50050/udp"
     entrypoint: /scripts/run-bn.sh
 
   relay-housekeeper:
-    image: ghcr.io/chainbound/bolt-relay:v0.1.0
+    image: ghcr.io/chainbound/bolt-relay:v0.1.2-alpha
     restart: unless-stopped
     depends_on:
       db:
@@ -84,11 +84,11 @@ services:
         "--redis-uri",
         "redis:6379",
         "--beacon-uris",
-        "http://beacon:4000"
+        "http://beacon:4000",
       ]
 
   relay-api:
-    image: ghcr.io/chainbound/bolt-relay:v0.1.0
+    image: ghcr.io/chainbound/bolt-relay:v0.1.2-alpha
     restart: unless-stopped
     depends_on:
       relay-housekeeper:
@@ -100,7 +100,7 @@ services:
       CAPELLA_FORK_VERSION: "0x40000000"
       DENEB_FORK_VERSION: "0x50132736"
     ports:
-      - '9062:9062'
+      - "9062:9062"
     command:
       [
         "api",
@@ -117,11 +117,11 @@ services:
         "--secret-key",
         "0x607a11b45a7219cc61a3d9c5fd08c7eebd602a6a19a977f8d3771d5711a550f2",
         "--listen-addr",
-        "0.0.0.0:9062"
+        "0.0.0.0:9062",
       ]
 
   relay-website:
-    image: ghcr.io/chainbound/bolt-relay:v0.1.0
+    image: ghcr.io/chainbound/bolt-relay:v0.1.2-alpha
     restart: always
     depends_on:
       relay-api:
@@ -133,7 +133,7 @@ services:
       CAPELLA_FORK_VERSION: "0x40000000"
       DENEB_FORK_VERSION: "0x50132736"
     ports:
-      - '9060:9060'
+      - "9060:9060"
     command:
       [
         "website",
@@ -144,5 +144,5 @@ services:
         "--redis-uri",
         "redis:6379",
         "--listen-addr",
-        "0.0.0.0:9060"
+        "0.0.0.0:9060",
       ]
diff --git a/testnets/helder/docker-compose.yml b/testnets/helder/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   bolt-sidecar:
-    image: ghcr.io/chainbound/bolt-sidecar:v0.1.1-alpha.2
+    image: ghcr.io/chainbound/bolt-sidecar:v0.1.2-alpha
     container_name: bolt-sidecar
     restart: unless-stopped
     ports:
@@ -10,7 +10,7 @@ services:
     entrypoint: /bin/sh -c '/bolt-sidecar --port $$BOLT_RPC_PORT --chain helder --validator-indexes $$VALIDATOR_INDEXES --beacon-api-url $$BEACON_API_URL --execution-api-url $$EXECUTION_API_URL --engine-api-url $$ENGINE_API_URL --private-key $$SIGNING_KEY --mevboost-url http://bolt-boost:18550 --mevboost-proxy-port 18551 --jwt-hex $$JWT_HEX --fee-recipient $$FEE_RECIPIENT'
 
   bolt-boost:
-    image: ghcr.io/chainbound/bolt-boost:v0.1.1-alpha
+    image: ghcr.io/chainbound/bolt-mev-boost:v0.1.2-alpha
     container_name: bolt-boost
     restart: unless-stopped
     env_file: ./launch.env