Remove circular transmission check in sigverify

Author: AshwinSekar

core/src/sigverify_shreds.rs

@@ -1,6 +1,5 @@
 use {
     crossbeam_channel::{Receiver, RecvTimeoutError, SendError, Sender},
-    solana_gossip::cluster_info::ClusterInfo,
     solana_ledger::{
         leader_schedule_cache::LeaderScheduleCache, shred, sigverify_shreds::verify_shreds_gpu,
     },
@@ -26,7 +25,6 @@ enum Error {
 }
 
 pub(crate) fn spawn_shred_sigverify(
-    cluster_info: Arc<ClusterInfo>,
     bank_forks: Arc<RwLock<BankForks>>,
     leader_schedule_cache: Arc<LeaderScheduleCache>,
     shred_fetch_receiver: Receiver<PacketBatch>,
@@ -42,7 +40,6 @@ pub(crate) fn spawn_shred_sigverify(
             match run_shred_sigverify(
                 // We can't store the pubkey outside the loop
                 // because the identity might be hot swapped.
-                &cluster_info.id(),
                 &bank_forks,
                 &leader_schedule_cache,
                 &recycler_cache,
@@ -63,7 +60,6 @@ pub(crate) fn spawn_shred_sigverify(
 }
 
 fn run_shred_sigverify(
-    self_pubkey: &Pubkey,
     bank_forks: &RwLock<BankForks>,
     leader_schedule_cache: &LeaderScheduleCache,
     recycler_cache: &RecyclerCache,
@@ -83,7 +79,6 @@ fn run_shred_sigverify(
     stats.num_packets += packets.iter().map(PacketBatch::len).sum::<usize>();
     stats.num_discards_pre += count_discards(&packets);
     verify_packets(
-        self_pubkey,
         bank_forks,
         leader_schedule_cache,
         recycler_cache,
@@ -108,15 +103,14 @@ fn run_shred_sigverify(
 }
 
 fn verify_packets(
-    self_pubkey: &Pubkey,
     bank_forks: &RwLock<BankForks>,
     leader_schedule_cache: &LeaderScheduleCache,
     recycler_cache: &RecyclerCache,
     packets: &mut [PacketBatch],
 ) {
     let working_bank = bank_forks.read().unwrap().working_bank();
     let leader_slots: HashMap<Slot, [u8; 32]> =
-        get_slot_leaders(self_pubkey, packets, leader_schedule_cache, &working_bank)
+        get_slot_leaders(packets, leader_schedule_cache, &working_bank)
             .into_iter()
             .filter_map(|(slot, pubkey)| Some((slot, pubkey?.to_bytes())))
             .chain(std::iter::once((Slot::MAX, [0u8; 32])))
@@ -129,9 +123,7 @@ fn verify_packets(
 // Marks packets as discard if:
 //   - fails to deserialize the shred slot.
 //   - slot leader is unknown.
-//   - slot leader is the node itself (circular transmission).
 fn get_slot_leaders(
-    self_pubkey: &Pubkey,
     batches: &mut [PacketBatch],
     leader_schedule_cache: &LeaderScheduleCache,
     bank: &Bank,
@@ -152,8 +144,7 @@ fn get_slot_leaders(
             };
             let leader = leaders.entry(slot).or_insert_with(|| {
                 let leader = leader_schedule_cache.slot_leader_at(slot, Some(bank))?;
-                // Discard the shred if the slot leader is the node itself.
-                (&leader != self_pubkey).then_some(leader)
+                Some(leader)
             });
             if leader.is_none() {
                 packet.meta_mut().set_discard(true);
@@ -285,7 +276,6 @@ mod tests {
         batches[0][1].meta_mut().size = shred.payload().len();
 
         verify_packets(
-            &Pubkey::new_unique(), // self_pubkey
             &bank_forks,
             &leader_schedule_cache,
             &RecyclerCache::warmed(),

core/src/tvu.rs

@@ -167,7 +167,6 @@ impl Tvu {
         let (verified_sender, verified_receiver) = unbounded();
         let (retransmit_sender, retransmit_receiver) = unbounded();
         let shred_sigverify = sigverify_shreds::spawn_shred_sigverify(
-            cluster_info.clone(),
             bank_forks.clone(),
             leader_schedule_cache.clone(),
             fetch_receiver,