Asynchronous backing PR

client/collator/Cargo.toml

@@ -18,10 +18,10 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 # Polkadot
-polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
+polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
+polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
 
 # Cumulus
 cumulus-client-consensus-common = { path = "../consensus/common" }
@@ -37,7 +37,7 @@ sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "
 sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 # Polkadot
-polkadot-node-subsystem-test-helpers = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-node-subsystem-test-helpers = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
 
 # Cumulus
 cumulus-test-client = { path = "../../test/client" }

client/consensus/common/Cargo.toml

@@ -22,7 +22,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
 sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 # Polkadot
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
 
 # Cumulus
 cumulus-primitives-core = { path = "../../../primitives/core" }

client/network/Cargo.toml

@@ -22,9 +22,9 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
 sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 # Polkadot
-polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
 
 # Cumulus
 cumulus-relay-chain-interface = { path = "../relay-chain-interface" }
@@ -44,8 +44,8 @@ sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "maste
 substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 # Polkadot
-polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
+polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
 
 # Cumulus
 cumulus-primitives-core = { path = "../../primitives/core" }

client/pov-recovery/Cargo.toml

@@ -20,10 +20,10 @@ sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", br
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 # Polkadot
-polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
+polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
+polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
 
 # Cumulus
 cumulus-primitives-core = { path = "../../primitives/core" }

client/relay-chain-inprocess-interface/Cargo.toml

@@ -22,9 +22,9 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
 sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 # Polkadot
-polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false, features = ["cli"] }
-polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-cli = { git = "https://github.com/paritytech/polkadot", default-features = false, features = ["cli"] , branch = "rh-async-backing-feature" }
+polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
+polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
 
 # Cumulus
 cumulus-primitives-core = { path = "../../primitives/core" }
@@ -36,8 +36,8 @@ cumulus-relay-chain-interface = { path = "../relay-chain-interface" }
 sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 # Polkadot
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
+polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
 metered = { package = "prioritized-metered-channel", version = "0.2.0" }
 
 # Cumulus

client/relay-chain-interface/Cargo.toml

@@ -5,7 +5,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
 
 cumulus-primitives-core = { path = "../../primitives/core" }
 

client/relay-chain-minimal-node/Cargo.toml

@@ -6,13 +6,13 @@ edition = "2021"
 
 [dependencies]
 # polkadot deps
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-node-subsystem-util = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-node-network-protocol = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-network-bridge = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
+polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
+polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
+polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
+polkadot-node-subsystem-util = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
+polkadot-node-network-protocol = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
+polkadot-network-bridge = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
 
 # substrate deps
 sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }

client/relay-chain-minimal-node/src/blockchain_rpc_client.rs

@@ -24,6 +24,8 @@ use polkadot_overseer::RuntimeApiSubsystemClient;
 use polkadot_service::{AuxStore, HeaderBackend};
 use sc_authority_discovery::AuthorityDiscovery;
 
+use polkadot_primitives::vstaging::{AsyncBackingParameters, BackingState};
+
 use sp_api::{ApiError, RuntimeApiInfo};
 use sp_blockchain::Info;
 
@@ -324,6 +326,21 @@ impl RuntimeApiSubsystemClient for BlockChainRpcClient {
 	> {
 		Ok(self.rpc_client.parachain_host_staging_get_disputes(at).await?)
 	}
+
+	async fn staging_async_backing_parameters(
+		&self,
+		at: Hash,
+	) -> Result<AsyncBackingParameters, ApiError> {
+		Ok(self.rpc_client.parachain_host_staging_async_backing_parameters(at).await?)
+	}
+
+	async fn staging_para_backing_state(
+		&self,
+		at: Hash,
+		para_id: cumulus_primitives_core::ParaId,
+	) -> Result<Option<BackingState>, ApiError> {
+		Ok(self.rpc_client.parachain_host_staging_para_backing_state(at, para_id).await?)
+	}
 }
 
 #[async_trait::async_trait]

client/relay-chain-minimal-node/src/collator_overseer.rs

@@ -19,8 +19,8 @@ use lru::LruCache;
 use polkadot_node_network_protocol::{
 	peer_set::PeerSetProtocolNames,
 	request_response::{
-		v1::{AvailableDataFetchingRequest, CollationFetchingRequest},
-		IncomingRequestReceiver, ReqProtocolNames,
+		v1::{self, AvailableDataFetchingRequest},
+		vstaging, IncomingRequestReceiver, ReqProtocolNames,
 	},
 };
 use polkadot_node_subsystem_util::metrics::{prometheus::Registry, Metrics};
