feat: add attestation_committee_count config and auto aggregator selection

ch4r10t33r · ch4r10t33r · commit 951526d861ca · 2026-02-08T20:24:13.000Z
diff --git a/README.md b/README.md
@@ -82,6 +82,19 @@ Grafana is started with the two pre-provisioned dashboards from [leanMetrics](ht
 
 > **Note:** The `--metrics` flag only affects local deployments. When using Ansible deployment mode, this flag is ignored. Metrics ports are always exposed by clients regardless of this flag.
 
+### Aggregator Selection
+
+```sh
+# Let the system randomly select an aggregator (default behavior)
+NETWORK_DIR=local-devnet ./spin-node.sh --node all --generateGenesis
+
+# Manually specify which node should be the aggregator
+NETWORK_DIR=local-devnet ./spin-node.sh --node all --generateGenesis --aggregator zeam_0
+
+# The aggregator selection is applied automatically and the isAggregator flag
+# is updated in validator-config.yaml before nodes are started
+```
+
 ## Args
 
 1. `NETWORK_DIR` is an env to specify the network directory. Should have a `genesis` directory with genesis config. A `data` folder will be created inside this `NETWORK_DIR` if not already there.
@@ -131,6 +144,7 @@ Grafana is started with the two pre-provisioned dashboards from [leanMetrics](ht
    - If not provided, defaults to `latest` for zeam, ream, and lantern, and `dd67521` for qlean
    - The script will automatically pull the specified Docker images before running containers
    - Example: `--tag devnet0` or `--tag devnet1`
+<<<<<<< HEAD
 11. `--metrics` starts a Prometheus + Grafana metrics stack alongside the devnet (local deployments only). When specified:
     - Generates `metrics/prometheus/prometheus.yml` from `validator-config.yaml` with scrape targets for all configured nodes
     - Starts Prometheus (http://localhost:9090) and Grafana (http://localhost:3000) via Docker Compose
@@ -139,6 +153,15 @@ Grafana is started with the two pre-provisioned dashboards from [leanMetrics](ht
     - On Ctrl+C cleanup, the metrics stack is stopped automatically
 
     Note: Client metrics endpoints are always enabled regardless of this flag.
+=======
+11. `--metrics` enables metrics collection on all nodes. When specified, each client will activate its metrics endpoint according to its implementation. Metrics ports are configured per node in `validator-config.yaml`.
+12. `--aggregator` specifies which node should act as the aggregator (1 aggregator per subnet).
+   - If not provided, one node will be randomly selected as the aggregator
+   - If provided, the specified node will be set as the aggregator
+   - The aggregator selection updates the `isAggregator` flag in `validator-config.yaml`
+   - Example: `--aggregator zeam_0` to make zeam_0 the aggregator
+   - Example: Without flag, a random node will be selected automatically
+>>>>>>> 1030459 (feat: add attestation_committee_count config and auto aggregator selection)
 
 ### Clients supported
 
diff --git a/ansible-devnet/genesis/validator-config.yaml b/ansible-devnet/genesis/validator-config.yaml
@@ -4,6 +4,7 @@ deployment_mode: ansible
 config:
   activeEpoch: 18
   keyType: "hash-sig"
+  attestation_committee_count: 1
 validators:
   - name: "zeam_0"
     # node id 7d0904dc6d8d7130e0e68d5d3175d0c3cf470f8725f67bd8320882f5b9753cc0
diff --git a/client-cmds/ethlambda-cmd.sh b/client-cmds/ethlambda-cmd.sh
@@ -18,6 +18,7 @@ node_binary="$binary_path \
       --node-key $configDir/$item.key \
       --metrics-address 0.0.0.0 \
       --metrics-port $metricsPort \
+      --attestation-committee-count $attestationCommitteeCount \
       $aggregator_flag"
 
 # Command when running as docker container
@@ -28,6 +29,7 @@ node_docker="ghcr.io/lambdaclass/ethlambda:devnet2 \
       --node-key /config/$item.key \
       --metrics-address 0.0.0.0 \
       --metrics-port $metricsPort \
+      --attestation-committee-count $attestationCommitteeCount \
       $aggregator_flag"
 
 node_setup="docker"
diff --git a/client-cmds/grandine-cmd.sh b/client-cmds/grandine-cmd.sh
@@ -18,6 +18,7 @@ node_binary="$grandine_bin \
         --http-address 0.0.0.0 \
         --http-port $metricsPort \
         --hash-sig-key-dir $configDir/hash-sig-keys \
+        --attestation-committee-count $attestationCommitteeCount \
         $aggregator_flag"
 
 node_docker="sifrai/lean:devnet-2 \
@@ -32,6 +33,7 @@ node_docker="sifrai/lean:devnet-2 \
         --http-address 0.0.0.0 \
         --http-port $metricsPort \
         --hash-sig-key-dir /config/hash-sig-keys \
+        --attestation-committee-count $attestationCommitteeCount \
         $aggregator_flag"
 
 # choose either binary or docker
diff --git a/client-cmds/lantern-cmd.sh b/client-cmds/lantern-cmd.sh
@@ -29,6 +29,7 @@ node_binary="$scriptDir/lantern/build/lantern_cli \
         --http-port 5055 \
         --log-level debug \
         --hash-sig-key-dir $configDir/hash-sig-keys \
+        --attestation-committee-count $attestationCommitteeCount \
         $aggregator_flag"
 
 node_docker="$LANTERN_IMAGE --data-dir /data \
@@ -44,6 +45,7 @@ node_docker="$LANTERN_IMAGE --data-dir /data \
         --http-port 5055 \
         --log-level debug \
         --hash-sig-key-dir /config/hash-sig-keys \
+        --attestation-committee-count $attestationCommitteeCount \
         $aggregator_flag"
 
 # choose either binary or docker
diff --git a/client-cmds/lighthouse-cmd.sh b/client-cmds/lighthouse-cmd.sh
@@ -21,6 +21,7 @@ node_binary="$lighthouse_bin lean_node \
       $metrics_flag \
       --metrics-address 0.0.0.0 \
       --metrics-port $metricsPort \
+      --attestation-committee-count $attestationCommitteeCount \
       $aggregator_flag"
 
 node_docker="hopinheimer/lighthouse:latest lighthouse lean_node \
@@ -35,6 +36,7 @@ node_docker="hopinheimer/lighthouse:latest lighthouse lean_node \
       $metrics_flag \
       --metrics-address 0.0.0.0 \
       --metrics-port $metricsPort \
+      --attestation-committee-count $attestationCommitteeCount \
       $aggregator_flag"
 
 node_setup="docker"
diff --git a/client-cmds/qlean-cmd.sh b/client-cmds/qlean-cmd.sh
@@ -22,6 +22,7 @@ node_binary="$scriptDir/qlean/build/src/executable/qlean \
       --node-id $item --node-key $configDir/$privKeyPath \
       --listen-addr /ip4/0.0.0.0/udp/$quicPort/quic-v1 \
       --prometheus-port $metricsPort \
+      --attestation-committee-count $attestationCommitteeCount \
       $aggregator_flag \
       -ldebug \
       -ltrace"
@@ -37,6 +38,7 @@ node_docker="qdrvm/qlean-mini:devnet-2 \
       --node-id $item --node-key /config/$privKeyPath \
       --listen-addr /ip4/0.0.0.0/udp/$quicPort/quic-v1 \
       --prometheus-port $metricsPort \
+      --attestation-committee-count $attestationCommitteeCount \
       $aggregator_flag \
       -ldebug \
       -ltrace"
diff --git a/client-cmds/ream-cmd.sh b/client-cmds/ream-cmd.sh
@@ -22,6 +22,7 @@ node_binary="$scriptDir/../ream/target/release/ream --data-dir $dataDir/$item \
         --metrics-address 0.0.0.0 \
         --metrics-port $metricsPort \
         --http-address 0.0.0.0 \
+        --attestation-committee-count $attestationCommitteeCount \
         $aggregator_flag"
 
 node_docker="ghcr.io/reamlabs/ream:latest-devnet2 --data-dir /data \
@@ -35,6 +36,7 @@ node_docker="ghcr.io/reamlabs/ream:latest-devnet2 --data-dir /data \
         --metrics-address 0.0.0.0 \
         --metrics-port $metricsPort \
         --http-address 0.0.0.0 \
+        --attestation-committee-count $attestationCommitteeCount \
         $aggregator_flag"
 
 # choose either binary or docker
diff --git a/client-cmds/zeam-cmd.sh b/client-cmds/zeam-cmd.sh
@@ -19,6 +19,7 @@ node_binary="$scriptDir/../zig-out/bin/zeam node \
       --node-id $item --node-key $configDir/$item.key \
       $metrics_flag \
       --api-port $metricsPort \
+      --attestation-committee-count $attestationCommitteeCount \
       $aggregator_flag"
 
 node_docker="--security-opt seccomp=unconfined blockblaz/zeam:devnet2 node \
@@ -28,6 +29,7 @@ node_docker="--security-opt seccomp=unconfined blockblaz/zeam:devnet2 node \
       --node-id $item --node-key /config/$item.key \
       $metrics_flag \
       --api-port $metricsPort \
+      --attestation-committee-count $attestationCommitteeCount \
       $aggregator_flag"
 
 # choose either binary or docker
diff --git a/local-devnet/genesis/validator-config.yaml b/local-devnet/genesis/validator-config.yaml
@@ -4,6 +4,7 @@ deployment_mode: local
 config:
   activeEpoch: 18
   keyType: "hash-sig"
+  attestation_committee_count: 1
 validators:
   - name: "zeam_0"
     # node id 7d0904dc6d8d7130e0e68d5d3175d0c3cf470f8725f67bd8320882f5b9753cc0
diff --git a/parse-env.sh b/parse-env.sh
@@ -80,6 +80,11 @@ while [[ $# -gt 0 ]]; do
       stopNodes=true
       shift
       ;;
+    --aggregator)
+      aggregatorNode="$2"
+      shift # past argument
+      shift # past value
+      ;;
     *)    # unknown option
       shift # past argument
       ;;
@@ -110,3 +115,4 @@ echo "cleanData = $cleanData"
 echo "popupTerminal = $popupTerminal"
 echo "dockerTag = ${dockerTag:-latest}"
 echo "enableMetrics = $enableMetrics"
+echo "aggregatorNode = ${aggregatorNode:-<auto-select>}"
diff --git a/parse-vc.sh b/parse-vc.sh
@@ -57,6 +57,12 @@ if [ -z "$isAggregator" ] || [ "$isAggregator" == "null" ]; then
     isAggregator="false"
 fi
 
+# Extract attestation_committee_count from config section (defaults to 1 if not set)
+attestationCommitteeCount=$(yq eval ".config.attestation_committee_count // 1" "$validator_config_file")
+if [ -z "$attestationCommitteeCount" ] || [ "$attestationCommitteeCount" == "null" ]; then
+    attestationCommitteeCount="1"
+fi
+
 # Automatically extract private key using yq
 privKey=$(yq eval ".validators[] | select(.name == \"$item\") | .privkey" "$validator_config_file")
 
@@ -106,11 +112,13 @@ if [ "$keyType" == "hash-sig" ] && [ "$hashSigKeyIndex" != "null" ] && [ -n "$ha
     echo "Hash-Sig Public Key: $hashSigPkPath"
     echo "Hash-Sig Secret Key: $hashSigSkPath"
     echo "Is Aggregator: $isAggregator"
+    echo "Attestation Committee Count: $attestationCommitteeCount"
 else
     echo "Node: $item"
     echo "QUIC Port: $quicPort"
     echo "Metrics Port: $metricsPort"
     echo "Devnet: ${devnet:-<not set>}"
     echo "Private Key File: $privKeyPath"
     echo "Is Aggregator: $isAggregator"
+    echo "Attestation Committee Count: $attestationCommitteeCount"
 fi
diff --git a/spin-node.sh b/spin-node.sh
@@ -81,6 +81,45 @@ echo "Detected nodes: ${nodes[@]}"
 # nodes=("zeam_0" "ream_0" "qlean_0")
 spin_nodes=()
 
+# Aggregator selection logic (1 aggregator per subnet)
+# If user specified --aggregator, use that; otherwise randomly select one
+if [ -n "$aggregatorNode" ]; then
+  # Validate that the specified aggregator exists in the validator list
+  aggregator_found=false
+  for available_node in "${nodes[@]}"; do
+    if [[ "$aggregatorNode" == "$available_node" ]]; then
+      selected_aggregator="$aggregatorNode"
+      aggregator_found=true
+      echo "Using user-specified aggregator: $selected_aggregator"
+      break
+    fi
+  done
+  
+  if [[ "$aggregator_found" == false ]]; then
+    echo "Error: Specified aggregator '$aggregatorNode' not found in validator config"
+    echo "Available nodes: ${nodes[@]}"
+    exit 1
+  fi
+else
+  # Randomly select one node as aggregator
+  # Get the number of nodes
+  num_nodes=${#nodes[@]}
+  # Generate random index (0 to num_nodes-1)
+  random_index=$((RANDOM % num_nodes))
+  selected_aggregator="${nodes[$random_index]}"
+  echo "Randomly selected aggregator: $selected_aggregator (index $random_index out of $num_nodes nodes)"
+fi
+
+# Update the validator-config.yaml to set isAggregator flag
+# First, reset all nodes to isAggregator: false
+for node_name in "${nodes[@]}"; do
+  yq eval -i ".validators[] | select(.name == \"$node_name\") | .isAggregator = false" "$validator_config_file"
+done
+
+# Set the selected aggregator to isAggregator: true
+yq eval -i ".validators[] | select(.name == \"$selected_aggregator\") | .isAggregator = true" "$validator_config_file"
+echo "Set $selected_aggregator as aggregator in $validator_config_file"
+
 # Parse comma-separated or space-separated node names or handle single node/all
 if [[ "$node" == "all" ]]; then
   # Spin all nodes
