From 5abbdb660af28c582d98635725347c28464523b0 Mon Sep 17 00:00:00 2001
From: chonghe <44791194+chong-he@users.noreply.github.com>
Date: Thu, 11 Dec 2025 14:56:53 +0800
Subject: [PATCH] Do not request attestation data when attestation duty is
 empty (#8559)

Co-Authored-By: Tan Chee Keong <tanck@sigmaprime.io>
---
 .../validator_services/src/attestation_service.rs      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/validator_client/validator_services/src/attestation_service.rs b/validator_client/validator_services/src/attestation_service.rs
index b2b8bc81e2..587d4668b8 100644
--- a/validator_client/validator_services/src/attestation_service.rs
+++ b/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()