Merge pull request #37 from ObolNetwork/stipe/parallel_cluster_runs

parallel execution added + fix for lodestar/nimbus BNs
ObolNetwork · Nov 27, 2024 · 3d7953b · 3d7953b
2 parents 563f7c1 + 23350c3
commit 3d7953b
Show file tree

Hide file tree

Showing 139 changed files with 88 additions and 110,286 deletions.
diff --git a/Makefile_k8s b/Makefile_k8s
@@ -81,8 +81,8 @@ recreate-k8s-pods-lighthouse:
 	kubectl apply -f vc-2-geth-lighthouse.yaml -n kt-kurtosis-geth-lighthouse
 	kubectl apply -f vc-3-geth-lighthouse.yaml -n kt-kurtosis-geth-lighthouse
 	kubectl apply -f vc-1-geth-lighthouse-service.yaml -n kt-kurtosis-geth-lighthouse
-    kubectl apply -f vc-2-geth-lighthouse-service.yaml -n kt-kurtosis-geth-lighthouse
-    kubectl apply -f vc-3-geth-lighthouse-service.yaml -n kt-kurtosis-geth-lighthouse
+	kubectl apply -f vc-2-geth-lighthouse-service.yaml -n kt-kurtosis-geth-lighthouse
+	kubectl apply -f vc-3-geth-lighthouse-service.yaml -n kt-kurtosis-geth-lighthouse
 
 run-charon-nimbus:
 	mkdir -p data/nimbus/vc{0,1,2}
@@ -98,8 +98,8 @@ recreate-k8s-pods-nimbus:
 	kubectl apply -f vc-2-geth-nimbus.yaml -n kt-kurtosis-geth-nimbus
 	kubectl apply -f vc-3-geth-nimbus.yaml -n kt-kurtosis-geth-nimbus
 	kubectl apply -f vc-1-geth-nimbus-service.yaml -n kt-kurtosis-geth-nimbus
-    kubectl apply -f vc-2-geth-nimbus-service.yaml -n kt-kurtosis-geth-nimbus
-    kubectl apply -f vc-3-geth-nimbus-service.yaml -n kt-kurtosis-geth-nimbus
+	kubectl apply -f vc-2-geth-nimbus-service.yaml -n kt-kurtosis-geth-nimbus
+	kubectl apply -f vc-3-geth-nimbus-service.yaml -n kt-kurtosis-geth-nimbus
 
 run-charon-lodestar:
 	mkdir -p data/lodestar/vc{0,1,2}/{caches,keystores,validator-db}
@@ -115,8 +115,8 @@ recreate-k8s-pods-lodestar:
 	kubectl apply -f vc-2-geth-lodestar.yaml -n kt-kurtosis-geth-lodestar
 	kubectl apply -f vc-3-geth-lodestar.yaml -n kt-kurtosis-geth-lodestar
 	kubectl apply -f vc-1-geth-lodestar-service.yaml -n kt-kurtosis-geth-lodestar
-    kubectl apply -f vc-2-geth-lodestar-service.yaml -n kt-kurtosis-geth-lodestar
-    kubectl apply -f vc-3-geth-lodestar-service.yaml -n kt-kurtosis-geth-lodestar
+	kubectl apply -f vc-2-geth-lodestar-service.yaml -n kt-kurtosis-geth-lodestar
+	kubectl apply -f vc-3-geth-lodestar-service.yaml -n kt-kurtosis-geth-lodestar
 
 run-charon-prysm:
 	docker compose up node0 node1 node2 vc0-prysm vc1-prysm vc2-prysm prometheus -d

diff --git a/docker-compose-k8.yml b/docker-compose-k8.yml
@@ -1,7 +1,7 @@
 x-node-base:
   # Pegged charon version (update this for each release).
   &node-base
-  image: obolnetwork/charon:latest
+  image: obolnetwork/charon:v1.2.0-rc2
   restart: unless-stopped
   networks: [network1]
   # network_mode: "host"
