From 7d1fda5e06677e93a8272d7c74ef5f1123f178eb Mon Sep 17 00:00:00 2001
From: pk910 <philipp@pk910.de>
Date: Tue, 17 Jun 2025 19:34:11 +0200
Subject: [PATCH] update `make devnet-run` to include client groups

---
 .hack/devnet/kurtosis.devnet.config.yaml |  9 +++++---
 .hack/devnet/run.sh                      | 26 +++++-------------------
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/.hack/devnet/kurtosis.devnet.config.yaml b/.hack/devnet/kurtosis.devnet.config.yaml
index 1800abe2..e33d20f3 100644
--- a/.hack/devnet/kurtosis.devnet.config.yaml
+++ b/.hack/devnet/kurtosis.devnet.config.yaml
@@ -7,12 +7,15 @@ participants_matrix:
 network_params:
   electra_fork_epoch: 0
   preset: mainnet
-  gas_limit: 60000000
-  genesis_gaslimit: 60000000
+  gas_limit: 100000000
+  genesis_gaslimit: 100000000
 additional_services:
+  - spamoor # required for config extraction
   - dora
   - blockscout
+spamoor_params:
+  image: ethpandaops/spamoor:master
 port_publisher:
   additional_services:
     enabled: true
-    public_port_start: 36000
+    public_port_start: 36000
\ No newline at end of file
diff --git a/.hack/devnet/run.sh b/.hack/devnet/run.sh
index 0ab80135..aefbf385 100755
--- a/.hack/devnet/run.sh
+++ b/.hack/devnet/run.sh
@@ -17,32 +17,16 @@ else
   --image-download always \
   --enclave "$ENCLAVE_NAME" \
   --args-file "${config_file}"
+
+  # Stop spamoor instance within ethereum-package if running
+  kurtosis service stop "$ENCLAVE_NAME" spamoor > /dev/null || true
 fi
 
 # Get chain config
 kurtosis files inspect "$ENCLAVE_NAME" el_cl_genesis_data ./config.yaml | tail -n +2 > "${__dir}/generated-chain-config.yaml"
 
-# Get validator ranges
-kurtosis files inspect "$ENCLAVE_NAME" validator-ranges validator-ranges.yaml | tail -n +2 > "${__dir}/generated-validator-ranges.yaml"
-
-## Generate spamoor config
-ENCLAVE_UUID=$(kurtosis enclave inspect "$ENCLAVE_NAME" --full-uuids | grep 'UUID:' | awk '{print $2}')
-
-EXECUTION_NODES=$(docker ps -aq -f "label=kurtosis_enclave_uuid=$ENCLAVE_UUID" \
-              -f "label=com.kurtosistech.app-id=kurtosis" \
-              -f "label=com.kurtosistech.custom.ethereum-package.client-type=execution" | tac)
-
-cat <<EOF > "${__dir}/generated-hosts.txt"
-$(for node in $EXECUTION_NODES; do
-    name=$(docker inspect -f "{{ with index .Config.Labels \"com.kurtosistech.id\"}}{{.}}{{end}}" $node)
-    ip=$(echo '127.0.0.1')
-    port=$(docker inspect --format='{{ (index (index .NetworkSettings.Ports "8545/tcp") 0).HostPort }}' $node)
-    if [ -z "$port" ]; then
-      port="65535"
-    fi
-    echo "http://$ip:$port"
-done)
-EOF
+# Get spamoor hosts
+kurtosis files inspect "$ENCLAVE_NAME" spamoor-config rpc-hosts.txt | tail -n +2 > "${__dir}/generated-hosts.txt"
 
 
 cat <<EOF