pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-20 19:45:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

grandpa: Send neighbor packet to lightclients with every finalized head (#4135)

Browse Source 
This PR sends the GrandpaNeighbor packet to lightclients similarly to
the full-nodes.

Previously, the lightclient would receive a GrandpaNeigbor packet only
when the note set changed.

Related to: https://github.com/paritytech/polkadot-sdk/issues/4120

Next steps:
-  [ ] check with lightclient

---------

Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
This commit is contained in:
Alexandru Vasile
2024-04-17 11:29:08 +03:00
committed by GitHub
parent e81322bc3e
commit 8fd839df9d
1 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/consensus/grandpa/src/communication/gossip.rs
+8 -26
View File
@@ -810,7 +810,7 @@ impl<Block: BlockT> Inner<Block> {
self.live_topics.push(round, set_id); self.live_topics.push(round, set_id);
self.peers.reshuffle(); self.peers.reshuffle();
self.multicast_neighbor_packet(false) self.multicast_neighbor_packet()
} }
/// Note that a voter set with given ID has started. Does nothing if the last /// Note that a voter set with given ID has started. Does nothing if the last
@@ -847,10 +847,7 @@ impl<Block: BlockT> Inner<Block> {
self.live_topics.push(Round(1), set_id); self.live_topics.push(Round(1), set_id);
self.authorities = authorities; self.authorities = authorities;
// when transitioning to a new set we also want to send neighbor packets to light clients, self.multicast_neighbor_packet()
// this is so that they know who to ask justifications from in order to finalize the last
// block in the previous set.
self.multicast_neighbor_packet(true)
} }
/// Note that we've imported a commit finalizing a given block. Does nothing if the last /// Note that we've imported a commit finalizing a given block. Does nothing if the last
@@ -869,7 +866,7 @@ impl<Block: BlockT> Inner<Block> {
return None return None
} }
self.multicast_neighbor_packet(false) self.multicast_neighbor_packet()
} }
fn consider_vote(&self, round: Round, set_id: SetId) -> Consider { fn consider_vote(&self, round: Round, set_id: SetId) -> Consider {
@@ -1183,7 +1180,7 @@ impl<Block: BlockT> Inner<Block> {
(neighbor_topics, action, catch_up, report) (neighbor_topics, action, catch_up, report)
} }
fn multicast_neighbor_packet(&self, force_light: bool) -> MaybeMessage<Block> { fn multicast_neighbor_packet(&self) -> MaybeMessage<Block> {
self.local_view.as_ref().map(|local_view| { self.local_view.as_ref().map(|local_view| {
let packet = NeighborPacket { let packet = NeighborPacket {
round: local_view.round, round: local_view.round,
@@ -1191,22 +1188,7 @@ impl<Block: BlockT> Inner<Block> {
commit_finalized_height: *local_view.last_commit_height().unwrap_or(&Zero::zero()), commit_finalized_height: *local_view.last_commit_height().unwrap_or(&Zero::zero()),
}; };
let peers = self let peers = self.peers.inner.iter().map(|(id, _)| id).cloned().collect();
.peers
.inner
.iter()
.filter_map(|(id, info)| {
// light clients don't participate in the full GRANDPA voter protocol
// and therefore don't need to be informed about all view updates unless
// we explicitly require it (e.g. when transitioning to a new set)
if info.roles.is_light() && !force_light {
None
} else {
Some(id)
}
})
.cloned()
.collect();
(peers, packet) (peers, packet)
}) })
@@ -2602,7 +2584,7 @@ mod tests {
} }
#[test] #[test]
fn sends_neighbor_packets_to_non_light_peers_when_starting_a_new_round() { fn sends_neighbor_packets_to_all_peers_when_starting_a_new_round() {
let (val, _) = GossipValidator::<Block>::new(config(), voter_set_state(), None, None); let (val, _) = GossipValidator::<Block>::new(config(), voter_set_state(), None, None);
// initialize the validator to a stable set id // initialize the validator to a stable set id
@@ -2617,10 +2599,10 @@ mod tests {
val.inner.write().peers.new_peer(light_peer, ObservedRole::Light); val.inner.write().peers.new_peer(light_peer, ObservedRole::Light);
val.note_round(Round(2), |peers, message| { val.note_round(Round(2), |peers, message| {
assert_eq!(peers.len(), 2); assert_eq!(peers.len(), 3);
assert!(peers.contains(&authority_peer)); assert!(peers.contains(&authority_peer));
assert!(peers.contains(&full_peer)); assert!(peers.contains(&full_peer));
assert!(!peers.contains(&light_peer)); assert!(peers.contains(&light_peer));
assert!(matches!(message, NeighborPacket { set_id: SetId(1), round: Round(2), .. })); assert!(matches!(message, NeighborPacket { set_id: SetId(1), round: Round(2), .. }));
}); });
} }