@@ -26,7 +26,7 @@ services:
   #  \___|_| |_|\__,_|_|  \___/|_| |_|  \___|_|_|\___|_| |_|\__|___/
   node0:
     <<: *node-base
-    container_name: node0
+    container_name: node0-${CL_NAME}
     environment:
       <<: *node-env
       CHARON_PRIVATE_KEY_FILE: /opt/charon/.charon/cluster/node0/charon-enr-private-key
@@ -44,7 +44,7 @@ services:
 
   node1:
     <<: *node-base
-    container_name: node1
+    container_name: node1-${CL_NAME}
     environment:
       <<: *node-env
       CHARON_PRIVATE_KEY_FILE: /opt/charon/.charon/cluster/node1/charon-enr-private-key
@@ -62,7 +62,7 @@ services:
 
   node2:
     <<: *node-base
-    container_name: node2
+    container_name: node2-${CL_NAME}
     environment:
       <<: *node-env
       CHARON_PRIVATE_KEY_FILE: /opt/charon/.charon/cluster/node2/charon-enr-private-key
@@ -151,7 +151,7 @@ services:
       - ./testnet:/opt/lighthouse/network-configs
 
   vc0-teku:
-    image: consensys/teku:${TEKU_VERSION:-24.8}
+    image: consensys/teku:${TEKU_VERSION:-24.10.3}
     networks: [network1]
     # network_mode: "host"
     depends_on: [node0]
@@ -160,7 +160,6 @@ services:
       validator-client
       --beacon-node-api-endpoint="http://node0:3600"
       --config-file "/opt/charon/teku/teku-config.yaml"
-      --Xblock-v3-enabled true
       --validators-external-signer-slashing-protection-enabled true
       --validators-proposer-blinded-blocks-enabled ${BUILDER_API_ENABLED:-true}
       --validators-builder-registration-default-enabled ${BUILDER_API_ENABLED:-true}
@@ -172,7 +171,7 @@ services:
       - ./testnet/config.yaml:/opt/teku/config.yaml
 
   vc1-teku:
-    image: consensys/teku:${TEKU_VERSION:-24.8}
+    image: consensys/teku:${TEKU_VERSION:-24.10.3}
     networks: [network1]
     # network_mode: "host"
     depends_on: [node1]
@@ -181,7 +180,6 @@ services:
       validator-client
       --beacon-node-api-endpoint=http://node1:3600
       --config-file "/opt/charon/teku/teku-config.yaml"
-      --Xblock-v3-enabled true
       --validators-external-signer-slashing-protection-enabled true
       --validators-proposer-blinded-blocks-enabled ${BUILDER_API_ENABLED:-true}
       --validators-builder-registration-default-enabled ${BUILDER_API_ENABLED:-true}
@@ -193,7 +191,7 @@ services:
       - ./testnet/config.yaml:/opt/teku/config.yaml
 
   vc2-teku:
-    image: consensys/teku:${TEKU_VERSION:-24.8}
+    image: consensys/teku:${TEKU_VERSION:-24.10.3}
     networks: [network1]
     # network_mode: "host"
     depends_on: [node2]
@@ -202,7 +200,6 @@ services:
       validator-client
       --beacon-node-api-endpoint=http://node2:3600
       --config-file "/opt/charon/teku/teku-config.yaml"
-      --Xblock-v3-enabled true
       --validators-external-signer-slashing-protection-enabled true
       --validators-proposer-blinded-blocks-enabled ${BUILDER_API_ENABLED:-true}
       --validators-builder-registration-default-enabled ${BUILDER_API_ENABLED:-true}
@@ -253,7 +250,7 @@ services:
       - ./nimbus/run.sh:/home/user/data/run.sh
 
   vc0-lodestar:
