mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-08 12:28:01 +00:00
47202727cf
* validator-discovery: remove from peer set before inserting * bump spec versions * rework into a companion * fmt * fix * fix * one more time * one more try * one more try * Revert "one more try" This reverts commit ab6568d3b828a33dc06f5650037597fc88dd06b1. * one more try * one more try * Revert "one more try" This reverts commit 8d7369f7b78633bd1b1c5ba3e0f2a0544bdd77a5. * fix a warning * fix another warn * correct log * fix compilation * ffs * less cloning * Apply suggestions from code review Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com> * add comments and a small refactoring * use set_reserved_peers * cargo update -p sp-io * rename added to num_peers * update Substrate Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com> Co-authored-by: parity-processbot <>
349 lines
9.5 KiB
Rust
349 lines
9.5 KiB
Rust
// Copyright 2020 Parity Technologies (UK) Ltd.
|
|
// This file is part of Polkadot.
|
|
|
|
// Polkadot is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Polkadot is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//! A validator discovery service for the Network Bridge.
|
|
|
|
use crate::Network;
|
|
|
|
use core::marker::PhantomData;
|
|
use std::collections::HashSet;
|
|
|
|
use futures::channel::oneshot;
|
|
|
|
use sc_network::multiaddr::{self, Multiaddr};
|
|
|
|
pub use polkadot_node_network_protocol::authority_discovery::AuthorityDiscovery;
|
|
use polkadot_node_network_protocol::{
|
|
peer_set::{PeerSet, PerPeerSet},
|
|
PeerId,
|
|
};
|
|
use polkadot_primitives::v1::AuthorityDiscoveryId;
|
|
|
|
const LOG_TARGET: &str = "parachain::validator-discovery";
|
|
|
|
pub(super) struct Service<N, AD> {
|
|
state: PerPeerSet<StatePerPeerSet>,
|
|
// PhantomData used to make the struct generic instead of having generic methods
|
|
_phantom: PhantomData<(N, AD)>,
|
|
}
|
|
|
|
#[derive(Default)]
|
|
struct StatePerPeerSet {
|
|
previously_requested: HashSet<PeerId>,
|
|
}
|
|
|
|
impl<N: Network, AD: AuthorityDiscovery> Service<N, AD> {
|
|
pub fn new() -> Self {
|
|
Self { state: Default::default(), _phantom: PhantomData }
|
|
}
|
|
|
|
/// Connect to already resolved addresses.
|
|
pub async fn on_resolved_request(
|
|
&mut self,
|
|
newly_requested: HashSet<Multiaddr>,
|
|
peer_set: PeerSet,
|
|
mut network_service: N,
|
|
) -> N {
|
|
let state = &mut self.state[peer_set];
|
|
let new_peer_ids: HashSet<PeerId> = extract_peer_ids(newly_requested.iter().cloned());
|
|
let num_peers = new_peer_ids.len();
|
|
|
|
let peers_to_remove: Vec<PeerId> =
|
|
state.previously_requested.difference(&new_peer_ids).cloned().collect();
|
|
let removed = peers_to_remove.len();
|
|
state.previously_requested = new_peer_ids;
|
|
|
|
tracing::debug!(
|
|
target: LOG_TARGET,
|
|
?peer_set,
|
|
?num_peers,
|
|
?removed,
|
|
"New ConnectToValidators resolved request",
|
|
);
|
|
// ask the network to connect to these nodes and not disconnect
|
|
// from them until removed from the set
|
|
if let Err(e) = network_service
|
|
.set_reserved_peers(peer_set.into_protocol_name(), newly_requested)
|
|
.await
|
|
{
|
|
tracing::warn!(target: LOG_TARGET, err = ?e, "AuthorityDiscoveryService returned an invalid multiaddress");
|
|
}
|
|
// the addresses are known to be valid
|
|
let _ = network_service
|
|
.remove_from_peers_set(peer_set.into_protocol_name(), peers_to_remove)
|
|
.await;
|
|
|
|
network_service
|
|
}
|
|
|
|
/// On a new connection request, a peer set update will be issued.
|
|
/// It will ask the network to connect to the validators and not disconnect
|
|
/// from them at least until the next request is issued for the same peer set.
|
|
///
|
|
/// This method will also disconnect from previously connected validators not in the `validator_ids` set.
|
|
/// it takes `network_service` and `authority_discovery_service` by value
|
|
/// and returns them as a workaround for the Future: Send requirement imposed by async function implementation.
|
|
pub async fn on_request(
|
|
&mut self,
|
|
validator_ids: Vec<AuthorityDiscoveryId>,
|
|
peer_set: PeerSet,
|
|
failed: oneshot::Sender<usize>,
|
|
network_service: N,
|
|
mut authority_discovery_service: AD,
|
|
) -> (N, AD) {
|
|
// collect multiaddress of validators
|
|
let mut failed_to_resolve: usize = 0;
|
|
let mut newly_requested = HashSet::new();
|
|
let requested = validator_ids.len();
|
|
for authority in validator_ids.into_iter() {
|
|
let result = authority_discovery_service
|
|
.get_addresses_by_authority_id(authority.clone())
|
|
.await;
|
|
if let Some(addresses) = result {
|
|
newly_requested.extend(addresses);
|
|
} else {
|
|
failed_to_resolve += 1;
|
|
tracing::debug!(
|
|
target: LOG_TARGET,
|
|
"Authority Discovery couldn't resolve {:?}",
|
|
authority
|
|
);
|
|
}
|
|
}
|
|
|
|
tracing::debug!(
|
|
target: LOG_TARGET,
|
|
?peer_set,
|
|
?requested,
|
|
?failed_to_resolve,
|
|
"New ConnectToValidators request",
|
|
);
|
|
|
|
let r = self.on_resolved_request(newly_requested, peer_set, network_service).await;
|
|
|
|
let _ = failed.send(failed_to_resolve);
|
|
|
|
(r, authority_discovery_service)
|
|
}
|
|
}
|
|
|
|
fn extract_peer_ids(multiaddr: impl Iterator<Item = Multiaddr>) -> HashSet<PeerId> {
|
|
multiaddr
|
|
.filter_map(|mut addr| match addr.pop() {
|
|
Some(multiaddr::Protocol::P2p(key)) => PeerId::from_multihash(key).ok(),
|
|
_ => None,
|
|
})
|
|
.collect()
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::network::Network;
|
|
|
|
use async_trait::async_trait;
|
|
use futures::stream::BoxStream;
|
|
use polkadot_node_network_protocol::{request_response::outgoing::Requests, PeerId};
|
|
use sc_network::{Event as NetworkEvent, IfDisconnected};
|
|
use sp_keyring::Sr25519Keyring;
|
|
use std::{borrow::Cow, collections::HashMap};
|
|
|
|
fn new_service() -> Service<TestNetwork, TestAuthorityDiscovery> {
|
|
Service::new()
|
|
}
|
|
|
|
fn new_network() -> (TestNetwork, TestAuthorityDiscovery) {
|
|
(TestNetwork::default(), TestAuthorityDiscovery::new())
|
|
}
|
|
|
|
#[derive(Default, Clone)]
|
|
struct TestNetwork {
|
|
peers_set: HashSet<PeerId>,
|
|
}
|
|
|
|
#[derive(Default, Clone, Debug)]
|
|
struct TestAuthorityDiscovery {
|
|
by_authority_id: HashMap<AuthorityDiscoveryId, Multiaddr>,
|
|
by_peer_id: HashMap<PeerId, AuthorityDiscoveryId>,
|
|
}
|
|
|
|
impl TestAuthorityDiscovery {
|
|
fn new() -> Self {
|
|
let peer_ids = known_peer_ids();
|
|
let authorities = known_authorities();
|
|
let multiaddr = known_multiaddr().into_iter().zip(peer_ids.iter().cloned()).map(
|
|
|(mut addr, peer_id)| {
|
|
addr.push(multiaddr::Protocol::P2p(peer_id.into()));
|
|
addr
|
|
},
|
|
);
|
|
Self {
|
|
by_authority_id: authorities.iter().cloned().zip(multiaddr).collect(),
|
|
by_peer_id: peer_ids.into_iter().zip(authorities.into_iter()).collect(),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl Network for TestNetwork {
|
|
fn event_stream(&mut self) -> BoxStream<'static, NetworkEvent> {
|
|
panic!()
|
|
}
|
|
|
|
async fn set_reserved_peers(
|
|
&mut self,
|
|
_protocol: Cow<'static, str>,
|
|
multiaddresses: HashSet<Multiaddr>,
|
|
) -> Result<(), String> {
|
|
self.peers_set = extract_peer_ids(multiaddresses.into_iter());
|
|
Ok(())
|
|
}
|
|
|
|
async fn remove_from_peers_set(
|
|
&mut self,
|
|
_protocol: Cow<'static, str>,
|
|
peers: Vec<PeerId>,
|
|
) {
|
|
self.peers_set.retain(|elem| !peers.contains(elem));
|
|
}
|
|
|
|
async fn start_request<AD: AuthorityDiscovery>(
|
|
&self,
|
|
_: &mut AD,
|
|
_: Requests,
|
|
_: IfDisconnected,
|
|
) {
|
|
}
|
|
|
|
fn report_peer(&self, _: PeerId, _: crate::Rep) {
|
|
panic!()
|
|
}
|
|
|
|
fn disconnect_peer(&self, _: PeerId, _: PeerSet) {
|
|
panic!()
|
|
}
|
|
|
|
fn write_notification(&self, _: PeerId, _: PeerSet, _: Vec<u8>) {
|
|
panic!()
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl AuthorityDiscovery for TestAuthorityDiscovery {
|
|
async fn get_addresses_by_authority_id(
|
|
&mut self,
|
|
authority: AuthorityDiscoveryId,
|
|
) -> Option<Vec<Multiaddr>> {
|
|
self.by_authority_id.get(&authority).cloned().map(|addr| vec![addr])
|
|
}
|
|
|
|
async fn get_authority_id_by_peer_id(
|
|
&mut self,
|
|
peer_id: PeerId,
|
|
) -> Option<AuthorityDiscoveryId> {
|
|
self.by_peer_id.get(&peer_id).cloned()
|
|
}
|
|
}
|
|
|
|
fn known_authorities() -> Vec<AuthorityDiscoveryId> {
|
|
[Sr25519Keyring::Alice, Sr25519Keyring::Bob, Sr25519Keyring::Charlie]
|
|
.iter()
|
|
.map(|k| k.public().into())
|
|
.collect()
|
|
}
|
|
|
|
fn known_peer_ids() -> Vec<PeerId> {
|
|
(0..3).map(|_| PeerId::random()).collect()
|
|
}
|
|
|
|
fn known_multiaddr() -> Vec<Multiaddr> {
|
|
vec![
|
|
"/ip4/127.0.0.1/tcp/1234".parse().unwrap(),
|
|
"/ip4/127.0.0.1/tcp/1235".parse().unwrap(),
|
|
"/ip4/127.0.0.1/tcp/1236".parse().unwrap(),
|
|
]
|
|
}
|
|
// Test cleanup works.
|
|
#[test]
|
|
fn old_multiaddrs_are_removed_on_new_request() {
|
|
let mut service = new_service();
|
|
|
|
let (ns, ads) = new_network();
|
|
|
|
let authority_ids: Vec<_> = ads.by_peer_id.values().cloned().collect();
|
|
|
|
futures::executor::block_on(async move {
|
|
let (failed, _) = oneshot::channel();
|
|
let (ns, ads) = service
|
|
.on_request(vec![authority_ids[0].clone()], PeerSet::Validation, failed, ns, ads)
|
|
.await;
|
|
|
|
let (failed, _) = oneshot::channel();
|
|
let (_, ads) = service
|
|
.on_request(vec![authority_ids[1].clone()], PeerSet::Validation, failed, ns, ads)
|
|
.await;
|
|
|
|
let state = &service.state[PeerSet::Validation];
|
|
assert_eq!(state.previously_requested.len(), 1);
|
|
let peer_1 = extract_peer_ids(
|
|
vec![ads.by_authority_id.get(&authority_ids[1]).unwrap().clone()].into_iter(),
|
|
)
|
|
.iter()
|
|
.cloned()
|
|
.next()
|
|
.unwrap();
|
|
assert!(state.previously_requested.contains(&peer_1));
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn failed_resolution_is_reported_properly() {
|
|
let mut service = new_service();
|
|
|
|
let (ns, ads) = new_network();
|
|
|
|
let authority_ids: Vec<_> = ads.by_peer_id.values().cloned().collect();
|
|
|
|
futures::executor::block_on(async move {
|
|
let (failed, failed_rx) = oneshot::channel();
|
|
let unknown = Sr25519Keyring::Ferdie.public().into();
|
|
let (_, ads) = service
|
|
.on_request(
|
|
vec![authority_ids[0].clone(), unknown],
|
|
PeerSet::Validation,
|
|
failed,
|
|
ns,
|
|
ads,
|
|
)
|
|
.await;
|
|
|
|
let state = &service.state[PeerSet::Validation];
|
|
assert_eq!(state.previously_requested.len(), 1);
|
|
let peer_0 = extract_peer_ids(
|
|
vec![ads.by_authority_id.get(&authority_ids[0]).unwrap().clone()].into_iter(),
|
|
)
|
|
.iter()
|
|
.cloned()
|
|
.next()
|
|
.unwrap();
|
|
assert!(state.previously_requested.contains(&peer_0));
|
|
|
|
let failed = failed_rx.await.unwrap();
|
|
assert_eq!(failed, 1);
|
|
});
|
|
}
|
|
}
|