Provisioner polkadot companion (#1940)

* Provisioner companion changes

* update substrate commit hash

* Update Substrate & Polkadot

Co-authored-by: Bastian Köcher <info@kchr.de>

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

@@ -39,7 +39,7 @@ use sp_blockchain::HeaderBackend;
 use sp_consensus::{EnableProofRecording, Environment, ProofRecording, Proposer, SyncOracle};
 use sp_consensus_aura::{AuraApi, SlotDuration};
 use sp_core::crypto::Pair;
-use sp_inherents::{CreateInherentDataProviders, InherentData, InherentDataProvider};
+use sp_inherents::CreateInherentDataProviders;
 use sp_keystore::SyncCryptoStorePtr;
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Member, NumberFor};
 use std::{convert::TryFrom, hash::Hash, marker::PhantomData, sync::Arc};
@@ -170,9 +170,8 @@ where
 		parent: B::Hash,
 		validation_data: &PersistedValidationData,
 		relay_parent: PHash,
-	) -> Option<(InherentData, CIDP::InherentDataProviders)> {
+	) -> Option<CIDP::InherentDataProviders> {
-		let inherent_data_providers = self
+		self.create_inherent_data_providers
-			.create_inherent_data_providers
 			.create_inherent_data_providers(parent, (relay_parent, validation_data.clone()))
 			.await
 			.map_err(|e| {
@@ -182,19 +181,7 @@ where
 					"Failed to create inherent data providers.",
 				)
 			})
-			.ok()?;
-
-		inherent_data_providers
-			.create_inherent_data()
-			.map_err(|e| {
-				tracing::error!(
-					target: LOG_TARGET,
-					error = ?e,
-					"Failed to create inherent data.",
-				)
-			})
 			.ok()
-			.map(|d| (d, inherent_data_providers))
 	}
 }
 
@@ -213,12 +200,12 @@ where
 		relay_parent: PHash,
 		validation_data: &PersistedValidationData,
 	) -> Option<ParachainCandidate<B>> {
-		let (inherent_data, inherent_data_providers) =
+		let inherent_data_providers =
 			self.inherent_data(parent.hash(), validation_data, relay_parent).await?;
 
 		let info = SlotInfo::new(
 			inherent_data_providers.slot(),
-			inherent_data,
+			Box::new(inherent_data_providers),
 			self.slot_duration.as_duration(),
 			parent.clone(),
 			// Set the block limit to 50% of the maximum PoV size.

cumulus/client/consensus/relay-chain/src/import_queue.rs

@@ -65,8 +65,10 @@ where
 				.await
 				.map_err(|e| e.to_string())?;
 
-			let inherent_data =
+			let inherent_data = inherent_data_providers
-				inherent_data_providers.create_inherent_data().map_err(|e| format!("{:?}", e))?;
+				.create_inherent_data()
+				.await
+				.map_err(|e| format!("{:?}", e))?;
 
 			let block = Block::new(block_params.header.clone(), inner_body);
 

cumulus/client/consensus/relay-chain/src/lib.rs

@@ -125,6 +125,7 @@ where
 
 		inherent_data_providers
 			.create_inherent_data()
+			.await
 			.map_err(|e| {
 				tracing::error!(
 					target: LOG_TARGET,

cumulus/primitives/parachain-inherent/src/client_side.rs

@@ -174,7 +174,7 @@ impl ParachainInherentData {
 
 #[async_trait::async_trait]
 impl sp_inherents::InherentDataProvider for ParachainInherentData {
-	fn provide_inherent_data(
+	async fn provide_inherent_data(
 		&self,
 		inherent_data: &mut sp_inherents::InherentData,
 	) -> Result<(), sp_inherents::Error> {

cumulus/primitives/parachain-inherent/src/mock.rs

@@ -151,7 +151,7 @@ impl MockXcmConfig {
 impl<R: Send + Sync + GenerateRandomness<u64>> InherentDataProvider
 	for MockValidationDataInherentDataProvider<R>
 {
-	fn provide_inherent_data(
+	async fn provide_inherent_data(
 		&self,
 		inherent_data: &mut InherentData,
 	) -> Result<(), sp_inherents::Error> {