(async backing) restore CheckInherents for backwards-compatibility

pallets/parachain-system/Cargo.toml

@@ -80,6 +80,4 @@ runtime-benchmarks = [
 
 try-runtime = ["frame-support/try-runtime"]
 
-parameterized-consensus-hook = [
-	"cumulus-pallet-parachain-system-proc-macro/parameterized-consensus-hook",
-]
+parameterized-consensus-hook = []

pallets/parachain-system/proc-macro/Cargo.toml

@@ -17,4 +17,3 @@ proc-macro-crate = "1.3.1"
 [features]
 default = [ "std" ]
 std = []
-parameterized-consensus-hook = []

pallets/parachain-system/proc-macro/src/lib.rs

@@ -31,7 +31,7 @@ mod keywords {
 struct Input {
 	runtime: Path,
 	block_executor: Path,
-	check_inherents: Option<Path>,
+	check_inherents: Path,
 }
 
 impl Parse for Input {
@@ -59,7 +59,11 @@ impl Parse for Input {
 			}
 		}
 
-		while !input.is_empty() || runtime.is_none() || block_executor.is_none() {
+		while !input.is_empty() ||
+			runtime.is_none() ||
+			block_executor.is_none() ||
+			check_inherents.is_none()
+		{
 			let lookahead = input.lookahead1();
 
 			if lookahead.peek(keywords::Runtime) {
@@ -76,7 +80,7 @@ impl Parse for Input {
 		Ok(Self {
 			runtime: runtime.expect("Everything is parsed before; qed"),
 			block_executor: block_executor.expect("Everything is parsed before; qed"),
-			check_inherents,
+			check_inherents: check_inherents.expect("Everything is parsed before; qed"),
 		})
 	}
 }
@@ -102,28 +106,6 @@ pub fn register_validate_block(input: proc_macro::TokenStream) -> proc_macro::To
 		Err(e) => return e.into_compile_error().into(),
 	};
 
-	let check_inherents = match check_inherents {
-		Some(_check_inherents) => {
-			#[cfg(not(feature = "parameterized-consensus-hook"))]
-			quote::quote! { #_check_inherents }
-			#[cfg(feature = "parameterized-consensus-hook")]
-			return Error::new(
-				Span::call_site(),
-				"CheckInherents is incompatible with consensus hook feature",
-			)
-			.into_compile_error()
-			.into()
-		},
-		None => {
-			#[cfg(feature = "parameterized-consensus-hook")]
-			quote::quote! { #crate_::DummyCheckInherents<<#runtime as #crate_::validate_block::GetRuntimeBlockType>::RuntimeBlock> }
-			#[cfg(not(feature = "parameterized-consensus-hook"))]
-			return Error::new(Span::call_site(), "missing CheckInherents input")
-				.into_compile_error()
-				.into()
-		},
-	};
-
 	if cfg!(not(feature = "std")) {
 		quote::quote! {
 			#[doc(hidden)]

pallets/parachain-system/src/lib.rs

@@ -86,10 +86,12 @@ pub use consensus_hook::{ConsensusHook, ExpectParentIncluded};
 /// ```
 ///     struct BlockExecutor;
 ///     struct Runtime;
+///     struct CheckInherents;
 ///
 ///     cumulus_pallet_parachain_system::register_validate_block! {
 ///         Runtime = Runtime,
 ///         BlockExecutor = Executive,
+///         CheckInherents = CheckInherents,
 ///     }
 ///
 /// # fn main() {}
@@ -1498,7 +1500,10 @@ impl<T: Config> UpwardMessageSender for Pallet<T> {
 }
 
 /// Something that can check the inherents of a block.
-#[deprecated = "use `cumulus-pallet-aura-ext::FixedVelocityConsensusHook` instead"]
+#[cfg_attr(
+	feature = "parameterized-consensus-hook",
+	deprecated = "consider switching to `cumulus-pallet-parachain-system::ConsensusHook`"
+)]
 pub trait CheckInherents<Block: BlockT> {
 	/// Check all inherents of the block.
 	///
@@ -1510,20 +1515,6 @@ pub trait CheckInherents<Block: BlockT> {
 	) -> frame_support::inherent::CheckInherentsResult;
 }
 
-/// Struct that always returns `Ok` on inherents check, needed for backwards-compatibility.
-#[doc(hidden)]
-pub struct DummyCheckInherents<Block>(sp_std::marker::PhantomData<Block>);
-
-#[allow(deprecated)]
-impl<Block: BlockT> CheckInherents<Block> for DummyCheckInherents<Block> {
-	fn check_inherents(
-		_: &Block,
-		_: &RelayChainStateProof,
-	) -> frame_support::inherent::CheckInherentsResult {
-		sp_inherents::CheckInherentsResult::new()
-	}
-}
-
 /// Something that should be informed about system related events.
 ///
 /// This includes events like [`on_validation_data`](Self::on_validation_data) that is being

pallets/parachain-system/src/validate_block/implementation.rs

@@ -65,7 +65,10 @@ fn with_externalities<F: FnOnce(&mut dyn Externalities) -> R, R>(f: F) -> R {
 /// we have the in-memory database that contains all the values from the state of the parachain
 /// that we require to verify the block.
 ///
-/// 5. The last step is to execute the entire block in the machinery we just have setup. Executing
+/// 5. We are going to run `check_inherents`. This is important to check stuff like the timestamp
+/// matching the real world time.
+///
+/// 6. The last step is to execute the entire block in the machinery we just have setup. Executing
 /// the blocks include running all transactions in the block against our in-memory database and
 /// ensuring that the final storage root matches the storage root in the header of the block. In the
 /// end we return back the [`ValidationResult`] with all the required information for the validator.
@@ -164,7 +167,6 @@ where
 		sp_io::offchain_index::host_clear.replace_implementation(host_offchain_index_clear),
 	);
 
-	#[cfg(not(feature = "parameterized-consensus-hook"))]
 	run_with_externalities::<B, _, _>(&backend, || {
 		let relay_chain_proof = crate::RelayChainStateProof::new(
 			PSC::SelfParaId::get(),

parachain-template/runtime/src/lib.rs

@@ -745,7 +745,20 @@ impl_runtime_apis! {
 	}
 }
 
+struct CheckInherents;
+
+#[allow(deprecated)]
+impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
+	fn check_inherents(
+		_: &Block,
+		_: &cumulus_pallet_parachain_system::RelayChainStateProof,
+	) -> sp_inherents::CheckInherentsResult {
+		sp_inherents::CheckInherentsResult::new()
+	}
+}
+
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
+	CheckInherents = CheckInherents,
 }

parachains/runtimes/assets/asset-hub-kusama/src/lib.rs

@@ -1237,9 +1237,22 @@ impl_runtime_apis! {
 	}
 }
 
+struct CheckInherents;
+
+#[allow(deprecated)]
+impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
+	fn check_inherents(
+		_: &Block,
+		_: &cumulus_pallet_parachain_system::RelayChainStateProof,
+	) -> sp_inherents::CheckInherentsResult {
+		sp_inherents::CheckInherentsResult::new()
+	}
+}
+
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
+	CheckInherents = CheckInherents,
 }
 
 #[cfg(feature = "state-trie-version-1")]

parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs

@@ -1219,9 +1219,22 @@ impl_runtime_apis! {
 	}
 }
 
+struct CheckInherents;
+
+#[allow(deprecated)]
+impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
+	fn check_inherents(
+		_: &Block,
+		_: &cumulus_pallet_parachain_system::RelayChainStateProof,
+	) -> sp_inherents::CheckInherentsResult {
+		sp_inherents::CheckInherentsResult::new()
+	}
+}
+
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
+	CheckInherents = CheckInherents,
 }
 
 #[cfg(test)]