-    image: chainsafe/lodestar:${LODESTAR_VERSION:-v1.20.2}
+    image: chainsafe/lodestar:${LODESTAR_VERSION:-v1.23.0}
     depends_on: [node0]
     entrypoint: /opt/lodestar/run.sh
     networks: [network1]
@@ -270,7 +267,7 @@ services:
     restart: unless-stopped
 
   vc1-lodestar:
-    image: chainsafe/lodestar:${LODESTAR_VERSION:-v1.20.2}
+    image: chainsafe/lodestar:${LODESTAR_VERSION:-v1.23.0}
     depends_on: [node1]
     entrypoint: /opt/lodestar/run.sh
     networks: [network1]
@@ -288,7 +285,7 @@ services:
     restart: unless-stopped
 
   vc2-lodestar:
-    image: chainsafe/lodestar:${LODESTAR_VERSION:-v1.20.2}
+    image: chainsafe/lodestar:${LODESTAR_VERSION:-v1.23.0}
     depends_on: [node2]
     entrypoint: /opt/lodestar/run.sh
     networks: [network1]
@@ -370,9 +367,8 @@ services:
   # |_| |_| |_|\___/|_| |_|_|\__\___/|_|  |_|_| |_|\__, |
   #                                                |___/
   prometheus:
+    container_name: prometheus-${CL_NAME}
     image: prom/prometheus:${PROMETHEUS_VERSION:-v2.44.0}
-    ports:
-      - "9090:9090"
     networks: [network1]
     volumes:
       - ./prometheus/prometheustmp.yml:/etc/prometheus/prometheus.yml

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 x-node-base:
   # Pegged charon version (update this for each release).
   &node-base
-  image: obolnetwork/charon-local:latest
+  image: obolnetwork/charon:v1.2.0-rc2
   restart: unless-stopped
   networks: [network1]
   # network_mode: "host"
@@ -160,7 +160,6 @@ services:
       validator-client
       --beacon-node-api-endpoint="http://node0:3600"
       --config-file "/opt/charon/teku/teku-config.yaml"
-      --Xblock-v3-enabled true
       --validators-external-signer-slashing-protection-enabled true
       --validators-proposer-blinded-blocks-enabled ${BUILDER_API_ENABLED:-true}
       --validators-builder-registration-default-enabled ${BUILDER_API_ENABLED:-true}
@@ -181,7 +180,6 @@ services:
       validator-client
       --beacon-node-api-endpoint=http://node1:3600
       --config-file "/opt/charon/teku/teku-config.yaml"
-      --Xblock-v3-enabled true
       --validators-external-signer-slashing-protection-enabled true
       --validators-proposer-blinded-blocks-enabled ${BUILDER_API_ENABLED:-true}
       --validators-builder-registration-default-enabled ${BUILDER_API_ENABLED:-true}
@@ -202,7 +200,6 @@ services:
       validator-client
       --beacon-node-api-endpoint=http://node2:3600
       --config-file "/opt/charon/teku/teku-config.yaml"
-      --Xblock-v3-enabled true
       --validators-external-signer-slashing-protection-enabled true
       --validators-proposer-blinded-blocks-enabled ${BUILDER_API_ENABLED:-true}
       --validators-builder-registration-default-enabled ${BUILDER_API_ENABLED:-true}

diff --git a/kill_ports.sh b/kill_ports.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+PORTS=("14000" "24000" "34000" "14003" "24003" "34003" "14004" "24004" "34004")
+
+for PORT in "${PORTS[@]}"; do
+    PID=$(sudo lsof -ti :$PORT)
+    if [ ! -z "$PID" ]; then
+        echo "Killing process $PID on port $PORT"
+        sudo kill -9 $PID
+    else
+        echo "No process found on port $PORT"
+    fi
+done
diff --git a/kurtosis-geth-lighthouse/.charon/cluster/node0/charon-enr-private-key b/kurtosis-geth-lighthouse/.charon/cluster/node0/charon-enr-private-key