Update to polkadot-v1.6.0

client/consensus/nimbus-consensus/Cargo.toml

@@ -18,12 +18,14 @@ sp-core = { workspace = true }
 sp-inherents = { workspace = true }
 sp-keystore = { workspace = true }
 sp-runtime = { workspace = true }
+sp-version = { workspace = true }
 substrate-prometheus-endpoint = { workspace = true }
 
 # Cumulus dependencies
 cumulus-client-collator = { workspace = true }
 cumulus-client-consensus-common = { workspace = true }
 cumulus-client-consensus-proposer = { workspace = true }
+cumulus-client-parachain-inherent = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 cumulus-primitives-parachain-inherent = { workspace = true }
 cumulus-relay-chain-interface = { workspace = true }

client/consensus/nimbus-consensus/src/collators.rs

@@ -66,7 +66,10 @@ pub(crate) async fn collate<ADP, Block, BI, CS, Proposer>(
 	inherent_data: (ParachainInherentData, InherentData),
 	proposal_duration: Duration,
 	max_pov_size: usize,
-) -> Result<(Collation, ParachainBlockData<Block>, Block::Hash), Box<dyn Error + Send + 'static>>
+) -> Result<
+	Option<(Collation, ParachainBlockData<Block>, Block::Hash)>,
+	Box<dyn Error + Send + 'static>,
+>
 where
 	ADP: DigestsProvider<NimbusId, <Block as BlockT>::Hash> + 'static,
 	Block: BlockT,
@@ -79,11 +82,7 @@ where
 		additional_digests_provider.provide_digests(author_id.clone(), parent_header.hash()),
 	);
 
-	let Proposal {
-		block,
-		storage_changes,
-		proof,
-	} = proposer
+	let maybe_proposal = proposer
 		.propose(
 			&parent_header,
 			&inherent_data.0,
@@ -95,6 +94,15 @@ where
 		.await
 		.map_err(|e| Box::new(e) as Box<dyn Error + Send>)?;
 
+	let Proposal {
+		block,
+		storage_changes,
+		proof,
+	} = match maybe_proposal {
+		None => return Ok(None),
+		Some(p) => p,
+	};
+
 	let (header, extrinsics) = block.clone().deconstruct();
 
 	let sig_digest = seal_header::<Block>(
@@ -155,7 +163,7 @@ where
 			);
 		}
 
-		Ok((collation, block_data, post_hash))
+		Ok(Some((collation, block_data, post_hash)))
 	} else {
 		Err(
 			Box::<dyn Error + Send + Sync>::from("Unable to produce collation")

client/consensus/nimbus-consensus/src/collators/basic.rs

@@ -175,7 +175,7 @@ where
 				.await
 			);
 
-			let (collation, _, post_hash) = try_request!(
+			let maybe_collation = try_request!(
 				super::collate::<ADP, Block, BI, CS, Proposer>(
 					&additional_digests_provider,
 					nimbus_id,
@@ -195,11 +195,16 @@ where
 				.await
 			);
 
-			let result_sender = Some(collator_service.announce_with_barrier(post_hash));
-			request.complete(Some(CollationResult {
-				collation,
-				result_sender,
-			}));
+			if let Some((collation, _, post_hash)) = maybe_collation {
+				let result_sender = Some(collator_service.announce_with_barrier(post_hash));
+				request.complete(Some(CollationResult {
+					collation,
+					result_sender,
+				}));
+			} else {
+				request.complete(None);
+				tracing::debug!(target: crate::LOG_TARGET, "No block proposal");
+			}
 		}
 	}
 }

client/consensus/nimbus-consensus/src/collators/lookahead.rs

