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

Disable gossip for peers running old version (#2245)

Browse Source
This commit is contained in:
Arkadiy Paronyan
2019-04-15 12:18:08 +02:00
committed by Robert Habermeier
parent 2fad6d80da
commit e30b362193
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/network/src/protocol.rs
+20 -14
View File
@@ -50,9 +50,9 @@ const PROPAGATE_TIMEOUT: time::Duration = time::Duration::from_millis(2900);
const STATUS_INTERVAL: time::Duration = time::Duration::from_millis(5000); const STATUS_INTERVAL: time::Duration = time::Duration::from_millis(5000);
/// Current protocol version. /// Current protocol version.
pub(crate) const CURRENT_VERSION: u32 = 2; pub(crate) const CURRENT_VERSION: u32 = 3;
/// Lowest version we support /// Lowest version we support
const MIN_VERSION: u32 = 2; pub(crate) const MIN_VERSION: u32 = 2;
// Maximum allowed entries in `BlockResponse` // Maximum allowed entries in `BlockResponse`
const MAX_BLOCK_DATA_RESPONSE: u32 = 128; const MAX_BLOCK_DATA_RESPONSE: u32 = 128;
@@ -505,11 +505,13 @@ impl<B: BlockT, S: NetworkSpecialization<B>, H: ExHashT> Protocol<B, S, H> {
GenericMessage::RemoteChangesRequest(request) => self.on_remote_changes_request(who, request), GenericMessage::RemoteChangesRequest(request) => self.on_remote_changes_request(who, request),
GenericMessage::RemoteChangesResponse(response) => self.on_remote_changes_response(who, response), GenericMessage::RemoteChangesResponse(response) => self.on_remote_changes_response(who, response),
GenericMessage::Consensus(msg) => { GenericMessage::Consensus(msg) => {
self.consensus_gossip.on_incoming( if self.context_data.peers.get(&who).map_or(false, |peer| peer.info.protocol_version > 2) {
&mut ProtocolContext::new(&mut self.context_data, &self.network_chan), self.consensus_gossip.on_incoming(
who, &mut ProtocolContext::new(&mut self.context_data, &self.network_chan),
msg, who,
); msg,
);
}
} }
other => self.specialization.on_message( other => self.specialization.on_message(
&mut ProtocolContext::new(&mut self.context_data, &self.network_chan), &mut ProtocolContext::new(&mut self.context_data, &self.network_chan),
@@ -561,11 +563,13 @@ impl<B: BlockT, S: NetworkSpecialization<B>, H: ExHashT> Protocol<B, S, H> {
let removed = { let removed = {
self.handshaking_peers.remove(&peer); self.handshaking_peers.remove(&peer);
self.connected_peers.write().remove(&peer); self.connected_peers.write().remove(&peer);
self.context_data.peers.remove(&peer).is_some() self.context_data.peers.remove(&peer)
}; };
if removed { if let Some(peer_data) = removed {
let mut context = ProtocolContext::new(&mut self.context_data, &self.network_chan); let mut context = ProtocolContext::new(&mut self.context_data, &self.network_chan);
self.consensus_gossip.peer_disconnected(&mut context, peer.clone()); if peer_data.info.protocol_version > 2 {
self.consensus_gossip.peer_disconnected(&mut context, peer.clone());
}
self.sync.peer_disconnected(&mut context, peer.clone()); self.sync.peer_disconnected(&mut context, peer.clone());
self.specialization.on_disconnect(&mut context, peer.clone()); self.specialization.on_disconnect(&mut context, peer.clone());
self.on_demand.as_ref().map(|s| s.on_disconnect(peer)); self.on_demand.as_ref().map(|s| s.on_disconnect(peer));
@@ -721,7 +725,7 @@ impl<B: BlockT, S: NetworkSpecialization<B>, H: ExHashT> Protocol<B, S, H> {
/// Called by peer to report status /// Called by peer to report status
fn on_status_message(&mut self, who: PeerId, status: message::Status<B>) { fn on_status_message(&mut self, who: PeerId, status: message::Status<B>) {
trace!(target: "sync", "New peer {} {:?}", who, status); trace!(target: "sync", "New peer {} {:?}", who, status);
{ let protocol_version = {
if self.context_data.peers.contains_key(&who) { if self.context_data.peers.contains_key(&who) {
debug!("Unexpected status packet from {}", who); debug!("Unexpected status packet from {}", who);
return; return;
@@ -801,15 +805,17 @@ impl<B: BlockT, S: NetworkSpecialization<B>, H: ExHashT> Protocol<B, S, H> {
self.context_data.peers.insert(who.clone(), peer); self.context_data.peers.insert(who.clone(), peer);
debug!(target: "sync", "Connected {}", who); debug!(target: "sync", "Connected {}", who);
} status.version
};
let mut context = ProtocolContext::new(&mut self.context_data, &self.network_chan); let mut context = ProtocolContext::new(&mut self.context_data, &self.network_chan);
self.on_demand self.on_demand
.as_ref() .as_ref()
.map(|s| s.on_connect(who.clone(), status.roles, status.best_number)); .map(|s| s.on_connect(who.clone(), status.roles, status.best_number));
self.sync.new_peer(&mut context, who.clone()); self.sync.new_peer(&mut context, who.clone());
self.consensus_gossip if protocol_version > 2 {
.new_peer(&mut context, who.clone(), status.roles); self.consensus_gossip.new_peer(&mut context, who.clone(), status.roles);
}
self.specialization.on_connect(&mut context, who, status); self.specialization.on_connect(&mut context, who, status);
} }
substrate/core/network/src/service.rs
+6 -3
View File
@@ -178,8 +178,8 @@ impl<B: BlockT + 'static, S: NetworkSpecialization<B>> Service<B, S> {
params.transaction_pool, params.transaction_pool,
params.specialization, params.specialization,
)?; )?;
let versions = [(protocol::CURRENT_VERSION as u8)]; let versions: Vec<_> = ((protocol::MIN_VERSION as u8)..=(protocol::CURRENT_VERSION as u8)).collect();
let registered = RegisteredProtocol::new(protocol_id, &versions[..]); let registered = RegisteredProtocol::new(protocol_id, &versions);
let (thread, network, peerset) = start_thread( let (thread, network, peerset) = start_thread(
network_to_protocol_sender, network_to_protocol_sender,
network_port, network_port,
@@ -568,7 +568,10 @@ fn run_thread<B: BlockT + 'static>(
let network = stream::poll_fn(move || network_service.lock().poll()).for_each(move |event| { let network = stream::poll_fn(move || network_service.lock().poll()).for_each(move |event| {
match event { match event {
NetworkServiceEvent::OpenedCustomProtocol { peer_id, version, debug_info, .. } => { NetworkServiceEvent::OpenedCustomProtocol { peer_id, version, debug_info, .. } => {
debug_assert_eq!(version, protocol::CURRENT_VERSION as u8); debug_assert!(
version <= protocol::CURRENT_VERSION as u8
&& version >= protocol::MIN_VERSION as u8
);
let _ = protocol_sender.send(FromNetworkMsg::PeerConnected(peer_id, debug_info)); let _ = protocol_sender.send(FromNetworkMsg::PeerConnected(peer_id, debug_info));
} }
NetworkServiceEvent::ClosedCustomProtocol { peer_id, debug_info, .. } => { NetworkServiceEvent::ClosedCustomProtocol { peer_id, debug_info, .. } => {