parachains/runtimes/assets/asset-hub-westend/src/lib.rs

@@ -1355,9 +1355,22 @@ impl_runtime_apis! {
 	}
 }
 
+struct CheckInherents;
+
+#[allow(deprecated)]
+impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
+	fn check_inherents(
+		_: &Block,
+		_: &cumulus_pallet_parachain_system::RelayChainStateProof,
+	) -> sp_inherents::CheckInherentsResult {
+		sp_inherents::CheckInherentsResult::new()
+	}
+}
+
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
+	CheckInherents = CheckInherents,
 }
 
 pub mod migrations {

parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs

@@ -781,7 +781,20 @@ impl_runtime_apis! {
 	}
 }
 
+struct CheckInherents;
+
+#[allow(deprecated)]
+impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
+	fn check_inherents(
+		_: &Block,
+		_: &cumulus_pallet_parachain_system::RelayChainStateProof,
+	) -> sp_inherents::CheckInherentsResult {
+		sp_inherents::CheckInherentsResult::new()
+	}
+}
+
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
+	CheckInherents = CheckInherents,
 }

parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs

@@ -781,7 +781,20 @@ impl_runtime_apis! {
 	}
 }
 
+struct CheckInherents;
+
+#[allow(deprecated)]
+impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
+	fn check_inherents(
+		_: &Block,
+		_: &cumulus_pallet_parachain_system::RelayChainStateProof,
+	) -> sp_inherents::CheckInherentsResult {
+		sp_inherents::CheckInherentsResult::new()
+	}
+}
+
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
+	CheckInherents = CheckInherents,
 }

parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs

@@ -1219,9 +1219,22 @@ impl_runtime_apis! {
 	}
 }
 
+struct CheckInherents;
+
+#[allow(deprecated)]
+impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
+	fn check_inherents(
+		_: &Block,
+		_: &cumulus_pallet_parachain_system::RelayChainStateProof,
+	) -> sp_inherents::CheckInherentsResult {
+		sp_inherents::CheckInherentsResult::new()
+	}
+}
+
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
+	CheckInherents = CheckInherents,
 }
 
 #[cfg(test)]

parachains/runtimes/collectives/collectives-polkadot/src/lib.rs

@@ -903,7 +903,20 @@ impl_runtime_apis! {
 	}
 }
 
+struct CheckInherents;
+
+#[allow(deprecated)]
+impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
+	fn check_inherents(
+		_: &Block,
+		_: &cumulus_pallet_parachain_system::RelayChainStateProof,
+	) -> sp_inherents::CheckInherentsResult {
+		sp_inherents::CheckInherentsResult::new()
+	}
+}
+
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
+	CheckInherents = CheckInherents,
 }

parachains/runtimes/contracts/contracts-rococo/src/lib.rs

@@ -694,7 +694,20 @@ impl_runtime_apis! {
 	}
 }
 
+struct CheckInherents;
+
+#[allow(deprecated)]
+impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
+	fn check_inherents(
+		_: &Block,
+		_: &cumulus_pallet_parachain_system::RelayChainStateProof,
+	) -> sp_inherents::CheckInherentsResult {
+		sp_inherents::CheckInherentsResult::new()
+	}
+}
+
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
+	CheckInherents = CheckInherents,
 }

parachains/runtimes/glutton/glutton-kusama/src/lib.rs

@@ -400,7 +400,20 @@ impl_runtime_apis! {
 	}
 }
 
+struct CheckInherents;
+
+#[allow(deprecated)]
+impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
+	fn check_inherents(
+		_: &Block,
+		_: &cumulus_pallet_parachain_system::RelayChainStateProof,
+	) -> sp_inherents::CheckInherentsResult {
+		sp_inherents::CheckInherentsResult::new()
+	}
+}
+
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = Executive,
+	CheckInherents = CheckInherents,
 }

parachains/runtimes/starters/seedling/src/lib.rs

@@ -314,7 +314,20 @@ impl_runtime_apis! {
 	}
 }
 
+struct CheckInherents;
+
+#[allow(deprecated)]
+impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
+	fn check_inherents(
+		_: &Block,
+		_: &cumulus_pallet_parachain_system::RelayChainStateProof,
+	) -> sp_inherents::CheckInherentsResult {
+		sp_inherents::CheckInherentsResult::new()
+	}
+}
+
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = Executive,
+	CheckInherents = CheckInherents,
 }