Send the collator peer id from the client

Author: serban300

cumulus/client/consensus/aura/src/collator.rs

@@ -38,7 +38,7 @@ use cumulus_primitives_core::{
 use cumulus_relay_chain_interface::RelayChainInterface;
 
 use polkadot_node_primitives::{Collation, MaybeCompressedPoV};
-use polkadot_primitives::{Header as PHeader, Id as ParaId};
+use polkadot_primitives::{ApprovedPeerId, Header as PHeader, Id as ParaId};
 
 use crate::collators::RelayParentData;
 use futures::prelude::*;
@@ -69,6 +69,8 @@ pub struct Params<BI, CIDP, RClient, Proposer, CS> {
 	pub relay_client: RClient,
 	/// The keystore handle used for accessing parachain key material.
 	pub keystore: KeystorePtr,
+	/// The collator network peer id.
+	pub collator_peer_id: ApprovedPeerId,
 	/// The identifier of the parachain within the relay-chain.
 	pub para_id: ParaId,
 	/// The block proposer used for building blocks.
@@ -128,6 +130,7 @@ where
 		parent_hash: Block::Hash,
 		timestamp: impl Into<Option<Timestamp>>,
 		relay_parent_descendants: Option<RelayParentData>,
+		collator_peer_id: ApprovedPeerId,
 	) -> Result<(ParachainInherentData, InherentData), Box<dyn Error + Send + Sync + 'static>> {
 		let paras_inherent_data = ParachainInherentDataProvider::create_at(
 			relay_parent,
@@ -138,6 +141,7 @@ where
 				.map(RelayParentData::into_inherent_descendant_list)
 				.unwrap_or_default(),
 			Vec::new(),
+			collator_peer_id,
 		)
 		.await;
 
@@ -173,13 +177,15 @@ where
 		validation_data: &PersistedValidationData,
 		parent_hash: Block::Hash,
 		timestamp: impl Into<Option<Timestamp>>,
+		collator_peer_id: ApprovedPeerId,
 	) -> Result<(ParachainInherentData, InherentData), Box<dyn Error + Send + Sync + 'static>> {
 		self.create_inherent_data_with_rp_offset(
 			relay_parent,
 			validation_data,
 			parent_hash,
 			timestamp,
 			None,
+			collator_peer_id,
 		)
 		.await
 	}

cumulus/client/consensus/aura/src/collators/basic.rs

@@ -34,7 +34,7 @@ use cumulus_relay_chain_interface::RelayChainInterface;
 
 use polkadot_node_primitives::CollationResult;
 use polkadot_overseer::Handle as OverseerHandle;
-use polkadot_primitives::{CollatorPair, Id as ParaId, ValidationCode};
+use polkadot_primitives::{ApprovedPeerId, CollatorPair, Id as ParaId, ValidationCode};
 
 use futures::{channel::mpsc::Receiver, prelude::*};
 use sc_client_api::{backend::AuxStore, BlockBackend, BlockOf};
@@ -68,6 +68,8 @@ pub struct Params<BI, CIDP, Client, RClient, Proposer, CS> {
 	pub keystore: KeystorePtr,
 	/// The collator key used to sign collations before submitting to validators.
 	pub collator_key: CollatorPair,
+	/// The collator network peer id.
+	pub collator_peer_id: ApprovedPeerId,
 	/// The para's ID.
 	pub para_id: ParaId,
 	/// A handle to the relay-chain client's "Overseer" or task orchestrator.
@@ -130,6 +132,7 @@ where
 				block_import: params.block_import,
 				relay_client: params.relay_client.clone(),
 				keystore: params.keystore.clone(),
+				collator_peer_id: params.collator_peer_id.clone(),
 				para_id: params.para_id,
 				proposer: params.proposer,
 				collator_service: params.collator_service,
@@ -234,6 +237,7 @@ where
 						&validation_data,
 						parent_hash,
 						claim.timestamp(),
+						params.collator_peer_id.clone(),
 					)
 					.await
 			);

cumulus/client/consensus/aura/src/collators/lookahead.rs

@@ -43,7 +43,7 @@ use cumulus_relay_chain_interface::RelayChainInterface;
 use polkadot_node_primitives::SubmitCollationParams;
 use polkadot_node_subsystem::messages::CollationGenerationMessage;
 use polkadot_overseer::Handle as OverseerHandle;
