From 6f0b78426a9a4c3804159f3ac8998224645ce456 Mon Sep 17 00:00:00 2001
From: dapplion <35266934+dapplion@users.noreply.github.com>
Date: Tue, 18 Jun 2024 19:00:02 +0200
Subject: [PATCH] Dedup Attestation constructor code

---
 beacon_node/beacon_chain/src/beacon_chain.rs | 44 ++++--------------
 beacon_node/beacon_chain/src/test_utils.rs   | 47 +++++---------------
 consensus/types/src/attestation.rs           |  1 +
 3 files changed, 22 insertions(+), 70 deletions(-)

diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs
index eeb1457954..f1d9ce791e 100644
--- a/beacon_node/beacon_chain/src/beacon_chain.rs
+++ b/beacon_node/beacon_chain/src/beacon_chain.rs
@@ -122,7 +122,6 @@ use store::{
 use task_executor::{ShutdownReason, TaskExecutor};
 use tokio_stream::Stream;
 use tree_hash::TreeHash;
-use types::attestation::AttestationBase;
 use types::blob_sidecar::FixedBlobSidecarList;
 use types::payload::BlockProductionVersion;
 use types::*;
@@ -1994,40 +1993,15 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
             };
         drop(cache_timer);
 
-        if self
-            .spec
-            .fork_name_at_slot::<T::EthSpec>(request_slot)
-            .electra_enabled()
-        {
-            let mut committee_bits = BitVector::default();
-            if committee_len > 0 {
-                committee_bits.set(request_index as usize, true)?;
-            }
-            Ok(Attestation::Electra(AttestationElectra {
-                aggregation_bits: BitList::with_capacity(committee_len)?,
-                data: AttestationData {
-                    slot: request_slot,
-                    index: 0u64,
-                    beacon_block_root,
-                    source: justified_checkpoint,
-                    target,
-                },
-                committee_bits,
-                signature: AggregateSignature::empty(),
-            }))
-        } else {
-            Ok(Attestation::Base(AttestationBase {
-                aggregation_bits: BitList::with_capacity(committee_len)?,
-                data: AttestationData {
-                    slot: request_slot,
-                    index: request_index,
-                    beacon_block_root,
-                    source: justified_checkpoint,
-                    target,
-                },
-                signature: AggregateSignature::empty(),
-            }))
-        }
+        Ok(Attestation::<T::EthSpec>::empty_for_signing(
+            request_index,
+            committee_len,
+            request_slot,
+            beacon_block_root,
+            justified_checkpoint,
+            target,
+            &self.spec,
+        )?)
     }
 
     /// Performs the same validation as `Self::verify_unaggregated_attestation_for_gossip`, but for
diff --git a/beacon_node/beacon_chain/src/test_utils.rs b/beacon_node/beacon_chain/src/test_utils.rs
index 7d443db380..5a37c5e6ce 100644
--- a/beacon_node/beacon_chain/src/test_utils.rs
+++ b/beacon_node/beacon_chain/src/test_utils.rs
@@ -58,7 +58,6 @@ use store::{config::StoreConfig, HotColdDB, ItemStore, LevelDB, MemoryStore};
 use task_executor::TaskExecutor;
 use task_executor::{test_utils::TestRuntime, ShutdownReason};
 use tree_hash::TreeHash;
-use types::attestation::AttestationBase;
 use types::indexed_attestation::IndexedAttestationBase;
 use types::payload::BlockProductionVersion;
 pub use types::test_utils::generate_deterministic_keypairs;
@@ -1033,40 +1032,18 @@ where
             *state.get_block_root(target_slot)?
         };
 
-        if self.spec.fork_name_at_slot::<E>(slot).electra_enabled() {
-            let mut committee_bits = BitVector::default();
-            committee_bits.set(index as usize, true)?;
-            Ok(Attestation::Electra(AttestationElectra {
-                aggregation_bits: BitList::with_capacity(committee_len)?,
-                committee_bits,
-                data: AttestationData {
-                    slot,
-                    index: 0u64,
-                    beacon_block_root,
-                    source: state.current_justified_checkpoint(),
-                    target: Checkpoint {
-                        epoch,
-                        root: target_root,
-                    },
-                },
-                signature: AggregateSignature::empty(),
-            }))
-        } else {
-            Ok(Attestation::Base(AttestationBase {
-                aggregation_bits: BitList::with_capacity(committee_len)?,
-                data: AttestationData {
-                    slot,
-                    index,
-                    beacon_block_root,
-                    source: state.current_justified_checkpoint(),
-                    target: Checkpoint {
-                        epoch,
-                        root: target_root,
-                    },
-                },
-                signature: AggregateSignature::empty(),
-            }))
-        }
+        Ok(Attestation::empty_for_signing(
+            index,
+            committee_len,
+            slot,
+            beacon_block_root,
+            state.current_justified_checkpoint(),
+            Checkpoint {
+                epoch,
+                root: target_root,
+            },
+            &self.spec,
+        )?)
     }
 
     /// A list of attestations for each committee for the given slot.
diff --git a/consensus/types/src/attestation.rs b/consensus/types/src/attestation.rs
index 552c0faf6f..c8d1c3fb9b 100644
--- a/consensus/types/src/attestation.rs
+++ b/consensus/types/src/attestation.rs
@@ -89,6 +89,7 @@ impl<E: EthSpec> Hash for Attestation<E> {
 }
 
 impl<E: EthSpec> Attestation<E> {
+    /// Produces an attestation with empty signature.
     pub fn empty_for_signing(
         committee_index: u64,
         committee_length: usize,