@@ -349,7 +349,7 @@ where
 				)
 				.await
 				{
-					Ok((collation, block_data, new_block_hash)) => {
+					Ok(Some((collation, block_data, new_block_hash))) => {
 						// Here we are assuming that the import logic protects against equivocations
 						// and provides sybil-resistance, as it should.
 						params.collator_service.announce_block(new_block_hash, None);
@@ -377,6 +377,10 @@ where
 						parent_hash = new_block_hash;
 						parent_header = block_data.into_header();
 					}
+					Ok(None) => {
+						tracing::debug!(target: crate::LOG_TARGET, "No block proposal");
+						break;
+					}
 					Err(err) => {
 						tracing::error!(target: crate::LOG_TARGET, ?err);
 						break;

client/consensus/nimbus-consensus/src/lib.rs

@@ -28,6 +28,7 @@ mod manual_seal;
 pub use import_queue::import_queue;
 pub use manual_seal::NimbusManualSealConsensusDataProvider;
 
+use cumulus_client_parachain_inherent::ParachainInherentDataProvider;
 use cumulus_primitives_core::{
 	relay_chain::{Hash as PHash, Header as PHeader},
 	ParaId, PersistedValidationData,
@@ -78,11 +79,11 @@ where
 	// Determine if runtime change
 	let runtime_upgraded = if *parent.number() > sp_runtime::traits::Zero::zero() {
 		use sp_api::Core as _;
-		let previous_runtime_version: sp_api::RuntimeVersion = para_client
+		let previous_runtime_version: sp_version::RuntimeVersion = para_client
 			.runtime_api()
 			.version(parent.hash())
 			.map_err(Box::new)?;
-		let runtime_version: sp_api::RuntimeVersion = para_client
+		let runtime_version: sp_version::RuntimeVersion = para_client
 			.runtime_api()
 			.version(parent.hash())
 			.map_err(Box::new)?;
@@ -96,7 +97,7 @@ where
 		first_available_key(&*keystore)
 	} else {
 		first_eligible_key::<Block, Client>(
-			para_client.clone(),
+			para_client,
 			&*keystore,
 			parent,
 			*relay_parent_header.number(),
@@ -127,9 +128,13 @@ where
 	CIDP: CreateInherentDataProviders<Block, (PHash, PersistedValidationData, NimbusId)> + 'static,
 	RClient: RelayChainInterface + Send + Clone + 'static,
 {
-	let paras_inherent_data =
-		ParachainInherentData::create_at(relay_parent, relay_client, validation_data, para_id)
-			.await;
+	let paras_inherent_data = ParachainInherentDataProvider::create_at(
+		relay_parent,
+		relay_client,
+		validation_data,
+		para_id,
+	)
+	.await;
 
 	let paras_inherent_data = match paras_inherent_data {
 		Some(p) => p,

client/consensus/nimbus-consensus/src/manual_seal.rs

@@ -22,12 +22,15 @@ use nimbus_primitives::{
 };
 use sc_consensus::BlockImportParams;
 use sc_consensus_manual_seal::{ConsensusDataProvider, Error};
-use sp_api::{BlockT, HeaderT, ProvideRuntimeApi};
+use sp_api::ProvideRuntimeApi;
 use sp_application_crypto::ByteArray;
 use sp_core::sr25519;
 use sp_inherents::InherentData;
 use sp_keystore::KeystorePtr;
-use sp_runtime::{Digest, DigestItem};
+use sp_runtime::{
+	traits::{Block as BlockT, Header as HeaderT},
+	Digest, DigestItem,
+};
 use std::{marker::PhantomData, sync::Arc};
 
 /// Provides nimbus-compatible pre-runtime digests for use with manual seal consensus

pallets/async-backing/src/mock.rs

@@ -68,6 +68,7 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = ConstU32<16>;
+	type RuntimeTask = ();
 }
 
 impl pallet_timestamp::Config for Test {

pallets/author-inherent/src/exec.rs

@@ -18,12 +18,15 @@
 //! with the nimubs consensus family.
 
 use frame_support::traits::ExecuteBlock;
-use sp_api::{BlockT, HeaderT};
 // For some reason I can't get these logs to actually print
 use log::debug;
 use nimbus_primitives::{digests::CompatibleDigestItem, NimbusId, NIMBUS_ENGINE_ID};
 use sp_application_crypto::ByteArray;
-use sp_runtime::{generic::DigestItem, RuntimeAppPublic};
+use sp_runtime::{
+	generic::DigestItem,
+	traits::{Block as BlockT, Header},
+	RuntimeAppPublic,
+};
 
 /// Block executive to be used by relay chain validators when validating parachain blocks built
 /// with the nimubs consensus family.

pallets/author-inherent/src/mock.rs

@@ -68,6 +68,7 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = ConstU32<16>;
+	type RuntimeTask = ();
 }
 
 pub struct DummyBeacon {}

pallets/author-mapping/src/mock.rs

@@ -97,6 +97,7 @@ impl frame_system::Config for Runtime {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type RuntimeTask = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u128 = 1;

pallets/author-slot-filter/src/mock.rs

@@ -68,6 +68,7 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = ConstU32<16>;
+	type RuntimeTask = ();
 }
 
 impl pallet_testing::Config for Test {

pallets/foreign-asset-creator/src/mock.rs

@@ -69,6 +69,7 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type RuntimeTask = ();
 }
 
 parameter_types! {

pallets/maintenance-mode/src/lib.rs

@@ -45,28 +45,17 @@ mod mock;
 #[cfg(test)]
 mod tests;
 
-mod types;
-
 use frame_support::pallet;
 
 pub use pallet::*;
-pub use types::*;
 
 #[pallet]
 pub mod pallet {
 	#[cfg(feature = "xcm-support")]
-	use cumulus_primitives_core::{
-		relay_chain::BlockNumber as RelayBlockNumber, DmpMessageHandler,
-	};
 	use frame_support::pallet_prelude::*;
-	use frame_support::traits::{
-		BuildGenesisConfig, Contains, EnsureOrigin, OffchainWorker, OnFinalize, OnIdle,
-		OnInitialize, OnRuntimeUpgrade,
-	};
+	use frame_support::traits::{BuildGenesisConfig, Contains, EnsureOrigin, QueuePausedQuery};
 	use frame_system::pallet_prelude::*;
 	#[cfg(feature = "xcm-support")]
-	use sp_std::vec::Vec;
-	#[cfg(feature = "xcm-support")]
 	use xcm_primitives::PauseXcmExecution;
 
 	/// Pallet for migrations
@@ -94,30 +83,6 @@ pub mod pallet {
 		/// Handler to suspend and resume XCM execution
 		#[cfg(feature = "xcm-support")]
 		type XcmExecutionManager: PauseXcmExecution;
-		/// The DMP handler to be used in normal operating mode
-		/// TODO: remove once https://github.com/paritytech/polkadot/pull/5035 is merged
-		#[cfg(feature = "xcm-support")]
-		type NormalDmpHandler: DmpMessageHandler;
-		/// The DMP handler to be used in maintenance mode
-		/// TODO: remove once https://github.com/paritytech/polkadot/pull/5035 is merged
-		#[cfg(feature = "xcm-support")]
-		type MaintenanceDmpHandler: DmpMessageHandler;
-		/// The executive hooks that will be used in normal operating mode
-		/// Important: Use AllPalletsWithSystem here if you dont want to modify the
-		/// hooks behaviour
-		type NormalExecutiveHooks: OnRuntimeUpgrade
-			+ OnInitialize<BlockNumberFor<Self>>
-			+ OnIdle<BlockNumberFor<Self>>
-			+ OnFinalize<BlockNumberFor<Self>>
-			+ OffchainWorker<BlockNumberFor<Self>>;
-		/// The executive hooks that will be used in maintenance mode
-		/// Important: Use AllPalletsWithSystem here if you dont want to modify the
-		/// hooks behaviour
-		type MaintenanceExecutiveHooks: OnRuntimeUpgrade
-			+ OnInitialize<BlockNumberFor<Self>>
-			+ OnIdle<BlockNumberFor<Self>>
-			+ OnFinalize<BlockNumberFor<Self>>
-			+ OffchainWorker<BlockNumberFor<Self>>;
 	}
 
 	#[pallet::event]
@@ -244,17 +209,11 @@ pub mod pallet {
 			}
 		}
 	}
+
 	#[cfg(feature = "xcm-support")]
-	impl<T: Config> DmpMessageHandler for Pallet<T> {
-		fn handle_dmp_messages(
-			iter: impl Iterator<Item = (RelayBlockNumber, Vec<u8>)>,
-			limit: Weight,
-		) -> Weight {
-			if MaintenanceMode::<T>::get() {
-				T::MaintenanceDmpHandler::handle_dmp_messages(iter, limit)
-			} else {
-				T::NormalDmpHandler::handle_dmp_messages(iter, limit)
-			}
+	impl<T: Config, Origin> QueuePausedQuery<Origin> for Pallet<T> {
+		fn is_paused(_origin: &Origin) -> bool {
+			MaintenanceMode::<T>::get()
 		}
 	}
 }