-use polkadot_primitives::{CollatorPair, Id as ParaId, OccupiedCoreAssumption};
+use polkadot_primitives::{ApprovedPeerId, CollatorPair, Id as ParaId, OccupiedCoreAssumption};
 
 use crate::{collator as collator_util, collators::claim_queue_at, export_pov_to_path};
 use futures::prelude::*;
@@ -79,6 +79,8 @@ pub struct Params<BI, CIDP, Client, Backend, RClient, CHP, Proposer, CS> {
 	pub keystore: KeystorePtr,
 	/// The collator key used to sign collations before submitting to validators.
 	pub collator_key: CollatorPair,
+	/// The collator network peer id.
+	pub collator_peer_id: ApprovedPeerId,
 	/// The para's ID.
 	pub para_id: ParaId,
 	/// A handle to the relay-chain client's "Overseer" or task orchestrator.
@@ -207,6 +209,7 @@ where
 				block_import: params.block_import,
 				relay_client: params.relay_client.clone(),
 				keystore: params.keystore.clone(),
+				collator_peer_id: params.collator_peer_id.clone(),
 				para_id: params.para_id,
 				proposer: params.proposer,
 				collator_service: params.collator_service,
@@ -345,6 +348,7 @@ where
 						&validation_data,
 						parent_hash,
 						slot_claim.timestamp(),
+						params.collator_peer_id.clone(),
 					)
 					.await
 				{

cumulus/client/consensus/aura/src/collators/slot_based/block_builder_task.rs

@@ -41,7 +41,8 @@ use cumulus_primitives_core::{
 use cumulus_relay_chain_interface::RelayChainInterface;
 use futures::prelude::*;
 use polkadot_primitives::{
-	Block as RelayBlock, CoreIndex, Hash as RelayHash, Header as RelayHeader, Id as ParaId,
+	ApprovedPeerId, Block as RelayBlock, CoreIndex, Hash as RelayHash, Header as RelayHeader,
+	Id as ParaId,
 };
 use sc_client_api::{backend::AuxStore, BlockBackend, BlockOf, UsageProvider};
 use sc_consensus::BlockImport;
@@ -84,6 +85,8 @@ pub struct BuilderTaskParams<
 	pub code_hash_provider: CHP,
 	/// The underlying keystore, which should contain Aura consensus keys.
 	pub keystore: KeystorePtr,
+	/// The collator network peer id.
+	pub collator_peer_id: ApprovedPeerId,
 	/// The para's ID.
 	pub para_id: ParaId,
 	/// The underlying block proposer this should call into.
@@ -146,6 +149,7 @@ where
 			para_client,
 			keystore,
 			block_import,
+			collator_peer_id,
 			para_id,
 			proposer,
 			collator_service,
@@ -170,6 +174,7 @@ where
 				block_import,
 				relay_client: relay_client.clone(),
 				keystore: keystore.clone(),
+				collator_peer_id: collator_peer_id.clone(),
 				para_id,
 				proposer,
 				collator_service,
@@ -350,6 +355,7 @@ where
 					parent_hash,
 					slot_claim.timestamp(),
 					Some(rp_data),
+					collator_peer_id.clone(),
 				)
 				.await
 			{

cumulus/client/consensus/aura/src/collators/slot_based/mod.rs

@@ -78,7 +78,7 @@ use cumulus_primitives_core::RelayParentOffsetApi;
 use cumulus_relay_chain_interface::RelayChainInterface;
 use futures::FutureExt;
 use polkadot_primitives::{
-	CollatorPair, CoreIndex, Hash as RelayHash, Id as ParaId, ValidationCodeHash,
+	ApprovedPeerId, CollatorPair, CoreIndex, Hash as RelayHash, Id as ParaId, ValidationCodeHash,
 };
 use sc_client_api::{backend::AuxStore, BlockBackend, BlockOf, UsageProvider};
 use sc_consensus::BlockImport;
@@ -122,6 +122,8 @@ pub struct Params<Block, BI, CIDP, Client, Backend, RClient, CHP, Proposer, CS,
 	pub keystore: KeystorePtr,
 	/// The collator key used to sign collations before submitting to validators.
 	pub collator_key: CollatorPair,
+	/// The collator network peer id.
+	pub collator_peer_id: ApprovedPeerId,
 	/// The para's ID.
 	pub para_id: ParaId,
 	/// The underlying block proposer this should call into.
@@ -186,6 +188,7 @@ pub fn run<Block, P, BI, CIDP, Client, Backend, RClient, CHP, Proposer, CS, Spaw
 		code_hash_provider,
 		keystore,
 		collator_key,
+		collator_peer_id,
 		para_id,
 		proposer,
 		collator_service,
@@ -221,6 +224,7 @@ pub fn run<Block, P, BI, CIDP, Client, Backend, RClient, CHP, Proposer, CS, Spaw
 		relay_client,
 		code_hash_provider,
 		keystore,
+		collator_peer_id,
 		para_id,
 		proposer,
 		collator_service,

cumulus/client/parachain-inherent/src/lib.rs

@@ -25,7 +25,7 @@ use cumulus_relay_chain_interface::RelayChainInterface;
 
 mod mock;
 
-use cumulus_primitives_core::relay_chain::Header as RelayHeader;
+use cumulus_primitives_core::relay_chain::{ApprovedPeerId, Header as RelayHeader};
 pub use cumulus_primitives_parachain_inherent::{ParachainInherentData, INHERENT_IDENTIFIER};
 pub use mock::{MockValidationDataInherentDataProvider, MockXcmConfig};
 
@@ -168,6 +168,7 @@ impl ParachainInherentDataProvider {
 		para_id: ParaId,
 		relay_parent_descendants: Vec<RelayHeader>,
 		additional_relay_state_keys: Vec<Vec<u8>>,
+		collator_peer_id: ApprovedPeerId,
 	) -> Option<ParachainInherentData> {
 		// Only include next epoch authorities when the descendants include an epoch digest.
 		// Skip the first entry because this is the relay parent itself.
@@ -218,7 +219,7 @@ impl ParachainInherentDataProvider {
 			validation_data: validation_data.clone(),
 			relay_chain_state,
 			relay_parent_descendants,
-			collator_peer_id: None,
+			collator_peer_id: Some(collator_peer_id),
 		})
 	}
 }

