(WIP) devnet4: dual hash-sig keys and GENESIS_VALIDATORS format

.gitignore

@@ -17,10 +17,14 @@ hash-sig-keys/
 
 # Auto-generated Ansible inventory (generated from validator-config.yaml)
 hosts.yml
+hosts-prepare.yml
 
 # Temporary cache files
 tmp/
 
+logs/
+monitoring/
+
 ansible-deployment*.log
 
 # Generated Prometheus config (created by generate-prometheus-config.sh)

TESTING_DEVNET3.md

@@ -50,7 +50,7 @@ NETWORK_DIR=local-devnet ./spin-node.sh --node "zeam_0 ream_0" --generateGenesis
 ### Test with Attestation Committee Count Override
 ```bash
 # 1. Uncomment attestation_committee_count in local-devnet/genesis/validator-config.yaml
-# 2. Set desired value (e.g., attestation_committee_count: 4)
+# 2. Set desired value (default/spec is 1; e.g., attestation_committee_count: 4 for multi-committee tests)
 # 3. Run:
 NETWORK_DIR=local-devnet ./spin-node.sh --node zeam_0 --generateGenesis --cleanData
 ```
@@ -64,15 +64,15 @@ NETWORK_DIR=local-devnet ./spin-node.sh --node zeam_0 --generateGenesis --cleanD
 4. zeam command includes `--is-aggregator` flag for aggregator only
 
 ### Attestation Committee Count
-**When NOT set (default):**
+**When NOT set in validator-config.yaml:**
 - parse-vc.sh does NOT display "Attestation Committee Count"
 - zeam command does NOT include `--attestation-committee-count` flag
-- Client uses its hardcoded default
+- zeam reads `ATTESTATION_COMMITTEE_COUNT` from `config.yaml` if present; otherwise chain default **1** (matches leanSpec)
 
-**When set (e.g., to 4):**
+**When set in validator-config (e.g., to 4):**
 - parse-vc.sh displays: "Attestation Committee Count: 4"
 - zeam command includes: `--attestation-committee-count 4`
-- Client uses the specified value
+- Client uses the specified value (overrides `config.yaml` when passed)
 
 ## Verification
 

ansible-devnet/genesis/test-validator-config-subnet2.yaml

