merge queue: embarking unstable (f3fd1f2) and [#8557 + #8559] together

scripts/tests/genesis-sync-config-electra.yaml

@@ -6,15 +6,14 @@ participants:
   # nodes without validators, used for testing sync.
   - cl_type: lighthouse
     cl_image: lighthouse:local
-    supernode: true # no supernode in Electra, this is for future proof
     validator_count: 0
   - cl_type: lighthouse
     cl_image: lighthouse:local
-    supernode: false
     validator_count: 0
 network_params:
   seconds_per_slot: 6
   electra_fork_epoch: 0
+  fulu_fork_epoch: 100000 # a really big number so this test stays in electra
   preset: "minimal"
 additional_services:
   - tx_fuzz

scripts/tests/genesis-sync-config-fulu.yaml

@@ -21,8 +21,7 @@ participants:
     validator_count: 0
 network_params:
   seconds_per_slot: 6
-  electra_fork_epoch: 0
-  fulu_fork_epoch: 1
+  fulu_fork_epoch: 0
   preset: "minimal"
 additional_services:
   - tx_fuzz

scripts/tests/network_params.yaml

@@ -6,9 +6,10 @@ participants:
     cl_image: lighthouse:local
     cl_extra_params:
       - --target-peers=3
+    supernode: true
     count: 4
 network_params:
-  electra_fork_epoch: 0
+  fulu_fork_epoch: 0
   seconds_per_slot: 3
   num_validator_keys_per_node: 20
 global_log_level: debug

validator_client/validator_services/src/attestation_service.rs

@@ -193,6 +193,12 @@ impl<S: ValidatorStore + 'static, T: SlotClock + 'static> AttestationService<S,
         // Create and publish an `Attestation` for all validators only once
         // as the committee_index is not included in AttestationData post-Electra
         let attestation_duties: Vec<_> = self.duties_service.attesters(slot).into_iter().collect();
+
+        // Return early if there is no attestation duties
+        if attestation_duties.is_empty() {
+            return Ok(());
+        }
+
         let attestation_service = self.clone();
 
         let attestation_data_handle = self
@@ -371,10 +377,6 @@ impl<S: ValidatorStore + 'static, T: SlotClock + 'static> AttestationService<S,
             &[validator_metrics::ATTESTATIONS],
         );
 
-        if validator_duties.is_empty() {
-            return Ok(());
-        }
-
         let current_epoch = self
             .slot_clock
             .now()