skips retransmit for shreds with unknown slot leader (#19472)
Shreds' signatures should be verified before they reach retransmit stage, and if the leader is unknown they should fail signature check. Therefore retransmit-stage can as well expect to know who the slot leader is and otherwise just skip the shred. Blockstore checking signature of recovered shreds before sending them to retransmit stage: https://github.com/solana-labs/solana/blob/4305d4b7b/ledger/src/blockstore.rs#L884-L930 Shred signature verifier: https://github.com/solana-labs/solana/blob/4305d4b7b/core/src/sigverify_shreds.rs#L41-L57 https://github.com/solana-labs/solana/blob/4305d4b7b/ledger/src/sigverify_shreds.rs#L105
This commit is contained in:
@ -413,7 +413,7 @@ pub fn broadcast_shreds(
|
||||
let mut result = Ok(());
|
||||
let mut shred_select = Measure::start("shred_select");
|
||||
// Only the leader broadcasts shreds.
|
||||
let leader = Some(cluster_info.id());
|
||||
let leader = cluster_info.id();
|
||||
let (root_bank, working_bank) = {
|
||||
let bank_forks = bank_forks.read().unwrap();
|
||||
(bank_forks.root_bank(), bank_forks.working_bank())
|
||||
|
@ -282,7 +282,7 @@ impl BroadcastRun for BroadcastDuplicatesRun {
|
||||
let packets: Vec<_> = shreds
|
||||
.iter()
|
||||
.filter_map(|shred| {
|
||||
let seed = shred.seed(Some(self_pubkey), &root_bank);
|
||||
let seed = shred.seed(self_pubkey, &root_bank);
|
||||
let node = cluster_nodes.get_broadcast_peer(seed)?;
|
||||
if !socket_addr_space.check(&node.tvu) {
|
||||
return None;
|
||||
|
@ -122,25 +122,21 @@ impl ClusterNodes<RetransmitStage> {
|
||||
&self,
|
||||
shred_seed: [u8; 32],
|
||||
fanout: usize,
|
||||
slot_leader: Option<Pubkey>,
|
||||
slot_leader: Pubkey,
|
||||
) -> (
|
||||
Vec<&ContactInfo>, // neighbors
|
||||
Vec<&ContactInfo>, // children
|
||||
) {
|
||||
// Exclude leader from list of nodes.
|
||||
let index = self.index.iter().copied();
|
||||
let (weights, index): (Vec<u64>, Vec<usize>) = match slot_leader {
|
||||
None => {
|
||||
error!("unknown leader for shred slot");
|
||||
index.unzip()
|
||||
}
|
||||
Some(slot_leader) if slot_leader == self.pubkey => {
|
||||
error!("retransmit from slot leader: {}", slot_leader);
|
||||
index.unzip()
|
||||
}
|
||||
Some(slot_leader) => index
|
||||
let (weights, index): (Vec<u64>, Vec<usize>) = if slot_leader == self.pubkey {
|
||||
error!("retransmit from slot leader: {}", slot_leader);
|
||||
self.index.iter().copied().unzip()
|
||||
} else {
|
||||
self.index
|
||||
.iter()
|
||||
.filter(|(_, i)| self.nodes[*i].pubkey() != slot_leader)
|
||||
.unzip(),
|
||||
.copied()
|
||||
.unzip()
|
||||
};
|
||||
let index: Vec<_> = {
|
||||
let shuffle = weighted_shuffle(weights.into_iter(), shred_seed);
|
||||
@ -462,7 +458,7 @@ mod tests {
|
||||
let (neighbors_indices, children_indices) =
|
||||
compute_retransmit_peers(fanout, self_index, &shuffled_index);
|
||||
let (neighbors, children) =
|
||||
cluster_nodes.get_retransmit_peers(shred_seed, fanout, Some(slot_leader));
|
||||
cluster_nodes.get_retransmit_peers(shred_seed, fanout, slot_leader);
|
||||
assert_eq!(children.len(), children_indices.len());
|
||||
for (node, index) in children.into_iter().zip(children_indices) {
|
||||
assert_eq!(*node, peers[index]);
|
||||
|
@ -287,7 +287,14 @@ fn retransmit(
|
||||
|
||||
let mut compute_turbine_peers = Measure::start("turbine_start");
|
||||
// TODO: consider using root-bank here for leader lookup!
|
||||
let slot_leader = leader_schedule_cache.slot_leader_at(shred_slot, Some(&working_bank));
|
||||
// Shreds' signatures should be verified before they reach here, and if
|
||||
// the leader is unknown they should fail signature check. So here we
|
||||
// should expect to know the slot leader and otherwise skip the shred.
|
||||
let slot_leader =
|
||||
match leader_schedule_cache.slot_leader_at(shred_slot, Some(&working_bank)) {
|
||||
Some(pubkey) => pubkey,
|
||||
None => continue,
|
||||
};
|
||||
let cluster_nodes =
|
||||
cluster_nodes_cache.get(shred_slot, &root_bank, &working_bank, cluster_info);
|
||||
let shred_seed = shred.seed(slot_leader, &root_bank);
|
||||
|
Reference in New Issue
Block a user