Reduce provisioner work

node/client/Cargo.toml

@@ -5,6 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 
 [dependencies]
+futures = "0.3.21"
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" }
 frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
 pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" }

node/client/src/benchmarking.rs

@@ -359,7 +359,7 @@ pub fn benchmark_inherent_data(
 	// Assume that all runtimes have the `timestamp` pallet.
 	let d = std::time::Duration::from_millis(0);
 	let timestamp = sp_timestamp::InherentDataProvider::new(d.into());
-	timestamp.provide_inherent_data(&mut inherent_data)?;
+	futures::executor::block_on(timestamp.provide_inherent_data(&mut inherent_data))?;
 
 	let para_data = polkadot_primitives::v2::InherentData {
 		bitfields: Vec::new(),
@@ -368,8 +368,12 @@ pub fn benchmark_inherent_data(
 		parent_header: header,
 	};
 
-	polkadot_node_core_parachains_inherent::ParachainsInherentDataProvider::from_data(para_data)
-		.provide_inherent_data(&mut inherent_data)?;
+	futures::executor::block_on(
+		polkadot_node_core_parachains_inherent::ParachainsInherentDataProvider::from_data(
+			para_data,
+		)
+		.provide_inherent_data(&mut inherent_data),
+	)?;
 
 	Ok(inherent_data)
 }

node/core/parachains-inherent/Cargo.toml

@@ -11,6 +11,7 @@ gum = { package = "tracing-gum", path = "../../gum" }
 thiserror = "1.0.31"
 async-trait = "0.1.57"
 polkadot-node-subsystem = { path = "../../subsystem" }
+polkadot-overseer = { path = "../../overseer" }
 polkadot-primitives = { path = "../../../primitives" }
 sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" }

node/core/parachains-inherent/src/lib.rs

@@ -31,7 +31,7 @@ use polkadot_node_subsystem::{
 use polkadot_primitives::v2::{Block, Hash, InherentData as ParachainsInherentData};
 use sp_blockchain::HeaderBackend;
 use sp_runtime::generic::BlockId;
-use std::time;
+use std::{sync::Arc, time};
 
 pub(crate) const LOG_TARGET: &str = "parachain::parachains-inherent";
 
@@ -51,7 +51,7 @@ impl ParachainsInherentDataProvider {
 
 	/// Create a new instance of the [`ParachainsInherentDataProvider`].
 	pub async fn create<C: HeaderBackend<Block>>(
-		client: &C,
+		client: Arc<C>,
 		mut overseer: Handle,
 		parent: Hash,
 	) -> Result<Self, Error> {
@@ -125,7 +125,7 @@ impl ParachainsInherentDataProvider {
 
 #[async_trait::async_trait]
 impl sp_inherents::InherentDataProvider for ParachainsInherentDataProvider {
-	fn provide_inherent_data(
+	async fn provide_inherent_data(
 		&self,
 		dst_inherent_data: &mut sp_inherents::InherentData,
 	) -> Result<(), sp_inherents::Error> {
@@ -143,6 +143,52 @@ impl sp_inherents::InherentDataProvider for ParachainsInherentDataProvider {
 	}
 }
 
+/// Parachains inherent-data provider
+//#[derive(Encode, Decode, Clone, PartialEq, RuntimeDebug, TypeInfo)]
+pub struct InherentDataProvider<C: sp_blockchain::HeaderBackend<Block>> {
+	pub client: Arc<C>,
+	pub overseer: polkadot_overseer::Handle,
+	pub parent: Hash,
+}
+
+impl<C: sp_blockchain::HeaderBackend<Block>> InherentDataProvider<C> {
+	pub fn new(client: Arc<C>, overseer: polkadot_overseer::Handle, parent: Hash) -> Self {
+		InherentDataProvider { client, overseer, parent }
+	}
+}
+
+#[async_trait::async_trait]
+impl<C: sp_blockchain::HeaderBackend<Block>> sp_inherents::InherentDataProvider
+	for InherentDataProvider<C>
+{
+	async fn provide_inherent_data(
+		&self,
+		dst_inherent_data: &mut sp_inherents::InherentData,
+	) -> Result<(), sp_inherents::Error> {
+		let parachain = ParachainsInherentDataProvider::create(
+			self.client.clone(),
+			self.overseer.clone(),
+			self.parent,
+		)
+		.await
+		.map_err(|e| sp_inherents::Error::Application(Box::new(e)))?;
+
+		dst_inherent_data.put_data(
+			polkadot_primitives::v2::PARACHAINS_INHERENT_IDENTIFIER,
+			&parachain.inherent_data,
+		)
+	}
+
+	async fn try_handle_error(
+		&self,
+		_identifier: &sp_inherents::InherentIdentifier,
+		_error: &[u8],
+	) -> Option<Result<(), sp_inherents::Error>> {
+		// Inherent isn't checked and can not return any error
+		None
+	}
+}
+
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
 	#[error("Blockchain error")]

node/service/src/lib.rs

@@ -1152,11 +1152,12 @@ where
 				let overseer_handle = overseer_handle.clone();
 
 				async move {
-					let parachain = polkadot_node_core_parachains_inherent::ParachainsInherentDataProvider::create(
-						&*client_clone,
-						overseer_handle,
-						parent,
-					).await.map_err(|e| Box::new(e))?;
+					let parachain =
+						polkadot_node_core_parachains_inherent::InherentDataProvider::new(
+							client_clone,
+							overseer_handle,
+							parent,
+						);
 
 					let timestamp = sp_timestamp::InherentDataProvider::from_system_time();