@@ -60,8 +60,11 @@ pub(crate) struct CollatorOverseerGenArgs<'a> {
 	pub sync_oracle: Box<dyn sp_consensus::SyncOracle + Send>,
 	/// Underlying authority discovery service.
 	pub authority_discovery_service: AuthorityDiscoveryService,
-	/// Receiver for collation request protocol
-	pub collation_req_receiver: IncomingRequestReceiver<CollationFetchingRequest>,
+	/// Receiver for collation request protocol v1.
+	pub collation_req_receiver_v1: IncomingRequestReceiver<v1::CollationFetchingRequest>,
+	/// Receiver for collation request protocol v1.
+	pub collation_req_receiver_vstaging:
+		IncomingRequestReceiver<vstaging::CollationFetchingRequest>,
 	/// Receiver for availability request protocol
 	pub available_data_req_receiver: IncomingRequestReceiver<AvailableDataFetchingRequest>,
 	/// Prometheus registry, commonly used for production systems, less so for test.
@@ -83,7 +86,8 @@ fn build_overseer<'a>(
 		network_service,
 		sync_oracle,
 		authority_discovery_service,
-		collation_req_receiver,
+		collation_req_receiver_v1,
+		collation_req_receiver_vstaging,
 		available_data_req_receiver,
 		registry,
 		spawner,
@@ -113,12 +117,13 @@ fn build_overseer<'a>(
 		.chain_api(DummySubsystem)
 		.collation_generation(CollationGenerationSubsystem::new(Metrics::register(registry)?))
 		.collator_protocol({
-			let side = ProtocolSide::Collator(
-				network_service.local_peer_id().clone(),
+			let side = ProtocolSide::Collator {
+				peer_id: network_service.local_peer_id().clone(),
 				collator_pair,
-				collation_req_receiver,
-				Metrics::register(registry)?,
-			);
+				request_receiver_v1: collation_req_receiver_v1,
+				request_receiver_vstaging: collation_req_receiver_vstaging,
+				metrics: Metrics::register(registry)?,
+			};
 			CollatorProtocolSubsystem::new(side)
 		})
 		.network_bridge_rx(NetworkBridgeRxSubsystem::new(
@@ -142,6 +147,7 @@ fn build_overseer<'a>(
 			spawner.clone(),
 		))
 		.statement_distribution(DummySubsystem)
+		.prospective_parachains(DummySubsystem)
 		.approval_distribution(DummySubsystem)
 		.approval_voting(DummySubsystem)
 		.gossip_support(DummySubsystem)

client/relay-chain-minimal-node/src/lib.rs

@@ -21,7 +21,9 @@ use cumulus_relay_chain_rpc_interface::{RelayChainRpcInterface, Url};
 use polkadot_network_bridge::{peer_sets_info, IsAuthority};
 use polkadot_node_network_protocol::{
 	peer_set::PeerSetProtocolNames,
-	request_response::{v1, IncomingRequest, IncomingRequestReceiver, Protocol, ReqProtocolNames},
+	request_response::{
+		v1, vstaging, IncomingRequest, IncomingRequestReceiver, Protocol, ReqProtocolNames,
+	},
 };
 
 use polkadot_node_subsystem_util::metrics::prometheus::Registry;
