Full nodes blocksync peers - prune old groups

Author: boicotinho

monad-blocksync/src/blocksync.rs

@@ -887,6 +887,7 @@ where
     },
     /// Events for secondary raptorcast updates
     SecondaryRaptorcastPeersUpdate {
+        expiry_round: Round,
         confirm_group_peers: Vec<NodeId<SCT::NodeIdPubKey>>,
     },
 }
@@ -930,9 +931,11 @@ where
                 .field("response", response)
                 .finish(),
             Self::SecondaryRaptorcastPeersUpdate {
+                expiry_round,
                 confirm_group_peers,
             } => f
                 .debug_struct("BlockSyncSecondaryRaptorcastEvent")
+                .field("expiry_round", expiry_round)
                 .field("confirm_group_peers", confirm_group_peers)
                 .finish(),
             Self::Timeout(request) => f.debug_struct("Timeout").field("request", request).finish(),
@@ -979,9 +982,10 @@ where
                 encode_list::<_, dyn Encodable>(&enc, out);
             }
             Self::SecondaryRaptorcastPeersUpdate {
+                expiry_round,
                 confirm_group_peers,
             } => {
-                let enc: [&dyn Encodable; 2] = [&7u8, &confirm_group_peers];
+                let enc: [&dyn Encodable; 3] = [&7u8, &expiry_round, &confirm_group_peers];
                 encode_list::<_, dyn Encodable>(&enc, out);
             }
         }
@@ -1031,8 +1035,10 @@ where
                 Ok(Self::SelfResponse { response })
             }
             7 => {
+                let expiry_round = Round::decode(&mut payload)?;
                 let confirm_group_peers = Vec::<NodeId<SCT::NodeIdPubKey>>::decode(&mut payload)?;
                 Ok(Self::SecondaryRaptorcastPeersUpdate {
+                    expiry_round,
                     confirm_group_peers,
                 })
             }

monad-executor-glue/src/lib.rs

@@ -257,7 +257,7 @@ where
             RaptorCastEvent::PeerManagerResponse(_peer_manager_response) => {
                 unimplemented!()
             }
-            RaptorCastEvent::SecondaryRaptorcastPeersUpdate(_event) => {
+            RaptorCastEvent::SecondaryRaptorcastPeersUpdate(..) => {
                 unimplemented!()
             }
         }

monad-raptorcast/examples/service.rs

@@ -116,7 +116,7 @@ pub enum PeerManagerResponse<ST: CertificateSignatureRecoverable> {
 pub enum RaptorCastEvent<E, ST: CertificateSignatureRecoverable> {
     Message(E),
     PeerManagerResponse(PeerManagerResponse<ST>),
-    SecondaryRaptorcastPeersUpdate(Vec<NodeId<CertificateSignaturePubKey<ST>>>),
+    SecondaryRaptorcastPeersUpdate(Round, Vec<NodeId<CertificateSignaturePubKey<ST>>>),
 }
 
 impl<ST, M, OM, SE, PD> RaptorCast<ST, M, OM, SE, PD>
@@ -982,8 +982,9 @@ where
                     ),
                 }
             }
-            RaptorCastEvent::SecondaryRaptorcastPeersUpdate(confirm_group_peers) => {
+            RaptorCastEvent::SecondaryRaptorcastPeersUpdate(expiry_round, confirm_group_peers) => {
                 MonadEvent::BlockSyncEvent(BlockSyncEvent::SecondaryRaptorcastPeersUpdate {
+                    expiry_round,
                     confirm_group_peers,
                 })
             }

monad-raptorcast/src/lib.rs

@@ -486,6 +486,7 @@ where
 
                         ret = Poll::Ready(Some(
                             RaptorCastEvent::SecondaryRaptorcastPeersUpdate(
+                                confirm_msg.prepare.end_round,
                                 participated_nodes.into_iter().collect(),
                             )
                             .into(),

monad-raptorcast/src/raptorcast_secondary/mod.rs

@@ -439,7 +439,7 @@ where
             RaptorCastEvent::PeerManagerResponse(_peer_manager_response) => {
                 unimplemented!()
             }
-            RaptorCastEvent::SecondaryRaptorcastPeersUpdate(_event) => {
+            RaptorCastEvent::SecondaryRaptorcastPeersUpdate { .. } => {
                 unimplemented!()
             }
         }

monad-raptorcast/tests/raptorcast_instance.rs

@@ -136,10 +136,14 @@ where
             }
             BlockSyncEvent::Timeout(request) => block_sync_wrapper.handle_timeout(request),
             BlockSyncEvent::SecondaryRaptorcastPeersUpdate {
+                expiry_round,
                 confirm_group_peers,
             } => {
-                self.block_sync
-                    .set_secondary_raptorcast_peers(confirm_group_peers);
+                self.block_sync.set_secondary_raptorcast_peers(
+                    confirm_group_peers,
+                    expiry_round,
+                    self.consensus.current_round(),
+                );
                 Vec::new()
             }
         };

monad-state/src/blocksync.rs

@@ -361,6 +361,15 @@ where
             ConsensusMode::Live(consensus) => consensus.get_current_epoch(),
         }
     }
+
+    fn current_round(&self) -> Round {
+        match self {
+            ConsensusMode::Sync {
+                high_certificate, ..
+            } => high_certificate.round() + Round(1),
+            ConsensusMode::Live(consensus) => consensus.get_current_round(),
+        }
+    }
 }
 
 #[derive(Debug, PartialEq, Eq)]