cumulus/polkadot-omni-node/lib/src/common/spec.rs

@@ -45,7 +45,9 @@ use prometheus_endpoint::Registry;
 use sc_client_api::Backend;
 use sc_consensus::DefaultImportQueue;
 use sc_executor::{HeapAllocStrategy, DEFAULT_HEAP_ALLOC_STRATEGY};
-use sc_network::{config::FullNetworkConfiguration, NetworkBackend, NetworkBlock};
+use sc_network::{
+	config::FullNetworkConfiguration, NetworkBackend, NetworkBlock, NetworkStateInfo, PeerId,
+};
 use sc_service::{Configuration, ImportQueue, PartialComponents, TaskManager};
 use sc_statement_store::Store;
 use sc_sysinfo::HwBench;
@@ -89,6 +91,7 @@ where
 		relay_chain_slot_duration: Duration,
 		para_id: ParaId,
 		collator_key: CollatorPair,
+		collator_peer_id: PeerId,
 		overseer_handle: OverseerHandle,
 		announce_block: Arc<dyn Fn(Hash, Option<Vec<u8>>) + Send + Sync>,
 		backend: Arc<ParachainBackend<Block>>,
@@ -380,6 +383,7 @@ pub(crate) trait NodeSpec: BaseNodeSpec {
 					metrics,
 				})
 				.await?;
