gossip: do not try to connect if we are not validators

node/network/gossip-support/Cargo.toml

@@ -5,6 +5,11 @@ authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 
 [dependencies]
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
+
 polkadot-node-network-protocol = { path = "../protocol" }
 polkadot-node-subsystem = { path = "../../subsystem" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }

node/network/gossip-support/src/lib.rs

@@ -18,7 +18,10 @@
 //! and issuing a connection request to the validators relevant to
 //! the gossiping subsystems on every new session.
 
-use futures::FutureExt as _;
+use futures::{channel::mpsc, FutureExt as _};
+use std::sync::Arc;
+use sp_api::ProvideRuntimeApi;
+use sp_authority_discovery::AuthorityDiscoveryApi;
 use polkadot_node_subsystem::{
 	messages::{
 		GossipSupportMessage,
@@ -27,30 +30,42 @@ use polkadot_node_subsystem::{
 	Subsystem, SpawnedSubsystem, SubsystemContext,
 };
 use polkadot_node_subsystem_util::{
-	validator_discovery::{ConnectionRequest, self},
+	validator_discovery,
 	self as util,
 };
 use polkadot_primitives::v1::{
-	Hash, ValidatorId, SessionIndex,
+	Hash, SessionIndex, AuthorityDiscoveryId, Block, BlockId,
 };
-use polkadot_node_network_protocol::peer_set::PeerSet;
+use polkadot_node_network_protocol::{peer_set::PeerSet, PeerId};
+use sp_keystore::{CryptoStore, SyncCryptoStorePtr};
+use sp_application_crypto::{Public, AppKey};
 
 const LOG_TARGET: &str = "parachain::gossip-support";
 
 /// The Gossip Support subsystem.
-pub struct GossipSupport {}
+pub struct GossipSupport<Client> {
+	client: Arc<Client>,
+	keystore: SyncCryptoStorePtr,
+}
 
 #[derive(Default)]
 struct State {
 	last_session_index: Option<SessionIndex>,
 	/// when we overwrite this, it automatically drops the previous request
-	_last_connection_request: Option<ConnectionRequest>,
+	_last_connection_request: Option<mpsc::Receiver<(AuthorityDiscoveryId, PeerId)>>,
 }
 
-impl GossipSupport {
+impl<Client> GossipSupport<Client>
+where
+	Client: ProvideRuntimeApi<Block>,
+	Client::Api: AuthorityDiscoveryApi<Block>,
+{
 	/// Create a new instance of the [`GossipSupport`] subsystem.
-	pub fn new() -> Self {
-		Self {}
+	pub fn new(keystore: SyncCryptoStorePtr, client: Arc<Client>) -> Self {
+		Self {
+			client,
+			keystore,
+		}
 	}
 
 	#[tracing::instrument(skip(self, ctx), fields(subsystem = LOG_TARGET))]
@@ -59,6 +74,7 @@ impl GossipSupport {
 		Context: SubsystemContext<Message = GossipSupportMessage>,
 	{
 		let mut state = State::default();
+		let Self { client, keystore } = self;
 		loop {
 			let message = match ctx.recv().await {
 				Ok(message) => message,
@@ -80,7 +96,7 @@ impl GossipSupport {
 					tracing::trace!(target: LOG_TARGET, "active leaves signal");
 
 					let leaves = activated.into_iter().map(|a| a.hash);
-					if let Err(e) = state.handle_active_leaves(&mut ctx, leaves).await {
+					if let Err(e) = state.handle_active_leaves(&mut ctx, client.clone(), &keystore, leaves).await {
 						tracing::debug!(target: LOG_TARGET, error = ?e);
 					}
 				}
@@ -93,24 +109,51 @@ impl GossipSupport {
 	}
 }
 
-async fn determine_relevant_validators(
-	ctx: &mut impl SubsystemContext,
+async fn determine_relevant_authorities<Client>(
+	client: Arc<Client>,
 	relay_parent: Hash,
-	_session: SessionIndex,
-) -> Result<Vec<ValidatorId>, util::Error> {
-	let validators = util::request_validators_ctx(relay_parent, ctx).await?.await??;
-	Ok(validators)
+) -> Result<Vec<AuthorityDiscoveryId>, util::Error>
+where
+	Client: ProvideRuntimeApi<Block>,
+	Client::Api: AuthorityDiscoveryApi<Block>,
+{
+	let api = client.runtime_api();
+	let result = api.authorities(&BlockId::Hash(relay_parent))
+		.map_err(|e| util::Error::RuntimeApi(format!("{:?}", e).into()));
+	result
 }
 
+/// Return an error if we're not a validator in the given set (do not have keys).
+async fn ensure_i_am_an_authority(
+	keystore: &SyncCryptoStorePtr,
+	authorities: &[AuthorityDiscoveryId],
+) -> Result<(), util::Error> {
+	for v in authorities {
+		if CryptoStore::has_keys(&**keystore, &[(v.to_raw_vec(), AuthorityDiscoveryId::ID)])
+			.await
+		{
+			return Ok(());
+		}
+	}
+	Err(util::Error::NotAValidator)
+}
+
+
 impl State {
 	/// 1. Determine if the current session index has changed.
 	/// 2. If it has, determine relevant validators
 	///    and issue a connection request.
-	async fn handle_active_leaves(
+	async fn handle_active_leaves<Client>(
 		&mut self,
 		ctx: &mut impl SubsystemContext,
+		client: Arc<Client>,
+		keystore: &SyncCryptoStorePtr,
 		leaves: impl Iterator<Item = Hash>,
-	) -> Result<(), util::Error> {
+	) -> Result<(), util::Error>
+	where
+		Client: ProvideRuntimeApi<Block>,
+		Client::Api: AuthorityDiscoveryApi<Block>,
+	{
 		for leaf in leaves {
 			let current_index = util::request_session_index_for_child_ctx(leaf, ctx).await?.await??;
 			let maybe_new_session = match self.last_session_index {
@@ -120,16 +163,15 @@ impl State {
 
 			if let Some((new_session, relay_parent)) = maybe_new_session {
 				tracing::debug!(target: LOG_TARGET, %new_session, "New session detected");
-				let validators = determine_relevant_validators(ctx, relay_parent, new_session).await?;
-				tracing::debug!(target: LOG_TARGET, num = ?validators.len(), "Issuing a connection request");
+				let authorities = determine_relevant_authorities(client.clone(), relay_parent).await?;
+				ensure_i_am_an_authority(keystore, &authorities).await?;
+				tracing::debug!(target: LOG_TARGET, num = ?authorities.len(), "Issuing a connection request");
 
-				let request = validator_discovery::connect_to_validators_in_session(
+				let request = validator_discovery::connect_to_authorities(
 					ctx,
-					relay_parent,
-					validators,
+					authorities,
 					PeerSet::Validation,
-					new_session,
-				).await?;
+				).await;
 
 				self.last_session_index = Some(new_session);
 				self._last_connection_request = Some(request);
@@ -140,11 +182,13 @@ impl State {
 	}
 }
 
-impl<C> Subsystem<C> for GossipSupport
+impl<Client, Context> Subsystem<Context> for GossipSupport<Client>
 where
-	C: SubsystemContext<Message = GossipSupportMessage> + Sync + Send,
+	Context: SubsystemContext<Message = GossipSupportMessage> + Sync + Send,
+	Client: ProvideRuntimeApi<Block> + Send + 'static + Sync,
+	Client::Api: AuthorityDiscoveryApi<Block>,
 {
-	fn start(self, ctx: C) -> SpawnedSubsystem {
+	fn start(self, ctx: Context) -> SpawnedSubsystem {
 		let future = self.run(ctx)
 			.map(|_| Ok(()))
 			.boxed();

node/network/protocol/src/peer_set.rs

@@ -57,9 +57,12 @@ impl PeerSet {
 				notifications_protocol: protocol,
 				max_notification_size,
 				set_config: sc_network::config::SetConfig {
-					// we want our gossip subset to always include reserved peers
-					in_peers: super::MIN_GOSSIP_PEERS as u32 / 2,
-					out_peers: 0,
+					// we allow full nodes to connect to validators for gossip
+					// to ensure any `MIN_GOSSIP_PEERS` always include reserved peers
+					// we limit the amount of non-reserved slots to be less
+					// than `MIN_GOSSIP_PEERS` in total
+					in_peers: super::MIN_GOSSIP_PEERS as u32 / 2 - 1,
+					out_peers: super::MIN_GOSSIP_PEERS as u32 / 2 - 1,
 					reserved_nodes: Vec::new(),
 					non_reserved_mode: sc_network::config::NonReservedPeerMode::Accept,
 				},

node/service/src/lib.rs

@@ -34,6 +34,7 @@ use {
 	polkadot_overseer::{AllSubsystems, BlockInfo, Overseer, OverseerHandler},
 	polkadot_primitives::v1::ParachainHost,
 	sc_authority_discovery::Service as AuthorityDiscoveryService,
+	sp_authority_discovery::AuthorityDiscoveryApi,
 	sp_blockchain::HeaderBackend,
 	sp_trie::PrefixedMemoryDB,
 	sc_client_api::{AuxStore, ExecutorProvider},
@@ -418,7 +419,7 @@ fn real_overseer<Spawner, RuntimeClient>(
 ) -> Result<(Overseer<Spawner>, OverseerHandler), Error>
 where
 	RuntimeClient: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block> + AuxStore,
-	RuntimeClient::Api: ParachainHost<Block> + BabeApi<Block>,
+	RuntimeClient::Api: ParachainHost<Block> + BabeApi<Block> + AuthorityDiscoveryApi<Block>,
 	Spawner: 'static + SpawnNamed + Clone + Unpin,
 {
 	Overseer::new(
@@ -446,7 +447,7 @@ fn real_overseer<Spawner, RuntimeClient>(
 ) -> Result<(Overseer<Spawner>, OverseerHandler), Error>
 where
 	RuntimeClient: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block> + AuxStore,
-	RuntimeClient::Api: ParachainHost<Block> + BabeApi<Block>,
+	RuntimeClient::Api: ParachainHost<Block> + BabeApi<Block> + AuthorityDiscoveryApi<Block>,
 	Spawner: 'static + SpawnNamed + Clone + Unpin,
 {
 	use polkadot_node_subsystem_util::metrics::Metrics;
@@ -550,7 +551,10 @@ where
 			keystore.clone(),
 			Metrics::register(registry)?,
 		)?,
-		gossip_support: GossipSupportSubsystem::new(),
+		gossip_support: GossipSupportSubsystem::new(
+			keystore.clone(),
+			runtime_client.clone(),
+		),
 	};
 
 	Overseer::new(

node/subsystem-util/src/validator_discovery.rs

@@ -115,7 +115,8 @@ pub async fn connect_to_validators_in_session<Context: SubsystemContext>(
 	})
 }
 
-async fn connect_to_authorities<Context: SubsystemContext>(
+/// A helper function for making a `ConnectToValidators` request.
+pub async fn connect_to_authorities<Context: SubsystemContext>(
 	ctx: &mut Context,
 	validator_ids: Vec<AuthorityDiscoveryId>,
 	peer_set: PeerSet,

roadmap/implementers-guide/src/SUMMARY.md

@@ -57,6 +57,7 @@
     - [Candidate Validation](node/utility/candidate-validation.md)
     - [Provisioner](node/utility/provisioner.md)
     - [Network Bridge](node/utility/network-bridge.md)
+    - [Gossip Support](node/utility/gossip-support.md)
     - [Misbehavior Arbitration](node/utility/misbehavior-arbitration.md)
     - [Peer Set Manager](node/utility/peer-set-manager.md)
     - [Runtime API Requests](node/utility/runtime-api.md)

roadmap/implementers-guide/src/node/utility/gossip-support.md

@@ -0,0 +1,11 @@
+# Gossip Support
+
+The Gossip Support Subsystem is responsible for keeping track of session changes
+and issuing a connection request to all validators in the next, current and a few past sessions
+if we are a validator in these sessions.
+The request will add all validators to a reserved PeerSet, meaning we will not reject a connection request
+from any validator in that set.
+
+Gossiping subsystems will be notified when a new peer connects or disconnects by network bridge.
+It is their responsibility to limit the amount of outgoing gossip messages.
+At the moment we enforce a cap of `max(sqrt(peers.len()), 25)` message recipients at a time in each gossiping subsystem.