merge queue: embarking unstable (90dd5bb) and #8489 together

.github/workflows/local-testnet.yml

@@ -179,7 +179,7 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        network: [sepolia, devnet]
+        network: [sepolia]
     steps:
       - uses: actions/checkout@v5
 

scripts/local_testnet/README.md

@@ -21,7 +21,7 @@ cd ./scripts/local_testnet
 ```
 
 It will build a Lighthouse docker image from the root of the directory and will take an approximately 12 minutes to complete. Once built, the testing will be started automatically. You will see a list of services running and "Started!" at the end. 
-You can also select your own Lighthouse docker image to use by specifying it in `network_params.yml` under the `cl_image` key.
+You can also select your own Lighthouse docker image to use by specifying it in `network_params.yaml` under the `cl_image` key.
 Full configuration reference for Kurtosis is specified [here](https://github.com/ethpandaops/ethereum-package?tab=readme-ov-file#configuration).
 
 To view all running services:

scripts/local_testnet/network_params.yaml

@@ -1,19 +1,37 @@
 # Full configuration reference [here](https://github.com/ethpandaops/ethereum-package?tab=readme-ov-file#configuration).
 participants:
-  - el_type: geth
+  - cl_type: lighthouse
+    cl_image: lighthouse:local
+    el_type: geth
     el_image: ethereum/client-go:latest
-    cl_type: lighthouse
+    supernode: true
+    cl_extra_params:
+      - --target-peers=3
+    count: 2
+  - cl_type: lighthouse
     cl_image: lighthouse:local
+    el_type: geth
+    el_image: ethereum/client-go:latest
+    supernode: false
     cl_extra_params:
       - --target-peers=3
-    count: 4
+    count: 2
 network_params:
-  electra_fork_epoch: 0
-  seconds_per_slot: 3
-global_log_level: debug
+  fulu_fork_epoch: 0
+  seconds_per_slot: 6
 snooper_enabled: false
+global_log_level: debug
 additional_services:
   - dora
   - spamoor
   - prometheus_grafana
   - tempo
+spamoor_params:
+  image: ethpandaops/spamoor:master
+  spammers:
+    - scenario: eoatx
+      config:
+        throughput: 200
+    - scenario: blobs
+      config:
+        throughput: 20

scripts/local_testnet/start_local_testnet.sh

@@ -78,6 +78,11 @@ if [ "$RUN_ASSERTOOR_TESTS" = true ]; then
   echo "Assertoor has been added to $NETWORK_PARAMS_FILE."
 fi
 
+if [ "$KEEP_ENCLAVE" = false ]; then
+  # Stop local testnet
+  kurtosis enclave rm -f $ENCLAVE_NAME 2>/dev/null || true
+fi
+
 if [ "$BUILD_IMAGE" = true ]; then
     echo "Building Lighthouse Docker image."
     ROOT_DIR="$SCRIPT_DIR/../.."
@@ -86,11 +91,6 @@ else
     echo "Not rebuilding Lighthouse Docker image."
 fi
 
-if [ "$KEEP_ENCLAVE" = false ]; then
-  # Stop local testnet
-  kurtosis enclave rm -f $ENCLAVE_NAME 2>/dev/null || true
-fi
-
 kurtosis run --enclave $ENCLAVE_NAME github.com/ethpandaops/ethereum-package@$ETHEREUM_PKG_VERSION --args-file $NETWORK_PARAMS_FILE
 
 echo "Started!"