Fix known addresses when sending group invites

Author: eerkaijun

monad-peer-discovery/src/discovery.rs

@@ -1471,17 +1471,15 @@ where
             .collect()
     }
 
-    fn get_secondary_fullnode_addrs(
-        &self,
-    ) -> HashMap<NodeId<CertificateSignaturePubKey<ST>>, SocketAddrV4> {
+    fn get_secondary_fullnodes(&self) -> Vec<NodeId<CertificateSignaturePubKey<ST>>> {
         self.routing_info
-            .iter()
-            .filter(|(id, _)| {
+            .keys()
+            .filter(|id| {
                 self.participation_info
                     .get(id)
                     .is_some_and(|p| p.status == SecondaryRaptorcastConnectionStatus::Connected)
             })
-            .map(|(id, name_record)| (*id, name_record.address()))
+            .copied()
             .collect()
     }
 
@@ -2247,7 +2245,7 @@ mod tests {
         state.self_role = PeerDiscoveryRole::ValidatorNone;
         let cmds = state.handle_full_node_raptorcast_request(peer1_pubkey);
         assert_eq!(cmds.len(), 0);
-        assert_eq!(state.get_secondary_fullnode_addrs(), HashMap::new());
+        assert_eq!(state.get_secondary_fullnodes(), Vec::new());
 
         // after receiving a full node raptorcast request from peer1,
         // it should mark it as connected
@@ -2263,10 +2261,7 @@ mod tests {
             target: _,
             message: PeerDiscoveryMessage::FullNodeRaptorcastResponse
         }));
-        assert_eq!(
-            state.get_secondary_fullnode_addrs(),
-            HashMap::from([(peer1_pubkey, generate_name_record(peer1, 0).address())])
-        );
+        assert_eq!(state.get_secondary_fullnodes(), Vec::from([peer1_pubkey]));
     }
 
     #[test]

monad-peer-discovery/src/driver.rs

@@ -291,14 +291,10 @@ impl<PD: PeerDiscoveryAlgo> PeerDiscoveryDriver<PD> {
             .collect()
     }
 
-    pub fn get_secondary_fullnode_addrs(
+    pub fn get_secondary_fullnodes(
         &self,
-    ) -> HashMap<NodeId<CertificateSignaturePubKey<PD::SignatureType>>, SocketAddr> {
-        self.pd
-            .get_secondary_fullnode_addrs()
-            .into_iter()
-            .map(|(k, v)| (k, SocketAddr::V4(v)))
-            .collect()
+    ) -> Vec<NodeId<CertificateSignaturePubKey<PD::SignatureType>>> {
+        self.pd.get_secondary_fullnodes()
     }
 
     pub fn get_name_records(

monad-peer-discovery/src/lib.rs

@@ -330,9 +330,9 @@ pub trait PeerDiscoveryAlgo {
         &self,
     ) -> HashMap<NodeId<CertificateSignaturePubKey<Self::SignatureType>>, SocketAddrV4>;
 
-    fn get_secondary_fullnode_addrs(
+    fn get_secondary_fullnodes(
         &self,
-    ) -> HashMap<NodeId<CertificateSignaturePubKey<Self::SignatureType>>, SocketAddrV4>;
+    ) -> Vec<NodeId<CertificateSignaturePubKey<Self::SignatureType>>>;
 
     fn get_name_records(
         &self,

monad-peer-discovery/src/mock.rs

@@ -265,10 +265,8 @@ where
         self.known_addresses.clone()
     }
 
-    fn get_secondary_fullnode_addrs(
-        &self,
-    ) -> HashMap<NodeId<CertificateSignaturePubKey<ST>>, SocketAddrV4> {
-        HashMap::new()
+    fn get_secondary_fullnodes(&self) -> Vec<NodeId<CertificateSignaturePubKey<ST>>> {
+        Vec::new()
     }
 
     fn get_name_records(

monad-raptorcast/src/raptorcast_secondary/mod.rs

@@ -365,13 +365,12 @@ where
                             .peer_discovery_driver
                             .lock()
                             .unwrap()
-                            .get_secondary_fullnode_addrs();
-                        let full_nodes_vec: Vec<_> = full_nodes.keys().copied().collect();
+                            .get_secondary_fullnodes();
                         trace!(
                             "RaptorCastSecondary updating {} full nodes from PeerDiscovery",
-                            full_nodes_vec.len()
+                            full_nodes.len()
                         );
-                        publisher.upsert_peer_disc_full_nodes(FullNodes::new(full_nodes_vec));
+                        publisher.upsert_peer_disc_full_nodes(FullNodes::new(full_nodes));
 
                         if let Some((group_msg, full_nodes_set)) =
                             publisher.enter_round_and_step_until(round)
@@ -390,7 +389,12 @@ where
                                 );
                             }
 
-                            self.send_group_msg(group_msg, full_nodes_set, &full_nodes);
+                            let known_addresses = self
+                                .peer_discovery_driver
+                                .lock()
+                                .unwrap()
+                                .get_known_addresses();
+                            self.send_group_msg(group_msg, full_nodes_set, &known_addresses);
                         }
                     }
                 },