feat: Implement Committee aggregation fork choice logic

Author: Kayden-ML

bin/ream/src/main.rs

@@ -289,6 +289,8 @@ pub async fn run_lean_node(config: LeanNodeConfig, executor: ReamExecutor, ream_
             anchor_state,
             lean_db,
             None,
+            #[cfg(feature = "devnet3")]
+            None,
         )
         .expect("Could not get forkchoice store"),
     );

crates/common/chain/lean/src/service.rs

@@ -131,7 +131,10 @@ impl LeanChainService {
                         self.sync_status = self.update_sync_status().await?;
                     }
                     if self.sync_status == SyncStatus::Synced {
+                        #[cfg(feature = "devnet2")]
                         self.store.write().await.tick_interval(tick_count % 4 == 1).await.expect("Failed to tick interval");
+                        #[cfg(feature = "devnet3")]
+                        self.store.write().await.tick_interval(tick_count % 4 == 1, false).await.expect("Failed to tick interval");
                         self.step_head_sync(tick_count).await?;
                     }
 
@@ -622,7 +625,10 @@ impl LeanChainService {
                 .duration_since(UNIX_EPOCH)
                 .map_err(|err| anyhow!("System time before epoch: {err:?}"))?
                 .as_secs();
+            #[cfg(feature = "devnet2")]
             self.store.write().await.on_tick(now, false).await?;
+            #[cfg(feature = "devnet3")]
+            self.store.write().await.on_tick(now, false, false).await?;
         }
 
         Ok(sync_status)
@@ -931,12 +937,20 @@ impl LeanChainService {
         &mut self,
         signed_attestation: SignedAttestation,
     ) -> anyhow::Result<()> {
+        #[cfg(feature = "devnet2")]
         self.store
             .write()
             .await
             .on_gossip_attestation(signed_attestation)
             .await?;
 
+        #[cfg(feature = "devnet3")]
+        self.store
+            .write()
+            .await
+            .on_gossip_attestation(signed_attestation, false)
+            .await?;
+
         Ok(())
     }
 

crates/common/chain/lean/src/sync/forward_background_syncer.rs

@@ -80,7 +80,10 @@ impl ForwardBackgroundSyncer {
             })?;
             let time = lean_network_spec().genesis_time
                 + (block.message.block.slot * lean_network_spec().seconds_per_slot);
+            #[cfg(feature = "devnet2")]
             self.store.write().await.on_tick(time, false).await?;
+            #[cfg(feature = "devnet3")]
+            self.store.write().await.on_tick(time, false, false).await?;
             self.store.write().await.on_block(&block, true).await?;
         }
 

crates/common/consensus/lean/src/attestation.rs

@@ -1,4 +1,4 @@
-use alloy_primitives::{B256, FixedBytes};
+use alloy_primitives::B256;
 use ream_post_quantum_crypto::leansig::signature::Signature;
 use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
@@ -37,7 +37,7 @@ impl SignatureKey {
     }
 }
 
-#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize, Encode, Decode)]
+#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize, Encode, Decode, TreeHash)]
 pub struct AggregatedSignatureProof {
     pub participants: BitList<U4096>,
     pub proof_data: VariableList<u8, U1048576>,
@@ -119,7 +119,6 @@ pub struct AggregatedAttestation {
 /// Aggregated attestation bundled with aggregated signatures.
 #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize, Encode, Decode, TreeHash)]
 pub struct SignedAggregatedAttestation {
-    pub message: AggregatedAttestation,
-    /// U4096 = VALIDATOR_REGISTRY_LIMIT
-    pub signature: VariableList<FixedBytes<4000>, U4096>,
+    pub data: AttestationData,
+    pub proof: AggregatedSignatureProof,
 }

crates/common/consensus/misc/src/constants/lean.rs

@@ -1,5 +1,6 @@
 /// 3SF-mini divides a slot into 4 intervals.
 /// Reference: https://github.com/ethereum/research/blob/d225a6775a9b184b5c1fd6c830cc58a375d9535f/3sf-mini/p2p.py#L77-L98
+pub const ATTESTATION_COMMITTEE_COUNT: u64 = 1;
 pub const INTERVALS_PER_SLOT: u64 = 4;
 pub const MAX_HISTORICAL_BLOCK_HASHES: u64 = 262144;
 pub const SLOT_DURATION: u64 = 12;