x

core/src/cluster_info.rs

@@ -413,7 +413,6 @@ impl ClusterInfo {
             .values()
             .filter_map(|x| x.value.contact_info())
             .filter(|x| x.id != me.id)
-            .filter(|x| x.shred_version == me.shred_version)
             .filter(|x| ContactInfo::is_valid_address(&x.rpc))
             .cloned()
             .collect()
@@ -441,8 +440,6 @@ impl ClusterInfo {
             .values()
             .filter_map(|x| x.value.contact_info())
             .filter(|x| x.id != me)
-            /* shred_version not considered for gossip peers (ie, spy nodes do not set
-            shred_version) */
             .filter(|x| ContactInfo::is_valid_address(&x.gossip))
             .cloned()
             .collect()
@@ -459,7 +456,6 @@ impl ClusterInfo {
             .filter(|x| ContactInfo::is_valid_address(&x.tvu))
             .filter(|x| !ClusterInfo::is_archiver(x))
             .filter(|x| x.id != me.id)
-            .filter(|x| x.shred_version == me.shred_version)
             .cloned()
             .collect()
     }
@@ -474,7 +470,6 @@ impl ClusterInfo {
             .filter_map(|x| x.value.contact_info())
             .filter(|x| ContactInfo::is_valid_address(&x.storage_addr))
             .filter(|x| x.id != me.id)
-            .filter(|x| x.shred_version == me.shred_version)
             .cloned()
             .collect()
     }
@@ -488,7 +483,6 @@ impl ClusterInfo {
             .values()
             .filter_map(|x| x.value.contact_info())
             .filter(|x| x.id != me.id)
-            .filter(|x| x.shred_version == me.shred_version)
             .filter(|x| ContactInfo::is_valid_address(&x.tvu))
             .filter(|x| ContactInfo::is_valid_address(&x.tvu_forwards))
             .cloned()
@@ -501,7 +495,6 @@ impl ClusterInfo {
         ClusterInfo::tvu_peers(self)
             .into_iter()
             .filter(|x| x.id != me.id)
-            .filter(|x| x.shred_version == me.shred_version)
             .filter(|x| ContactInfo::is_valid_address(&x.gossip))
             .filter(|x| {
                 self.get_epoch_state_for_node(&x.id, None)
@@ -2583,7 +2576,7 @@ mod tests {
 
     #[test]
     fn test_split_messages_packet_size() {
-        // Test that if a value is smaller than payload size but too large to be wrappe in a vec
+        // Test that if a value is smaller than payload size but too large to be wrapped in a vec
         // that it is still dropped
         let payload: Vec<CrdsValue> = vec![];
         let vec_size = serialized_size(&payload).unwrap();
@@ -2672,13 +2665,6 @@ mod tests {
         cluster_info.insert_info(contact_info);
         stakes.insert(id3, 10);
 
-        // normal but with incorrect shred version
-        let id3 = Pubkey::new(&[4u8; 32]);
-        let mut contact_info = ContactInfo::new_localhost(&id3, timestamp());
-        contact_info.shred_version = 1;
-        cluster_info.insert_info(contact_info.clone());
-        stakes.insert(id3, 10);
-
         let stakes = Arc::new(stakes);
         let (peers, peers_and_stakes) = cluster_info.sorted_tvu_peers_and_stakes(Some(stakes));
         assert_eq!(peers.len(), 2);

core/src/validator.rs

@@ -614,13 +614,15 @@ fn get_stake_percent_in_gossip(
     let mut gossip_stake = 0;
     let mut total_activated_stake = 0;
     let tvu_peers = cluster_info.read().unwrap().tvu_peers();
+    let me = cluster_info.read().unwrap().my_data();
 
     for (activated_stake, vote_account) in bank.vote_accounts().values() {
         let vote_state =
             solana_vote_program::vote_state::VoteState::from(&vote_account).unwrap_or_default();
         total_activated_stake += activated_stake;
         if tvu_peers
             .iter()
+            .filter(|peer| peer.shred_version == me.shred_version)
             .any(|peer| peer.id == vote_state.node_pubkey)
         {
             trace!(