From c680164742824b8f7c4da8943ef644518817b58c Mon Sep 17 00:00:00 2001
From: Pawan Dhananjay <pawandhananjay@gmail.com>
Date: Mon, 13 May 2024 10:18:17 +0300
Subject: [PATCH] Send unagg attestation based on fork

---
 validator_client/src/attestation_service.rs | 33 +++++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/validator_client/src/attestation_service.rs b/validator_client/src/attestation_service.rs
index 062a9436e9..4eff170c22 100644
--- a/validator_client/src/attestation_service.rs
+++ b/validator_client/src/attestation_service.rs
@@ -14,11 +14,11 @@ use std::ops::Deref;
 use std::sync::Arc;
 use tokio::time::{sleep, sleep_until, Duration, Instant};
 use tree_hash::TreeHash;
-use types::ForkName;
 use types::{
     attestation::AttestationBase, AggregateSignature, Attestation, AttestationData, BitList,
     ChainSpec, CommitteeIndex, EthSpec, Slot,
 };
+use types::{AttestationElectra, BitVector, ForkName};
 
 /// Builds an `AttestationService`.
 pub struct AttestationServiceBuilder<T: SlotClock + 'static, E: EthSpec> {
@@ -383,11 +383,32 @@ impl<T: SlotClock + 'static, E: EthSpec> AttestationService<T, E> {
                 return None;
             }
 
-            let mut attestation = Attestation::Base(AttestationBase {
-                aggregation_bits: BitList::with_capacity(duty.committee_length as usize).unwrap(),
-                data: attestation_data.clone(),
-                signature: AggregateSignature::infinity(),
-            });
+            let fork_name = self
+                .context
+                .eth2_config
+                .spec
+                .fork_name_at_slot::<E>(attestation_data.slot);
+
+            let mut attestation = if fork_name >= ForkName::Electra {
+                let mut committee_bits: BitVector<E::MaxCommitteesPerSlot> = BitVector::default();
+                committee_bits
+                    .set(duty.committee_index as usize, true)
+                    .unwrap();
+                Attestation::Electra(AttestationElectra {
+                    aggregation_bits: BitList::with_capacity(duty.committee_length as usize)
+                        .unwrap(),
+                    data: attestation_data.clone(),
+                    committee_bits,
+                    signature: AggregateSignature::infinity(),
+                })
+            } else {
+                Attestation::Base(AttestationBase {
+                    aggregation_bits: BitList::with_capacity(duty.committee_length as usize)
+                        .unwrap(),
+                    data: attestation_data.clone(),
+                    signature: AggregateSignature::infinity(),
+                })
+            };
 
             match self
                 .validator_store