@@ -0,0 +1,161 @@
+shuffle: roundrobin
+# Test layout: 2 subnets × 7 nodes each (1 zeam + 1 grandine + 1 gean + 2 ethlambda + 1 qlean + 1 lantern per subnet
+#              except subnet 1 which has 1 ream instead of ethlambda_3).
+# Each server hosts one node per subnet per client type on distinct ports.
+#
+#   Server layout (IP → nodes):
+#     37.27.89.135     grandine_0 (s0,9001)   zeam_3      (s1,9002)    qlean_0   (s0,9003)
+#     157.180.20.55    zeam_1    (s0,9001)    zeam_4      (s1,9002)    qlean_1   (s1,9003)
+#     178.104.133.162  gean_0    (s0,9001)    ethlambda_2 (s1,9002)
+#     178.104.151.50   ethlambda_0 (s0,9001) ream_0      (s1,9002)    lantern_0 (s0,9003)
+#     178.104.149.91   ethlambda_1 (s0,9001) gean_1      (s1,9002)    lantern_1 (s1,9003)
+#
+#   ./spin-node.sh --validatorConfig ansible-devnet/genesis/test-validator-config-subnet2.yaml
+deployment_mode: ansible
+config:
+  activeEpoch: 18
+  keyType: "hash-sig"
+  attestation_committee_count: 2
+validators:
+  # ── Subnet 0 ──────────────────────────────────────────────────────────────
+  - name: "grandine_0"
+    privkey: "c05937b251889e35c58d4601c29bed8153dc22c548448f85e0ab9ca436d4b904"
+    enrFields:
+      ip: "37.27.89.135"
+      quic: 9001
+    metricsPort: 9095
+    apiPort: 5055
+    subnet: 0
+    isAggregator: false
+    count: 1
+  - name: "zeam_1"
+    privkey: "e7904333a18df63252e2c807f65915e1a256667ac8af8fb2116186cae2b24d98"
+    enrFields:
+      ip: "157.180.20.55"
+      quic: 9001
+    metricsPort: 9095
+    apiPort: 5055
+    subnet: 0
+    isAggregator: true
+    count: 1
+  - name: "gean_0"
+    privkey: "69c251cdb06039dd99d87e5a1439fa3720615be98c293ec9bcfd041877a2e8ca"
+    enrFields:
+      ip: "178.104.133.162"
+      quic: 9001
+    metricsPort: 9095
+    apiPort: 5055
+    subnet: 0
+    isAggregator: false
+    count: 1
+  - name: "ethlambda_0"
+    privkey: "299550529a79bc2dce003747c52fb0639465c893e00b0440ac66144d625e066a"
+    enrFields:
+      ip: "178.104.151.50"
+      quic: 9001
+    metricsPort: 9095
+    apiPort: 5055
+    subnet: 0
+    isAggregator: false
+    count: 1
+  - name: "ethlambda_1"
+    privkey: "58c22d2c5785e9a47004f429083804dfc5dad666b4ab6c38face9993fd644c8e"
+    enrFields:
+      ip: "178.104.149.91"
+      quic: 9001
+    metricsPort: 9095
+    apiPort: 5055
+    subnet: 0
+    isAggregator: false
+    count: 1
+  - name: "qlean_0"
+    privkey: "8e9f81c9caa9e29d26a7327311ca63a38254efdfccf3ce1362bae47eae0b18b3"
+    enrFields:
+      ip: "37.27.89.135"
+      quic: 9003
+    metricsPort: 9097
+    apiPort: 5057
+    subnet: 0
+    isAggregator: false
+    count: 1
+  - name: "lantern_0"
+    privkey: "d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5"
+    enrFields:
+      ip: "178.104.151.50"
+      quic: 9003
+    metricsPort: 9097
+    apiPort: 5057
+    subnet: 0
+    isAggregator: false
+    count: 1
+  # ── Subnet 1 ──────────────────────────────────────────────────────────────
+  - name: "zeam_3"
+    privkey: "db070d74f757c3e191cc9232a3c64db2af180cf4c19e2ea2f4c757931d7b7074"
+    enrFields:
+      ip: "37.27.89.135"
+      quic: 9002
+    metricsPort: 9096
+    apiPort: 5056
+    subnet: 1
+    isAggregator: false
+    count: 1
+  - name: "zeam_4"
+    privkey: "f2d3b7044eed1f9edaee061f3d5ec3157408bf45a0f4490a70ae611153cebee4"
+    enrFields:
+      ip: "157.180.20.55"
+      quic: 9002
+    metricsPort: 9096
+    apiPort: 5056
+    subnet: 1
+    isAggregator: false
+    count: 1
+  - name: "ethlambda_2"
+    privkey: "c8f682e8c2156f32dd827ca91a0d1be802f80494514c9e5ff2e35576df06da6d"
+    enrFields:
+      ip: "178.104.133.162"
+      quic: 9002
+    metricsPort: 9096
+    apiPort: 5056
+    subnet: 1
+    isAggregator: true
+    count: 1
+  - name: "ream_0"
+    privkey: "04e5fb8c58dccfe9086d2488ed03f69089a74aacc22e41c06a3b83ac40c5eab6"
+    enrFields:
+      ip: "178.104.151.50"
+      quic: 9002
+    metricsPort: 9096
+    apiPort: 5056
+    subnet: 1
+    isAggregator: false
+    count: 1
+  - name: "gean_1"
+    privkey: "310139c3eecbf3bd49fa2be2ff813fa69b330e2d246266a23cb33a9fa58b0a11"
+    enrFields:
+      ip: "178.104.149.91"
+      quic: 9002
+    metricsPort: 9096
+    apiPort: 5056
+    subnet: 1
+    isAggregator: false
+    count: 1
+  - name: "qlean_1"
+    privkey: "1991db904e455114bc836a0860689e77c1d2fa313a15567c6c7aa81e180925ac"
+    enrFields:
+      ip: "157.180.20.55"
+      quic: 9003
+    metricsPort: 9097
+    apiPort: 5057
+    subnet: 1
+    isAggregator: false
+    count: 1
+  - name: "lantern_1"
+    privkey: "582644c8e66b61df3dafb33fa496cee97060566542fb8594fca661be3332710f"
+    enrFields:
+      ip: "178.104.149.91"
+      quic: 9003
+    metricsPort: 9097
+    apiPort: 5057
+    subnet: 1
+    isAggregator: false
+    count: 1