+			let peer_id = network.local_peer_id();
 
 			let statement_store = statement_handler_proto
 				.map(|statement_handler_proto| {
@@ -536,6 +540,7 @@ pub(crate) trait NodeSpec: BaseNodeSpec {
 					relay_chain_slot_duration,
 					para_id,
 					collator_key.expect("Command line arguments do not allow this. qed"),
+					peer_id,
 					overseer_handle,
 					announce_block,
 					backend.clone(),

cumulus/polkadot-omni-node/lib/src/nodes/aura.rs

@@ -54,7 +54,7 @@ use cumulus_primitives_core::{
 };
 use cumulus_relay_chain_interface::{OverseerHandle, RelayChainInterface};
 use futures::{prelude::*, FutureExt};
-use polkadot_primitives::{CollatorPair, UpgradeGoAhead};
+use polkadot_primitives::{unchecked_new_approved_peer_id, CollatorPair, UpgradeGoAhead};
 use prometheus_endpoint::Registry;
 use sc_client_api::{Backend, BlockchainEvents};
 use sc_client_db::DbHash;
@@ -63,7 +63,7 @@ use sc_consensus::{
 	BlockImportParams, DefaultImportQueue, LongestChain,
 };
 use sc_consensus_manual_seal::consensus::aura::AuraConsensusDataProvider;
-use sc_network::{config::FullNetworkConfiguration, NotificationMetrics};
+use sc_network::{config::FullNetworkConfiguration, NotificationMetrics, PeerId};
 use sc_service::{Configuration, Error, PartialComponents, TaskManager};
 use sc_telemetry::TelemetryHandle;
 use sc_transaction_pool::TransactionPoolHandle;
@@ -564,6 +564,7 @@ where
 		relay_chain_slot_duration: Duration,
 		para_id: ParaId,
 		collator_key: CollatorPair,
+		collator_peer_id: PeerId,
 		_overseer_handle: OverseerHandle,
 		announce_block: Arc<dyn Fn(Hash, Option<Vec<u8>>) + Send + Sync>,
 		backend: Arc<ParachainBackend<Block>>,
@@ -586,6 +587,7 @@ where
 		);
 
 		let client_for_aura = client.clone();
+		let collator_peer_id = unchecked_new_approved_peer_id(collator_peer_id.to_bytes());
 		let params = SlotBasedParams {
 			create_inherent_data_providers: move |_, ()| async move { Ok(()) },
 			block_import,
@@ -598,6 +600,7 @@ where
 			},
 			keystore,
 			collator_key,
+			collator_peer_id,
 			para_id,
 			proposer,
 			collator_service,
@@ -688,20 +691,21 @@ where
 		relay_chain_slot_duration: Duration,
 		para_id: ParaId,
 		collator_key: CollatorPair,
+		collator_peer_id: PeerId,
 		overseer_handle: OverseerHandle,
 		announce_block: Arc<dyn Fn(Hash, Option<Vec<u8>>) + Send + Sync>,
 		backend: Arc<ParachainBackend<Block>>,
 		node_extra_args: NodeExtraArgs,
 		_: (),
 	) -> Result<(), Error> {
+		let collator_peer_id = unchecked_new_approved_peer_id(collator_peer_id.to_bytes());
 		let proposer = sc_basic_authorship::ProposerFactory::with_proof_recording(
 			task_manager.spawn_handle(),
 			client.clone(),
 			transaction_pool,
 			prometheus_registry,
 			telemetry.clone(),
 		);
-
 		let collator_service = CollatorService::new(
 			client.clone(),
 			Arc::new(task_manager.spawn_handle()),
@@ -725,6 +729,7 @@ where
 				},
 				keystore,
 				collator_key,
+				collator_peer_id,
 				para_id,
 				overseer_handle,
 				relay_chain_slot_duration,

cumulus/test/service/src/lib.rs

@@ -65,7 +65,7 @@ use cumulus_test_runtime::{Hash, NodeBlock as Block, RuntimeApi};
 use frame_system_rpc_runtime_api::AccountNonceApi;
 use polkadot_node_subsystem::{errors::RecoveryError, messages::AvailabilityRecoveryMessage};
 use polkadot_overseer::Handle as OverseerHandle;
-use polkadot_primitives::{CandidateHash, CollatorPair};
+use polkadot_primitives::{unchecked_new_approved_peer_id, CandidateHash, CollatorPair};
 use polkadot_service::ProvideRuntimeApi;
 use sc_consensus::ImportQueue;
 use sc_network::{
@@ -431,6 +431,8 @@ where
 		prometheus_registry: None,
 	})?;
 
+	let collator_peer_id = network.local_peer_id();
+	let collator_peer_id = unchecked_new_approved_peer_id(collator_peer_id.to_bytes());
 	if let Some(collator_key) = collator_key {
 		let proposer = sc_basic_authorship::ProposerFactory::with_proof_recording(
 			task_manager.spawn_handle(),
@@ -473,6 +475,7 @@ where
 				spawner: task_manager.spawn_handle(),
 				export_pov: None,
 				max_pov_percentage: None,
+				collator_peer_id,
 			};
 
 			slot_based::run::<Block, AuthorityPair, _, _, _, _, _, _, _, _, _>(params);
@@ -489,6 +492,7 @@ where
 				},
 				keystore,
 				collator_key,
+				collator_peer_id,
 				para_id,
 				overseer_handle,
 				relay_chain_slot_duration,