@@ -149,7 +151,7 @@ async fn new_minimal_relay_chain(
 		.extend(peer_sets_info(is_authority, &peer_set_protocol_names));
 
 	let request_protocol_names = ReqProtocolNames::new(genesis_hash, config.chain_spec.fork_id());
-	let (collation_req_receiver, available_data_req_receiver) =
+	let (collation_req_receiver_v1, collation_req_receiver_vstaging, available_data_req_receiver) =
 		build_request_response_protocol_receivers(&request_protocol_names, &mut config);
 
 	let (network, network_starter, sync_oracle) =
@@ -174,7 +176,8 @@ async fn new_minimal_relay_chain(
 		network_service: network.clone(),
 		sync_oracle,
 		authority_discovery_service,
-		collation_req_receiver,
+		collation_req_receiver_v1,
+		collation_req_receiver_vstaging,
 		available_data_req_receiver,
 		registry: prometheus_registry.as_ref(),
 		spawner: task_manager.spawn_handle(),
@@ -200,15 +203,19 @@ fn build_request_response_protocol_receivers(
 	config: &mut Configuration,
 ) -> (
 	IncomingRequestReceiver<v1::CollationFetchingRequest>,
+	IncomingRequestReceiver<vstaging::CollationFetchingRequest>,
 	IncomingRequestReceiver<v1::AvailableDataFetchingRequest>,
 ) {
-	let (collation_req_receiver, cfg) =
+	let (collation_req_receiver_v1, cfg) =
+		IncomingRequest::get_config_receiver(request_protocol_names);
+	config.network.request_response_protocols.push(cfg);
+	let (collation_req_receiver_vstaging, cfg) =
 		IncomingRequest::get_config_receiver(request_protocol_names);
 	config.network.request_response_protocols.push(cfg);
 	let (available_data_req_receiver, cfg) =
 		IncomingRequest::get_config_receiver(request_protocol_names);
 	config.network.request_response_protocols.push(cfg);
 	let cfg = Protocol::ChunkFetchingV1.get_outbound_only_config(request_protocol_names);
 	config.network.request_response_protocols.push(cfg);
-	(collation_req_receiver, available_data_req_receiver)
+	(collation_req_receiver_v1, collation_req_receiver_vstaging, available_data_req_receiver)
 }

client/relay-chain-rpc-interface/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 
 
 [dependencies]
-polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
 
 cumulus-primitives-core = { path = "../../primitives/core" }
 cumulus-relay-chain-interface = { path = "../relay-chain-interface" }

client/relay-chain-rpc-interface/src/rpc_client.rs

@@ -17,11 +17,12 @@
 use crate::reconnecting_ws_client::ReconnectingWsClient;
 use cumulus_primitives_core::{
 	relay_chain::{
-		vstaging::ExecutorParams, CandidateCommitments, CandidateEvent, CandidateHash,
-		CommittedCandidateReceipt, CoreState, DisputeState, GroupRotationInfo, Hash as RelayHash,
-		Header as RelayHeader, InboundHrmpMessage, OccupiedCoreAssumption, PvfCheckStatement,
-		ScrapedOnChainVotes, SessionIndex, SessionInfo, ValidationCode, ValidationCodeHash,
-		ValidatorId, ValidatorIndex, ValidatorSignature,
+		vstaging::{AsyncBackingParameters, BackingState, ExecutorParams},
+		CandidateCommitments, CandidateEvent, CandidateHash, CommittedCandidateReceipt, CoreState,
+		DisputeState, GroupRotationInfo, Hash as RelayHash, Header as RelayHeader,
+		InboundHrmpMessage, OccupiedCoreAssumption, PvfCheckStatement, ScrapedOnChainVotes,
+		SessionIndex, SessionInfo, ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex,
+		ValidatorSignature,
 	},
 	InboundDownwardMessage, ParaId, PersistedValidationData,
 };
@@ -460,6 +461,33 @@ impl RelayChainRpcClient {
 			.await
 	}
 
+	#[allow(missing_docs)]
+	pub async fn parachain_host_staging_async_backing_parameters(
+		&self,
+		at: RelayHash,
+	) -> Result<AsyncBackingParameters, RelayChainError> {
+		self.call_remote_runtime_function(
+			"ParachainHost_staging_async_backing_parameters",
+			at,
+			None::<()>,
+		)
+		.await
+	}
+
+	#[allow(missing_docs)]
+	pub async fn parachain_host_staging_para_backing_state(
+		&self,
+		at: RelayHash,
+		para_id: ParaId,
+	) -> Result<Option<BackingState>, RelayChainError> {
+		self.call_remote_runtime_function(
+			"ParachainHost_staging_para_backing_state",
+			at,
+			Some(para_id),
+		)
+		.await
+	}
+
 	/// Get a stream of all imported relay chain headers
 	pub fn get_imported_heads_stream(&self) -> Result<Receiver<RelayHeader>, RelayChainError> {
 		self.ws_client.get_imported_heads_stream()

client/service/Cargo.toml

@@ -29,7 +29,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
 sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 # Polkadot
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rh-async-backing-feature" }
 
 # Cumulus
 cumulus-client-cli = { path = "../cli" }

pallets/dmp-queue/Cargo.toml

@@ -17,7 +17,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", default-features
 sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
 
 # Polkadot
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "rh-async-backing-feature" }
 
 # Cumulus
 cumulus-primitives-core = { path = "../../primitives/core", default-features = false }

pallets/parachain-system/Cargo.toml

@@ -27,8 +27,8 @@ sp-trie = { git = "https://github.com/paritytech/substrate", default-features =
 sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
 
 # Polkadot
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, features = [ "wasm-api" ], branch = "master" }
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, features = [ "wasm-api" ], branch = "rh-async-backing-feature" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "rh-async-backing-feature" }
 
 # Cumulus
 cumulus-pallet-parachain-system-proc-macro = { path = "proc-macro", default-features = false }

pallets/solo-to-para/Cargo.toml

@@ -17,7 +17,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", default-features
 sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
 
 # Polkadot
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "rh-async-backing-feature" }
 
 # Cumulus
 cumulus-pallet-parachain-system = { default-features = false, path = "../parachain-system" }

pallets/xcm/Cargo.toml

@@ -14,7 +14,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", default-features
 frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
 frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
 
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "rh-async-backing-feature" }
 
 cumulus-primitives-core = { path = "../../primitives/core", default-features = false }