Asynchronous backing PR (#2300)

* Update substrate & polkadot * min changes to make async backing compile * (async backing) parachain-system: track limitations for unincluded blocks (#2438) * unincluded segment draft * read para head from storage proof * read_para_head -> read_included_para_head * Provide pub interface * add errors * fix unincluded segment update * BlockTracker -> Ancestor * add a dmp limit * Read para head depending on the storage switch * doc comments * storage items docs * add a sanity check on block initialize * Check watermark * append to the segment on block finalize * Move segment update into set_validation_data * Resolve para head todo * option watermark * fix comment * Drop dmq check * fix weight * doc-comments on inherent invariant * Remove TODO * add todo * primitives tests * pallet tests * doc comments * refactor unincluded segment length into a ConsensusHook (#2501) * refactor unincluded segment length into a ConsensusHook * add docs * refactor bandwidth_out calculation Co-authored-by: Chris Sosnin <48099298+slumber@users.noreply.github.com> * test for limits from impl * fmt * make tests compile * update comment * uncomment test * fix collator test by adding parent to state proof * patch HRMP watermark rules for unincluded segment * get consensus-common tests to pass, using unincluded segment * fix unincluded segment tests * get all tests passing * fmt * rustdoc CI * aura-ext: limit the number of authored blocks per slot (#2551) * aura_ext consensus hook * reverse dependency * include weight into hook * fix tests * remove stray println Co-authored-by: Chris Sosnin <48099298+slumber@users.noreply.github.com> * fix test warning * fix doc link --------- Co-authored-by: Chris Sosnin <48099298+slumber@users.noreply.github.com> Co-authored-by: Chris Sosnin <chris125_@live.com> * parachain-system: ignore go ahead signal once upgrade is processed (#2594) * handle goahead signal for unincluded segment * doc comment * add test * parachain-system: drop processed messages from inherent data (#2590) * implement `drop_processed_messages` * drop messages based on relay parent number * adjust tests * drop changes to mqc * fix comment * drop test * drop more dead code * clippy * aura-ext: check slot in consensus hook and remove all `CheckInherents` logic (#2658) * aura-ext: check slot in consensus hook * convert relay chain slot * Make relay chain slot duration generic * use fixed velocity hook for pallets with aura * purge timestamp inherent * fix warning * adjust runtime tests * fix slots in tests * Make `xcm-emulator` test pass for new consensus hook (#2722) * add pallets on_initialize * tests pass * add AuraExt on_init * ".git/.scripts/commands/fmt/fmt.sh" --------- Co-authored-by: command-bot <> --------- Co-authored-by: Ignacio Palacios <ignacio.palacios.santos@gmail.com> * update polkadot git refs * CollationGenerationConfig closure is now optional (#2772) * CollationGenerationConfig closure is now optional * fix test * propagate network-protocol-staging feature (#2899) * Feature Flagging Consensus Hook Type Parameter (#2911) * First pass * fmt * Added as default feature in tomls * Changed to direct dependency feature * Dealing with clippy error * Update pallets/parachain-system/src/lib.rs Co-authored-by: asynchronous rob <rphmeier@gmail.com> --------- Co-authored-by: asynchronous rob <rphmeier@gmail.com> * fmt * bump deps and remove warning * parachain-system: update RelevantMessagingState according to the unincluded segment (#2948) * mostly address 2471 with a bug introduced * adjust relevant messaging state after computing total * fmt * max -> min * fix test implementation of xcmp source * add test * fix test message sending logic * fix + test * add more to unincluded segment test * fmt --------- Co-authored-by: Chris Sosnin <chris125_@live.com> * Integrate new Aura / Parachain Consensus Logic in Parachain-Template / Polkadot-Parachain (#2864) * add a comment * refactor client/service utilities * deprecate start_collator * update parachain-template * update test-service in the same way * update polkadot-parachain crate * fmt * wire up new SubmitCollation message * some runtime utilities for implementing unincluded segment runtime APIs * allow parachains to configure their level of sybil-resistance when starting the network * make aura-ext compile * update to specify sybil resistance levels * fmt * specify relay chain slot duration in milliseconds * update Aura to explicitly produce Send futures also, make relay_chain_slot_duration a Duration * add authoring duration to basic collator and document params * integrate new basic collator into parachain-template * remove assert_send used for testing * basic-aura: only author when parent included * update polkadot-parachain-bin * fmt * some fixes * fixes * add a RelayNumberMonotonicallyIncreases * add a utility function for initializing subsystems * some logging for timestamp adjustment * fmt * some fixes for lookahead collator * add a log * update `find_potential_parents` to account for sessions * bound the loop * restore & deprecate old start_collator and start_full_node functions. * remove unnecessary await calls * fix warning * clippy * more clippy * remove unneeded logic * ci * update comment Co-authored-by: Marcin S. <marcin@bytedude.com> * (async backing) restore `CheckInherents` for backwards-compatibility (#2977) * bring back timestamp * Restore CheckInherents * revert to empty CheckInherents * make CheckInherents optional * attempt * properly end system blocks * add some more comments * ignore failing system parachain tests * update refs after main feature branch merge * comment out the offending tests because CI runs ignored tests * fix warnings * fmt * revert to polkadot master * cargo update -p polkadot-primitives -p sp-io --------- Co-authored-by: asynchronous rob <rphmeier@gmail.com> Co-authored-by: Ignacio Palacios <ignacio.palacios.santos@gmail.com> Co-authored-by: Bradley Olson <34992650+BradleyOlson64@users.noreply.github.com> Co-authored-by: Marcin S. <marcin@bytedude.com> Co-authored-by: eskimor <eskimor@users.noreply.github.com> Co-authored-by: Andronik <write@reusable.software>
2026-05-30 07:01:03 +00:00 · 2023-08-18 19:57:34 +03:00
parent 4f699c70a4
commit 6ef1117685
105 changed files with 4707 additions and 2359 deletions
@@ -53,7 +53,7 @@ sp-weights = { git = "https://github.com/paritytech/substrate", default-features
 # Polkadot
 kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false, optional = true }
+pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", default-features = false, optional = true , branch = "master" }
 polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
@@ -64,12 +64,11 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", default-feature
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
 cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
 cumulus-pallet-session-benchmarking = {path = "../../../../pallets/session-benchmarking", default-features = false, version = "3.0.0"}
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
-cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", default-features = false }
 cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
 parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
@@ -83,7 +82,9 @@ asset-test-utils = { path = "../test-utils"}
 substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }

 [features]
-default = [ "std" ]
+default = [ 
+	"std",
+]
 # When enabled the `state_version` is set to `1`.
 # This means that the chain will start using the new state format. The migration is lazy, so
 # it requires to write a storage value to use the new state format. To migrate all the other
@@ -195,7 +196,6 @@ std = [
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
-	"cumulus-primitives-timestamp/std",
 	"cumulus-primitives-utility/std",
 	"pallet-collator-selection/std",
 	"parachain-info/std",
@@ -104,3 +104,15 @@ pub mod fee {
 		}
 	}
 }
+
+/// Consensus-related.
+pub mod consensus {
+	/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+	/// into the relay chain.
+	pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+	/// How many parachain blocks are processed by the relay chain per parent. Limits the
+	/// number of blocks authored per slot.
+	pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+	/// Relay chain slot duration, in milliseconds.
+	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+}
@@ -47,7 +47,7 @@ use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;

 use codec::{Decode, Encode, MaxEncodedLen};
-use constants::{currency::*, fee::WeightToFee};
+use constants::{consensus::*, currency::*, fee::WeightToFee};
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
@@ -537,6 +537,12 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+	type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+		Runtime,
+		RELAY_CHAIN_SLOT_DURATION_MILLIS,
+		BLOCK_PROCESSING_VELOCITY,
+		UNINCLUDED_SEGMENT_CAPACITY,
+	>;
 }

 impl parachain_info::Config for Runtime {}
@@ -1229,33 +1235,9 @@ impl_runtime_apis! {
 	}
 }

-struct CheckInherents;
-
-impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
-	fn check_inherents(
-		block: &Block,
-		relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,
-	) -> sp_inherents::CheckInherentsResult {
-		let relay_chain_slot = relay_state_proof
-			.read_slot()
-			.expect("Could not read the relay chain slot from the proof");
-
-		let inherent_data =
-			cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(
-				relay_chain_slot,
-				sp_std::time::Duration::from_secs(6),
-			)
-			.create_inherent_data()
-			.expect("Could not create the timestamp inherent data");
-
-		inherent_data.check_extrinsics(block)
-	}
-}
-
 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")]
@@ -23,11 +23,11 @@ use asset_hub_kusama_runtime::xcm_config::{
 pub use asset_hub_kusama_runtime::{
 	constants::fee::WeightToFee,
 	xcm_config::{CheckingAccount, ForeignCreatorsSovereignAccountOf, XcmConfig},
-	AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets, ForeignAssetsInstance,
-	MetadataDepositBase, MetadataDepositPerByte, ParachainSystem, Runtime, RuntimeCall,
-	RuntimeEvent, SessionKeys, System, TrustBackedAssetsInstance,
+	AllPalletsWithoutSystem, AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets,
+	ForeignAssetsInstance, MetadataDepositBase, MetadataDepositPerByte, ParachainSystem, Runtime,
+	RuntimeCall, RuntimeEvent, SessionKeys, System, TrustBackedAssetsInstance,
 };
-use asset_test_utils::{CollatorSessionKeys, ExtBuilder, RuntimeHelper};
+use asset_test_utils::{CollatorSessionKeys, ExtBuilder};
 use codec::{Decode, Encode};
 use cumulus_primitives_utility::ChargeWeightInFungibles;
 use frame_support::{
@@ -46,6 +46,8 @@ const SOME_ASSET_ADMIN: [u8; 32] = [5u8; 32];
 type AssetIdForTrustBackedAssetsConvert =
 	assets_common::AssetIdForTrustBackedAssetsConvert<TrustBackedAssetsPalletLocation>;

+type RuntimeHelper = asset_test_utils::RuntimeHelper<Runtime, AllPalletsWithoutSystem>;
+
 fn collator_session_keys() -> CollatorSessionKeys<Runtime> {
 	CollatorSessionKeys::new(
 		AccountId::from(ALICE),
@@ -69,7 +71,7 @@ fn test_asset_xcm_trader() {
 			let minimum_asset_balance = 3333333_u128;
 			let local_asset_id = 1;
 			assert_ok!(Assets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				local_asset_id.into(),
 				AccountId::from(ALICE).into(),
 				true,
@@ -78,7 +80,7 @@ fn test_asset_xcm_trader() {

 			// We first mint enough asset for the account to exist for assets
 			assert_ok!(Assets::mint(
-				RuntimeHelper::<Runtime>::origin_of(AccountId::from(ALICE)),
+				RuntimeHelper::origin_of(AccountId::from(ALICE)),
 				local_asset_id.into(),
 				AccountId::from(ALICE).into(),
 				minimum_asset_balance
@@ -89,7 +91,7 @@ fn test_asset_xcm_trader() {
 				AssetIdForTrustBackedAssetsConvert::convert_back(&local_asset_id).unwrap();

 			// Set Alice as block author, who will receive fees
-			RuntimeHelper::<Runtime>::run_to_block(2, Some(AccountId::from(ALICE)));
+			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));

 			// We are going to buy 4e9 weight
 			let bought = Weight::from_parts(4_000_000_000u64, 0);
@@ -148,7 +150,7 @@ fn test_asset_xcm_trader_with_refund() {
 			// We need root origin to create a sufficient asset
 			// We set existential deposit to be identical to the one for Balances first
 			assert_ok!(Assets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				1.into(),
 				AccountId::from(ALICE).into(),
 				true,
@@ -157,7 +159,7 @@ fn test_asset_xcm_trader_with_refund() {

 			// We first mint enough asset for the account to exist for assets
 			assert_ok!(Assets::mint(
-				RuntimeHelper::<Runtime>::origin_of(AccountId::from(ALICE)),
+				RuntimeHelper::origin_of(AccountId::from(ALICE)),
 				1.into(),
 				AccountId::from(ALICE).into(),
 				ExistentialDeposit::get()
@@ -167,7 +169,7 @@ fn test_asset_xcm_trader_with_refund() {
 			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };

 			// Set Alice as block author, who will receive fees
-			RuntimeHelper::<Runtime>::run_to_block(2, Some(AccountId::from(ALICE)));
+			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));

 			// We are going to buy 4e9 weight
 			let bought = Weight::from_parts(4_000_000_000u64, 0);
@@ -228,7 +230,7 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() {
 			// We need root origin to create a sufficient asset
 			// We set existential deposit to be identical to the one for Balances first
 			assert_ok!(Assets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				1.into(),
 				AccountId::from(ALICE).into(),
 				true,
@@ -239,7 +241,7 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() {
 			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };

 			// Set Alice as block author, who will receive fees
-			RuntimeHelper::<Runtime>::run_to_block(2, Some(AccountId::from(ALICE)));
+			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));

 			// We are going to buy small amount
 			let bought = Weight::from_parts(500_000_000u64, 0);
@@ -280,7 +282,7 @@ fn test_that_buying_ed_refund_does_not_refund() {
 			// We need root origin to create a sufficient asset
 			// We set existential deposit to be identical to the one for Balances first
 			assert_ok!(Assets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				1.into(),
 				AccountId::from(ALICE).into(),
 				true,
@@ -291,7 +293,7 @@ fn test_that_buying_ed_refund_does_not_refund() {
 			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };

 			// Set Alice as block author, who will receive fees
-			RuntimeHelper::<Runtime>::run_to_block(2, Some(AccountId::from(ALICE)));
+			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));

 			// We are gonna buy ED
 			let bought = Weight::from_parts(ExistentialDeposit::get().try_into().unwrap(), 0);
@@ -345,7 +347,7 @@ fn test_asset_xcm_trader_not_possible_for_non_sufficient_assets() {
 			// Create a non-sufficient asset with specific existential deposit
 			let minimum_asset_balance = 1_000_000_u128;
 			assert_ok!(Assets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				1.into(),
 				AccountId::from(ALICE).into(),
 				false,
@@ -354,7 +356,7 @@ fn test_asset_xcm_trader_not_possible_for_non_sufficient_assets() {

 			// We first mint enough asset for the account to exist for assets
 			assert_ok!(Assets::mint(
-				RuntimeHelper::<Runtime>::origin_of(AccountId::from(ALICE)),
+				RuntimeHelper::origin_of(AccountId::from(ALICE)),
 				1.into(),
 				AccountId::from(ALICE).into(),
 				minimum_asset_balance
@@ -364,7 +366,7 @@ fn test_asset_xcm_trader_not_possible_for_non_sufficient_assets() {
 			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };

 			// Set Alice as block author, who will receive fees
-			RuntimeHelper::<Runtime>::run_to_block(2, Some(AccountId::from(ALICE)));
+			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));

 			// We are going to buy 4e9 weight
 			let bought = Weight::from_parts(4_000_000_000u64, 0);
@@ -428,7 +430,7 @@ fn test_assets_balances_api_works() {
 			// We need root origin to create a sufficient asset
 			let minimum_asset_balance = 3333333_u128;
 			assert_ok!(Assets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				local_asset_id.into(),
 				AccountId::from(ALICE).into(),
 				true,
@@ -437,7 +439,7 @@ fn test_assets_balances_api_works() {

 			// We first mint enough asset for the account to exist for assets
 			assert_ok!(Assets::mint(
-				RuntimeHelper::<Runtime>::origin_of(AccountId::from(ALICE)),
+				RuntimeHelper::origin_of(AccountId::from(ALICE)),
 				local_asset_id.into(),
 				AccountId::from(ALICE).into(),
 				minimum_asset_balance
@@ -446,7 +448,7 @@ fn test_assets_balances_api_works() {
 			// create foreign asset
 			let foreign_asset_minimum_asset_balance = 3333333_u128;
 			assert_ok!(ForeignAssets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				foreign_asset_id_multilocation,
 				AccountId::from(SOME_ASSET_ADMIN).into(),
 				false,
@@ -455,7 +457,7 @@ fn test_assets_balances_api_works() {

 			// We first mint enough asset for the account to exist for assets
 			assert_ok!(ForeignAssets::mint(
-				RuntimeHelper::<Runtime>::origin_of(AccountId::from(SOME_ASSET_ADMIN)),
+				RuntimeHelper::origin_of(AccountId::from(SOME_ASSET_ADMIN)),
 				foreign_asset_id_multilocation,
 				AccountId::from(ALICE).into(),
 				6 * foreign_asset_minimum_asset_balance
@@ -502,6 +504,7 @@ fn test_assets_balances_api_works() {

 asset_test_utils::include_teleports_for_native_asset_works!(
 	Runtime,
+	AllPalletsWithoutSystem,
 	XcmConfig,
 	CheckingAccount,
 	WeightToFee,
@@ -525,6 +528,7 @@ asset_test_utils::include_teleports_for_native_asset_works!(

 asset_test_utils::include_teleports_for_foreign_assets_works!(
 	Runtime,
+	AllPalletsWithoutSystem,
 	XcmConfig,
 	CheckingAccount,
 	WeightToFee,
@@ -50,7 +50,7 @@ sp-weights = { git = "https://github.com/paritytech/substrate", default-features

 # Polkadot
 pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false, optional = true }
+pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", default-features = false, optional = true , branch = "master" }
 polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
@@ -62,12 +62,11 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", default-feature
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
 cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
 cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false, version = "3.0.0" }
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
-cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", default-features = false }
 cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
 parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
@@ -82,7 +81,9 @@ asset-test-utils = { path = "../test-utils"}
 substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }

 [features]
-default = [ "std" ]
+default = [ 
+	"std",
+]
 runtime-benchmarks = [
 	"hex-literal",
 	"frame-benchmarking/runtime-benchmarks",
@@ -181,7 +182,6 @@ std = [
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
-	"cumulus-primitives-timestamp/std",
 	"cumulus-primitives-utility/std",
 	"pallet-collator-selection/std",
 	"parachain-info/std",
@@ -105,3 +105,15 @@ pub mod fee {
 		}
 	}
 }
+
+/// Consensus-related.
+pub mod consensus {
+	/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+	/// into the relay chain.
+	pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+	/// How many parachain blocks are processed by the relay chain per parent. Limits the
+	/// number of blocks authored per slot.
+	pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+	/// Relay chain slot duration, in milliseconds.
+	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+}
@@ -82,7 +82,7 @@ use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;

 use codec::{Decode, Encode, MaxEncodedLen};
-use constants::{currency::*, fee::WeightToFee};
+use constants::{consensus::*, currency::*, fee::WeightToFee};
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
@@ -551,6 +551,12 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+	type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+		Runtime,
+		RELAY_CHAIN_SLOT_DURATION_MILLIS,
+		BLOCK_PROCESSING_VELOCITY,
+		UNINCLUDED_SEGMENT_CAPACITY,
+	>;
 }

 impl parachain_info::Config for Runtime {}
@@ -1211,33 +1217,9 @@ impl_runtime_apis! {
 	}
 }

-struct CheckInherents;
-
-impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
-	fn check_inherents(
-		block: &Block,
-		relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,
-	) -> sp_inherents::CheckInherentsResult {
-		let relay_chain_slot = relay_state_proof
-			.read_slot()
-			.expect("Could not read the relay chain slot from the proof");
-
-		let inherent_data =
-			cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(
-				relay_chain_slot,
-				sp_std::time::Duration::from_secs(6),
-			)
-			.create_inherent_data()
-			.expect("Could not create the timestamp inherent data");
-
-		inherent_data.check_extrinsics(block)
-	}
-}
-
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
-	CheckInherents = CheckInherents,
 }

 #[cfg(test)]
@@ -22,11 +22,12 @@ use asset_hub_polkadot_runtime::xcm_config::{
 	ForeignCreatorsSovereignAccountOf, TrustBackedAssetsPalletLocation, XcmConfig,
 };
 pub use asset_hub_polkadot_runtime::{
-	constants::fee::WeightToFee, AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets,
-	ForeignAssetsInstance, MetadataDepositBase, MetadataDepositPerByte, ParachainSystem, Runtime,
-	RuntimeCall, RuntimeEvent, SessionKeys, System, TrustBackedAssetsInstance,
+	constants::fee::WeightToFee, AllPalletsWithoutSystem, AssetDeposit, Assets, Balances,
+	ExistentialDeposit, ForeignAssets, ForeignAssetsInstance, MetadataDepositBase,
+	MetadataDepositPerByte, ParachainSystem, Runtime, RuntimeCall, RuntimeEvent, SessionKeys,
+	System, TrustBackedAssetsInstance,
 };
-use asset_test_utils::{CollatorSessionKeys, ExtBuilder, RuntimeHelper};
+use asset_test_utils::{CollatorSessionKeys, ExtBuilder};
 use codec::{Decode, Encode};
 use cumulus_primitives_utility::ChargeWeightInFungibles;
 use frame_support::{
@@ -47,6 +48,8 @@ const SOME_ASSET_ADMIN: [u8; 32] = [5u8; 32];
 type AssetIdForTrustBackedAssetsConvert =
 	assets_common::AssetIdForTrustBackedAssetsConvert<TrustBackedAssetsPalletLocation>;

+type RuntimeHelper = asset_test_utils::RuntimeHelper<Runtime, AllPalletsWithoutSystem>;
+
 fn collator_session_keys() -> CollatorSessionKeys<Runtime> {
 	CollatorSessionKeys::new(
 		AccountId::from(ALICE),
@@ -70,7 +73,7 @@ fn test_asset_xcm_trader() {
 			let minimum_asset_balance = 333333333_u128;
 			let local_asset_id = 1;
 			assert_ok!(Assets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				local_asset_id.into(),
 				AccountId::from(ALICE).into(),
 				true,
@@ -79,7 +82,7 @@ fn test_asset_xcm_trader() {

 			// We first mint enough asset for the account to exist for assets
 			assert_ok!(Assets::mint(
-				RuntimeHelper::<Runtime>::origin_of(AccountId::from(ALICE)),
+				RuntimeHelper::origin_of(AccountId::from(ALICE)),
 				local_asset_id.into(),
 				AccountId::from(ALICE).into(),
 				minimum_asset_balance
@@ -90,7 +93,7 @@ fn test_asset_xcm_trader() {
 				AssetIdForTrustBackedAssetsConvert::convert_back(&local_asset_id).unwrap();

 			// Set Alice as block author, who will receive fees
-			RuntimeHelper::<Runtime>::run_to_block(2, Some(AccountId::from(ALICE)));
+			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));

 			// We are going to buy 400e9 weight
 			// Because of the ED being higher in kusama's asset hub
@@ -152,7 +155,7 @@ fn test_asset_xcm_trader_with_refund() {
 			// We need root origin to create a sufficient asset
 			// We set existential deposit to be identical to the one for Balances first
 			assert_ok!(Assets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				1.into(),
 				AccountId::from(ALICE).into(),
 				true,
@@ -161,7 +164,7 @@ fn test_asset_xcm_trader_with_refund() {

 			// We first mint enough asset for the account to exist for assets
 			assert_ok!(Assets::mint(
-				RuntimeHelper::<Runtime>::origin_of(AccountId::from(ALICE)),
+				RuntimeHelper::origin_of(AccountId::from(ALICE)),
 				1.into(),
 				AccountId::from(ALICE).into(),
 				ExistentialDeposit::get()
@@ -171,7 +174,7 @@ fn test_asset_xcm_trader_with_refund() {
 			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };

 			// Set Alice as block author, who will receive fees
-			RuntimeHelper::<Runtime>::run_to_block(2, Some(AccountId::from(ALICE)));
+			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));

 			// We are going to buy 400e9 weight
 			// Because of the ED being higher in kusama's asset hub
@@ -235,7 +238,7 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() {
 			// We need root origin to create a sufficient asset
 			// We set existential deposit to be identical to the one for Balances first
 			assert_ok!(Assets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				1.into(),
 				AccountId::from(ALICE).into(),
 				true,
@@ -246,7 +249,7 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() {
 			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };

 			// Set Alice as block author, who will receive fees
-			RuntimeHelper::<Runtime>::run_to_block(2, Some(AccountId::from(ALICE)));
+			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));

 			// We are going to buy 50e9 weight
 			// Because of the ED being higher in kusama's asset hub
@@ -290,7 +293,7 @@ fn test_that_buying_ed_refund_does_not_refund() {
 			// We need root origin to create a sufficient asset
 			// We set existential deposit to be identical to the one for Balances first
 			assert_ok!(Assets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				1.into(),
 				AccountId::from(ALICE).into(),
 				true,
@@ -301,7 +304,7 @@ fn test_that_buying_ed_refund_does_not_refund() {
 			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };

 			// Set Alice as block author, who will receive fees
-			RuntimeHelper::<Runtime>::run_to_block(2, Some(AccountId::from(ALICE)));
+			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));

 			// We are gonna buy ED
 			let bought = Weight::from_parts(ExistentialDeposit::get().try_into().unwrap(), 0);
@@ -355,7 +358,7 @@ fn test_asset_xcm_trader_not_possible_for_non_sufficient_assets() {
 			// Create a non-sufficient asset
 			let minimum_asset_balance = 1_000_000_u128;
 			assert_ok!(Assets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				1.into(),
 				AccountId::from(ALICE).into(),
 				false,
@@ -364,7 +367,7 @@ fn test_asset_xcm_trader_not_possible_for_non_sufficient_assets() {

 			// We first mint enough asset for the account to exist for assets
 			assert_ok!(Assets::mint(
-				RuntimeHelper::<Runtime>::origin_of(AccountId::from(ALICE)),
+				RuntimeHelper::origin_of(AccountId::from(ALICE)),
 				1.into(),
 				AccountId::from(ALICE).into(),
 				minimum_asset_balance
@@ -374,7 +377,7 @@ fn test_asset_xcm_trader_not_possible_for_non_sufficient_assets() {
 			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };

 			// Set Alice as block author, who will receive fees
-			RuntimeHelper::<Runtime>::run_to_block(2, Some(AccountId::from(ALICE)));
+			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));

 			// We are going to buy 400e9 weight
 			// Because of the ED being higher in kusama's asset hub
@@ -441,7 +444,7 @@ fn test_assets_balances_api_works() {
 			// We need root origin to create a sufficient asset
 			let minimum_asset_balance = 3333333_u128;
 			assert_ok!(Assets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				local_asset_id.into(),
 				AccountId::from(ALICE).into(),
 				true,
@@ -450,7 +453,7 @@ fn test_assets_balances_api_works() {

 			// We first mint enough asset for the account to exist for assets
 			assert_ok!(Assets::mint(
-				RuntimeHelper::<Runtime>::origin_of(AccountId::from(ALICE)),
+				RuntimeHelper::origin_of(AccountId::from(ALICE)),
 				local_asset_id.into(),
 				AccountId::from(ALICE).into(),
 				minimum_asset_balance
@@ -459,7 +462,7 @@ fn test_assets_balances_api_works() {
 			// create foreign asset
 			let foreign_asset_minimum_asset_balance = 3333333_u128;
 			assert_ok!(ForeignAssets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				foreign_asset_id_multilocation,
 				AccountId::from(SOME_ASSET_ADMIN).into(),
 				false,
@@ -468,7 +471,7 @@ fn test_assets_balances_api_works() {

 			// We first mint enough asset for the account to exist for assets
 			assert_ok!(ForeignAssets::mint(
-				RuntimeHelper::<Runtime>::origin_of(AccountId::from(SOME_ASSET_ADMIN)),
+				RuntimeHelper::origin_of(AccountId::from(SOME_ASSET_ADMIN)),
 				foreign_asset_id_multilocation,
 				AccountId::from(ALICE).into(),
 				6 * foreign_asset_minimum_asset_balance
@@ -515,6 +518,7 @@ fn test_assets_balances_api_works() {

 asset_test_utils::include_teleports_for_native_asset_works!(
 	Runtime,
+	AllPalletsWithoutSystem,
 	XcmConfig,
 	CheckingAccount,
 	WeightToFee,
@@ -538,6 +542,7 @@ asset_test_utils::include_teleports_for_native_asset_works!(

 asset_test_utils::include_teleports_for_foreign_assets_works!(
 	Runtime,
+	AllPalletsWithoutSystem,
 	XcmConfig,
 	CheckingAccount,
 	WeightToFee,
@@ -53,7 +53,7 @@ primitive-types = { version = "0.12.1", default-features = false, features = ["c

 # Polkadot
 pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false, optional = true }
+pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", default-features = false, optional = true , branch = "master" }
 polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
@@ -65,12 +65,11 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", default-feature
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
 cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
 cumulus-pallet-session-benchmarking = {path = "../../../../pallets/session-benchmarking", default-features = false, version = "3.0.0"}
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
-cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", default-features = false }
 cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
 parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
@@ -85,7 +84,9 @@ asset-test-utils = { path = "../test-utils"}
 substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }

 [features]
-default = [ "std" ]
+default = [ 
+	"std",
+]
 runtime-benchmarks = [
 	"hex-literal",
 	"frame-benchmarking/runtime-benchmarks",
@@ -190,7 +191,6 @@ std = [
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
-	"cumulus-primitives-timestamp/std",
 	"cumulus-primitives-utility/std",
 	"pallet-collator-selection/std",
 	"parachain-info/std",
@@ -107,3 +107,15 @@ pub mod fee {
 		}
 	}
 }
+
+/// Consensus-related.
+pub mod consensus {
+	/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+	/// into the relay chain.
+	pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+	/// How many parachain blocks are processed by the relay chain per parent. Limits the
+	/// number of blocks authored per slot.
+	pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+	/// Relay chain slot duration, in milliseconds.
+	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+}
@@ -36,7 +36,7 @@ use assets_common::{
 	AssetIdForTrustBackedAssetsConvert,
 };
 use codec::{Decode, Encode, MaxEncodedLen};
-use constants::{currency::*, fee::WeightToFee};
+use constants::{consensus::*, currency::*, fee::WeightToFee};
 use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
 use frame_support::{
 	construct_runtime,
@@ -590,6 +590,12 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+	type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+		Runtime,
+		RELAY_CHAIN_SLOT_DURATION_MILLIS,
+		BLOCK_PROCESSING_VELOCITY,
+		UNINCLUDED_SEGMENT_CAPACITY,
+	>;
 }

 impl parachain_info::Config for Runtime {}
@@ -1345,33 +1351,9 @@ impl_runtime_apis! {
 	}
 }

-struct CheckInherents;
-
-impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
-	fn check_inherents(
-		block: &Block,
-		relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,
-	) -> sp_inherents::CheckInherentsResult {
-		let relay_chain_slot = relay_state_proof
-			.read_slot()
-			.expect("Could not read the relay chain slot from the proof");
-
-		let inherent_data =
-			cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(
-				relay_chain_slot,
-				sp_std::time::Duration::from_secs(6),
-			)
-			.create_inherent_data()
-			.expect("Could not create the timestamp inherent data");
-
-		inherent_data.check_extrinsics(block)
-	}
-}
-
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
-	CheckInherents = CheckInherents,
 }

 pub mod migrations {
@@ -20,18 +20,19 @@
 pub use asset_hub_westend_runtime::{
 	constants::fee::WeightToFee,
 	xcm_config::{CheckingAccount, TrustBackedAssetsPalletLocation, XcmConfig},
-	AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets, ForeignAssetsInstance,
-	ParachainSystem, Runtime, SessionKeys, System, TrustBackedAssetsInstance,
+	AllowMultiAssetPools, AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets,
+	ForeignAssetsInstance, ParachainSystem, Runtime, SessionKeys, System,
+	TrustBackedAssetsInstance,
 };
 use asset_hub_westend_runtime::{
 	xcm_config::{
 		AssetFeeAsExistentialDepositMultiplierFeeCharger, ForeignCreatorsSovereignAccountOf,
 		WestendLocation,
 	},
-	AllowMultiAssetPools, LiquidityWithdrawalFee, MetadataDepositBase, MetadataDepositPerByte,
+	AllPalletsWithoutSystem, LiquidityWithdrawalFee, MetadataDepositBase, MetadataDepositPerByte,
 	RuntimeCall, RuntimeEvent,
 };
-use asset_test_utils::{CollatorSessionKeys, ExtBuilder, RuntimeHelper, XcmReceivedFrom};
+use asset_test_utils::{CollatorSessionKeys, ExtBuilder, XcmReceivedFrom};
 use codec::{Decode, DecodeLimit, Encode};
 use cumulus_primitives_utility::ChargeWeightInFungibles;
 use frame_support::{
@@ -57,6 +58,8 @@ const SOME_ASSET_ADMIN: [u8; 32] = [5u8; 32];
 type AssetIdForTrustBackedAssetsConvert =
 	assets_common::AssetIdForTrustBackedAssetsConvert<TrustBackedAssetsPalletLocation>;

+type RuntimeHelper = asset_test_utils::RuntimeHelper<Runtime, AllPalletsWithoutSystem>;
+
 fn collator_session_keys() -> CollatorSessionKeys<Runtime> {
 	CollatorSessionKeys::new(
 		AccountId::from(ALICE),
@@ -80,7 +83,7 @@ fn test_asset_xcm_trader() {
 			let minimum_asset_balance = 3333333_u128;
 			let local_asset_id = 1;
 			assert_ok!(Assets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				local_asset_id.into(),
 				AccountId::from(ALICE).into(),
 				true,
@@ -89,7 +92,7 @@ fn test_asset_xcm_trader() {

 			// We first mint enough asset for the account to exist for assets
 			assert_ok!(Assets::mint(
-				RuntimeHelper::<Runtime>::origin_of(AccountId::from(ALICE)),
+				RuntimeHelper::origin_of(AccountId::from(ALICE)),
 				local_asset_id.into(),
 				AccountId::from(ALICE).into(),
 				minimum_asset_balance
@@ -100,7 +103,7 @@ fn test_asset_xcm_trader() {
 				AssetIdForTrustBackedAssetsConvert::convert_back(&local_asset_id).unwrap();

 			// Set Alice as block author, who will receive fees
-			RuntimeHelper::<Runtime>::run_to_block(2, Some(AccountId::from(ALICE)));
+			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));

 			// We are going to buy 4e9 weight
 			let bought = Weight::from_parts(4_000_000_000u64, 0);
@@ -159,7 +162,7 @@ fn test_asset_xcm_trader_with_refund() {
 			// We need root origin to create a sufficient asset
 			// We set existential deposit to be identical to the one for Balances first
 			assert_ok!(Assets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				1.into(),
 				AccountId::from(ALICE).into(),
 				true,
@@ -168,7 +171,7 @@ fn test_asset_xcm_trader_with_refund() {

 			// We first mint enough asset for the account to exist for assets
 			assert_ok!(Assets::mint(
-				RuntimeHelper::<Runtime>::origin_of(AccountId::from(ALICE)),
+				RuntimeHelper::origin_of(AccountId::from(ALICE)),
 				1.into(),
 				AccountId::from(ALICE).into(),
 				ExistentialDeposit::get()
@@ -178,7 +181,7 @@ fn test_asset_xcm_trader_with_refund() {
 			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };

 			// Set Alice as block author, who will receive fees
-			RuntimeHelper::<Runtime>::run_to_block(2, Some(AccountId::from(ALICE)));
+			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));

 			// We are going to buy 4e9 weight
 			let bought = Weight::from_parts(4_000_000_000u64, 0);
@@ -238,7 +241,7 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() {
 			// We need root origin to create a sufficient asset
 			// We set existential deposit to be identical to the one for Balances first
 			assert_ok!(Assets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				1.into(),
 				AccountId::from(ALICE).into(),
 				true,
@@ -249,7 +252,7 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() {
 			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };

 			// Set Alice as block author, who will receive fees
-			RuntimeHelper::<Runtime>::run_to_block(2, Some(AccountId::from(ALICE)));
+			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));

 			// We are going to buy 5e9 weight
 			let bought = Weight::from_parts(500_000_000u64, 0);
@@ -290,7 +293,7 @@ fn test_that_buying_ed_refund_does_not_refund() {
 			// We need root origin to create a sufficient asset
 			// We set existential deposit to be identical to the one for Balances first
 			assert_ok!(Assets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				1.into(),
 				AccountId::from(ALICE).into(),
 				true,
@@ -301,7 +304,7 @@ fn test_that_buying_ed_refund_does_not_refund() {
 			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };

 			// Set Alice as block author, who will receive fees
-			RuntimeHelper::<Runtime>::run_to_block(2, Some(AccountId::from(ALICE)));
+			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));

 			let bought = Weight::from_parts(500_000_000u64, 0);

@@ -354,7 +357,7 @@ fn test_asset_xcm_trader_not_possible_for_non_sufficient_assets() {
 			// Create a non-sufficient asset with specific existential deposit
 			let minimum_asset_balance = 1_000_000_u128;
 			assert_ok!(Assets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				1.into(),
 				AccountId::from(ALICE).into(),
 				false,
@@ -363,7 +366,7 @@ fn test_asset_xcm_trader_not_possible_for_non_sufficient_assets() {

 			// We first mint enough asset for the account to exist for assets
 			assert_ok!(Assets::mint(
-				RuntimeHelper::<Runtime>::origin_of(AccountId::from(ALICE)),
+				RuntimeHelper::origin_of(AccountId::from(ALICE)),
 				1.into(),
 				AccountId::from(ALICE).into(),
 				minimum_asset_balance
@@ -373,7 +376,7 @@ fn test_asset_xcm_trader_not_possible_for_non_sufficient_assets() {
 			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };

 			// Set Alice as block author, who will receive fees
-			RuntimeHelper::<Runtime>::run_to_block(2, Some(AccountId::from(ALICE)));
+			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));

 			// We are going to buy 4e9 weight
 			let bought = Weight::from_parts(4_000_000_000u64, 0);
@@ -437,7 +440,7 @@ fn test_assets_balances_api_works() {
 			// We need root origin to create a sufficient asset
 			let minimum_asset_balance = 3333333_u128;
 			assert_ok!(Assets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				local_asset_id.into(),
 				AccountId::from(ALICE).into(),
 				true,
@@ -446,7 +449,7 @@ fn test_assets_balances_api_works() {

 			// We first mint enough asset for the account to exist for assets
 			assert_ok!(Assets::mint(
-				RuntimeHelper::<Runtime>::origin_of(AccountId::from(ALICE)),
+				RuntimeHelper::origin_of(AccountId::from(ALICE)),
 				local_asset_id.into(),
 				AccountId::from(ALICE).into(),
 				minimum_asset_balance
@@ -455,7 +458,7 @@ fn test_assets_balances_api_works() {
 			// create foreign asset
 			let foreign_asset_minimum_asset_balance = 3333333_u128;
 			assert_ok!(ForeignAssets::force_create(
-				RuntimeHelper::<Runtime>::root_origin(),
+				RuntimeHelper::root_origin(),
 				foreign_asset_id_multilocation,
 				AccountId::from(SOME_ASSET_ADMIN).into(),
 				false,
@@ -464,7 +467,7 @@ fn test_assets_balances_api_works() {

 			// We first mint enough asset for the account to exist for assets
 			assert_ok!(ForeignAssets::mint(
-				RuntimeHelper::<Runtime>::origin_of(AccountId::from(SOME_ASSET_ADMIN)),
+				RuntimeHelper::origin_of(AccountId::from(SOME_ASSET_ADMIN)),
 				foreign_asset_id_multilocation,
 				AccountId::from(ALICE).into(),
 				6 * foreign_asset_minimum_asset_balance
@@ -511,6 +514,7 @@ fn test_assets_balances_api_works() {

 asset_test_utils::include_teleports_for_native_asset_works!(
 	Runtime,
+	AllPalletsWithoutSystem,
 	XcmConfig,
 	CheckingAccount,
 	WeightToFee,
@@ -534,6 +538,7 @@ asset_test_utils::include_teleports_for_native_asset_works!(

 asset_test_utils::include_teleports_for_foreign_assets_works!(
 	Runtime,
+	AllPalletsWithoutSystem,
 	XcmConfig,
 	CheckingAccount,
 	WeightToFee,
@@ -658,7 +663,7 @@ fn plain_receive_teleported_asset_works() {
 				.map(xcm::v3::Xcm::<RuntimeCall>::try_from).expect("failed").expect("failed");

 			let outcome =
-				XcmExecutor::<XcmConfig>::execute_xcm(Parent, maybe_msg, message_id, RuntimeHelper::<Runtime>::xcm_max_weight(XcmReceivedFrom::Parent));
+				XcmExecutor::<XcmConfig>::execute_xcm(Parent, maybe_msg, message_id, RuntimeHelper::xcm_max_weight(XcmReceivedFrom::Parent));
 			assert_eq!(outcome.ensure_complete(), Ok(()));
 		})
 }
@@ -21,7 +21,7 @@ sp-std = { git = "https://github.com/paritytech/substrate", default-features = f
 sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }

 # Cumulus
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
 cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
@@ -18,13 +18,14 @@
 use codec::Encode;
 use frame_support::{
 	assert_noop, assert_ok,
-	traits::{fungibles::InspectEnumerable, Get, OriginTrait},
+	traits::{fungibles::InspectEnumerable, Get, OnFinalize, OnInitialize, OriginTrait},
 	weights::Weight,
 };
-use parachains_common::Balance;
+use frame_system::pallet_prelude::BlockNumberFor;
+use parachains_common::{AccountId, Balance};
 use parachains_runtimes_test_utils::{
 	assert_metadata, assert_total, AccountIdOf, BalanceOf, CollatorSessionKeys, ExtBuilder,
-	RuntimeHelper, ValidatorIdOf, XcmReceivedFrom,
+	ValidatorIdOf, XcmReceivedFrom,
 };
 use sp_runtime::{
 	traits::{MaybeEquivalence, StaticLookup, Zero},
@@ -33,6 +34,9 @@ use sp_runtime::{
 use xcm::latest::prelude::*;
 use xcm_executor::{traits::ConvertLocation, XcmExecutor};

+type RuntimeHelper<Runtime, AllPalletsWithoutSystem = ()> =
+	parachains_runtimes_test_utils::RuntimeHelper<Runtime, AllPalletsWithoutSystem>;
+
 // Re-export test_case from `parachains-runtimes-test-utils`
 pub use parachains_runtimes_test_utils::test_cases::change_storage_constant_by_governance_works;

@@ -40,6 +44,7 @@ pub use parachains_runtimes_test_utils::test_cases::change_storage_constant_by_g
 /// and can teleport it back and to the other parachains
 pub fn teleports_for_native_asset_works<
 	Runtime,
+	AllPalletsWithoutSystem,
 	XcmConfig,
 	CheckingAccount,
 	WeightToFee,
@@ -62,6 +67,8 @@ pub fn teleports_for_native_asset_works<
 		+ pallet_collator_selection::Config
 		+ cumulus_pallet_parachain_system::Config
 		+ cumulus_pallet_xcmp_queue::Config,
+	AllPalletsWithoutSystem:
+		OnInitialize<BlockNumberFor<Runtime>> + OnFinalize<BlockNumberFor<Runtime>>,
 	AccountIdOf<Runtime>: Into<[u8; 32]>,
 	ValidatorIdOf<Runtime>: From<AccountIdOf<Runtime>>,
 	BalanceOf<Runtime>: From<Balance> + Into<u128>,
@@ -84,6 +91,13 @@ pub fn teleports_for_native_asset_works<
 		.with_para_id(runtime_para_id.into())
 		.build()
 		.execute_with(|| {
+			let mut alice = [0u8; 32];
+			alice[0] = 1;
+
+			let included_head = RuntimeHelper::<Runtime, AllPalletsWithoutSystem>::run_to_block(
+				2,
+				AccountId::from(alice),
+			);
 			// check Balances before
 			assert_eq!(<pallet_balances::Pallet<Runtime>>::free_balance(&target_account), 0.into());
 			assert_eq!(
@@ -166,6 +180,8 @@ pub fn teleports_for_native_asset_works<
 					dest_beneficiary,
 					(native_asset_id, native_asset_to_teleport_away.into()),
 					None,
+					included_head.clone(),
+					&alice,
 				));
 				// check balances
 				assert_eq!(
@@ -211,6 +227,8 @@ pub fn teleports_for_native_asset_works<
 					dest_beneficiary,
 					(native_asset_id, native_asset_to_teleport_away.into()),
 					Some((runtime_para_id, other_para_id)),
+					included_head,
+					&alice,
 				));

 				// check balances
@@ -240,6 +258,7 @@ pub fn teleports_for_native_asset_works<
 macro_rules! include_teleports_for_native_asset_works(
 	(
 		$runtime:path,
+		$all_pallets_without_system:path,
 		$xcm_config:path,
 		$checking_account:path,
 		$weight_to_fee:path,
@@ -257,6 +276,7 @@ macro_rules! include_teleports_for_native_asset_works(

 			$crate::test_cases::teleports_for_native_asset_works::<
 				$runtime,
+				$all_pallets_without_system,
 				$xcm_config,
 				$checking_account,
 				$weight_to_fee,
@@ -277,6 +297,7 @@ macro_rules! include_teleports_for_native_asset_works(
 /// chain
 pub fn teleports_for_foreign_assets_works<
 	Runtime,
+	AllPalletsWithoutSystem,
 	XcmConfig,
 	CheckingAccount,
 	WeightToFee,
@@ -302,6 +323,8 @@ pub fn teleports_for_foreign_assets_works<
 		+ cumulus_pallet_parachain_system::Config
 		+ cumulus_pallet_xcmp_queue::Config
 		+ pallet_assets::Config<ForeignAssetsPalletInstance>,
+	AllPalletsWithoutSystem:
+		OnInitialize<BlockNumberFor<Runtime>> + OnFinalize<BlockNumberFor<Runtime>>,
 	AccountIdOf<Runtime>: Into<[u8; 32]>,
 	ValidatorIdOf<Runtime>: From<AccountIdOf<Runtime>>,
 	BalanceOf<Runtime>: From<Balance>,
@@ -363,6 +386,13 @@ pub fn teleports_for_foreign_assets_works<
 		.with_tracing()
 		.build()
 		.execute_with(|| {
+			let mut alice = [0u8; 32];
+			alice[0] = 1;
+
+			let included_head = RuntimeHelper::<Runtime, AllPalletsWithoutSystem>::run_to_block(
+				2,
+				AccountId::from(alice),
+			);
 			// checks target_account before
 			assert_eq!(
 				<pallet_balances::Pallet<Runtime>>::free_balance(&target_account),
@@ -514,6 +544,8 @@ pub fn teleports_for_foreign_assets_works<
 					dest_beneficiary,
 					(foreign_asset_id_multilocation, asset_to_teleport_away),
 					Some((runtime_para_id, foreign_para_id)),
+					included_head,
+					&alice,
 				));

 				// check balances
@@ -558,6 +590,7 @@ pub fn teleports_for_foreign_assets_works<
 macro_rules! include_teleports_for_foreign_assets_works(
 	(
 		$runtime:path,
+		$all_pallets_without_system:path,
 		$xcm_config:path,
 		$checking_account:path,
 		$weight_to_fee:path,
@@ -578,6 +611,7 @@ macro_rules! include_teleports_for_foreign_assets_works(

 			$crate::test_cases::teleports_for_foreign_assets_works::<
 				$runtime,
+				$all_pallets_without_system,
 				$xcm_config,
 				$checking_account,
 				$weight_to_fee,
@@ -49,7 +49,7 @@ sp-version = { git = "https://github.com/paritytech/substrate", default-features
 # Polkadot
 kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false, optional = true }
+pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", default-features = false, optional = true , branch = "master" }
 polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
@@ -60,12 +60,11 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", default-feature
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
 cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
 cumulus-pallet-session-benchmarking = {path = "../../../../pallets/session-benchmarking", default-features = false, version = "3.0.0"}
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
-cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", default-features = false }
 cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
 parachain-info = { path = "../../../../parachains/pallets/parachain-info", default-features = false }
@@ -89,7 +88,6 @@ std = [
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
-	"cumulus-primitives-timestamp/std",
 	"cumulus-primitives-utility/std",
 	"frame-executive/std",
 	"frame-support/std",
@@ -103,3 +103,15 @@ pub mod fee {
 		}
 	}
 }
+
+/// Consensus-related.
+pub mod consensus {
+	/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+	/// into the relay chain.
+	pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+	/// How many parachain blocks are processed by the relay chain per parent. Limits the
+	/// number of blocks authored per slot.
+	pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+	/// Relay chain slot duration, in milliseconds.
+	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+}
@@ -41,7 +41,7 @@ use sp_std::prelude::*;
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;

-use constants::{currency::*, fee::WeightToFee};
+use constants::{consensus::*, currency::*, fee::WeightToFee};
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
@@ -281,6 +281,12 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+	type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+		Runtime,
+		RELAY_CHAIN_SLOT_DURATION_MILLIS,
+		BLOCK_PROCESSING_VELOCITY,
+		UNINCLUDED_SEGMENT_CAPACITY,
+	>;
 }

 impl parachain_info::Config for Runtime {}
@@ -772,31 +778,7 @@ impl_runtime_apis! {
 	}
 }

-struct CheckInherents;
-
-impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
-	fn check_inherents(
-		block: &Block,
-		relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,
-	) -> sp_inherents::CheckInherentsResult {
-		let relay_chain_slot = relay_state_proof
-			.read_slot()
-			.expect("Could not read the relay chain slot from the proof");
-
-		let inherent_data =
-			cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(
-				relay_chain_slot,
-				sp_std::time::Duration::from_secs(6),
-			)
-			.create_inherent_data()
-			.expect("Could not create the timestamp inherent data");
-
-		inherent_data.check_extrinsics(block)
-	}
-}
-
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
-	CheckInherents = CheckInherents,
 }
@@ -15,8 +15,8 @@
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.

 pub use bridge_hub_kusama_runtime::{
-	constants::fee::WeightToFee, xcm_config::XcmConfig, Balances, ExistentialDeposit,
-	ParachainSystem, PolkadotXcm, Runtime, RuntimeEvent, SessionKeys,
+	constants::fee::WeightToFee, xcm_config::XcmConfig, AllPalletsWithoutSystem, Balances,
+	ExistentialDeposit, ParachainSystem, PolkadotXcm, Runtime, RuntimeEvent, SessionKeys,
 };
 use codec::Decode;
 use frame_support::parameter_types;
@@ -30,6 +30,7 @@ parameter_types! {

 bridge_hub_test_utils::test_cases::include_teleports_for_native_asset_works!(
 	Runtime,
+	AllPalletsWithoutSystem,
 	XcmConfig,
 	CheckingAccount,
 	WeightToFee,
@@ -49,7 +49,7 @@ sp-version = { git = "https://github.com/paritytech/substrate", default-features
 # Polkadot
 polkadot-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false, optional = true }
+pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", default-features = false, optional = true , branch = "master" }
 polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
@@ -60,12 +60,11 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", default-feature
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
 cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
 cumulus-pallet-session-benchmarking = {path = "../../../../pallets/session-benchmarking", default-features = false, version = "3.0.0"}
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
-cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", default-features = false }
 cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
 parachain-info = { path = "../../../../parachains/pallets/parachain-info", default-features = false }
@@ -89,7 +88,6 @@ std = [
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
-	"cumulus-primitives-timestamp/std",
 	"cumulus-primitives-utility/std",
 	"frame-executive/std",
 	"frame-support/std",
@@ -103,3 +103,15 @@ pub mod fee {
 		}
 	}
 }
+
+/// Consensus-related.
+pub mod consensus {
+	/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+	/// into the relay chain.
+	pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+	/// How many parachain blocks are processed by the relay chain per parent. Limits the
+	/// number of blocks authored per slot.
+	pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+	/// Relay chain slot duration, in milliseconds.
+	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+}
@@ -41,7 +41,7 @@ use sp_std::prelude::*;
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;

-use constants::{currency::*, fee::WeightToFee};
+use constants::{consensus::*, currency::*, fee::WeightToFee};
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
@@ -281,6 +281,12 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+	type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+		Runtime,
+		RELAY_CHAIN_SLOT_DURATION_MILLIS,
+		BLOCK_PROCESSING_VELOCITY,
+		UNINCLUDED_SEGMENT_CAPACITY,
+	>;
 }

 impl parachain_info::Config for Runtime {}
@@ -772,31 +778,7 @@ impl_runtime_apis! {
 	}
 }

-struct CheckInherents;
-
-impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
-	fn check_inherents(
-		block: &Block,
-		relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,
-	) -> sp_inherents::CheckInherentsResult {
-		let relay_chain_slot = relay_state_proof
-			.read_slot()
-			.expect("Could not read the relay chain slot from the proof");
-
-		let inherent_data =
-			cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(
-				relay_chain_slot,
-				sp_std::time::Duration::from_secs(6),
-			)
-			.create_inherent_data()
-			.expect("Could not create the timestamp inherent data");
-
-		inherent_data.check_extrinsics(block)
-	}
-}
-
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
-	CheckInherents = CheckInherents,
 }
@@ -15,8 +15,8 @@
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.

 pub use bridge_hub_polkadot_runtime::{
-	constants::fee::WeightToFee, xcm_config::XcmConfig, Balances, ExistentialDeposit,
-	ParachainSystem, PolkadotXcm, Runtime, RuntimeEvent, SessionKeys,
+	constants::fee::WeightToFee, xcm_config::XcmConfig, AllPalletsWithoutSystem, Balances,
+	ExistentialDeposit, ParachainSystem, PolkadotXcm, Runtime, RuntimeEvent, SessionKeys,
 };
 use codec::Decode;
 use frame_support::parameter_types;
@@ -30,6 +30,7 @@ parameter_types! {

 bridge_hub_test_utils::test_cases::include_teleports_for_native_asset_works!(
 	Runtime,
+	AllPalletsWithoutSystem,
 	XcmConfig,
 	CheckingAccount,
 	WeightToFee,
@@ -49,7 +49,7 @@ sp-version = { git = "https://github.com/paritytech/substrate", default-features
 # Polkadot
 rococo-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false, optional = true }
+pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", default-features = false, optional = true , branch = "master" }
 polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
@@ -60,12 +60,11 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", default-feature
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
 cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
 cumulus-pallet-session-benchmarking = {path = "../../../../pallets/session-benchmarking", default-features = false, version = "3.0.0"}
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
-cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", default-features = false }
 cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
 parachain-info = { path = "../../../../parachains/pallets/parachain-info", default-features = false }
@@ -120,7 +119,6 @@ std = [
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
-	"cumulus-primitives-timestamp/std",
 	"cumulus-primitives-utility/std",
 	"frame-benchmarking/std",
 	"frame-executive/std",
@@ -105,3 +105,15 @@ pub mod fee {
 		}
 	}
 }
+
+/// Consensus-related.
+pub mod consensus {
+	/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+	/// into the relay chain.
+	pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+	/// How many parachain blocks are processed by the relay chain per parent. Limits the
+	/// number of blocks authored per slot.
+	pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+	/// Relay chain slot duration, in milliseconds.
+	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+}
@@ -28,7 +28,7 @@ pub mod constants;
 mod weights;
 pub mod xcm_config;

-use constants::currency::*;
+use constants::{consensus::*, currency::*};
 use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
 use sp_api::impl_runtime_apis;
 use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
@@ -299,6 +299,12 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+	type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+		Runtime,
+		RELAY_CHAIN_SLOT_DURATION_MILLIS,
+		BLOCK_PROCESSING_VELOCITY,
+		UNINCLUDED_SEGMENT_CAPACITY,
+	>;
 }

 impl parachain_info::Config for Runtime {}
@@ -1223,33 +1229,9 @@ impl_runtime_apis! {
 	}
 }

-struct CheckInherents;
-
-impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
-	fn check_inherents(
-		block: &Block,
-		relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,
-	) -> sp_inherents::CheckInherentsResult {
-		let relay_chain_slot = relay_state_proof
-			.read_slot()
-			.expect("Could not read the relay chain slot from the proof");
-
-		let inherent_data =
-			cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(
-				relay_chain_slot,
-				sp_std::time::Duration::from_secs(6),
-			)
-			.create_inherent_data()
-			.expect("Could not create the timestamp inherent data");
-
-		inherent_data.check_extrinsics(block)
-	}
-}
-
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
-	CheckInherents = CheckInherents,
 }

 #[cfg(test)]
@@ -21,9 +21,9 @@ use bridge_hub_rococo_runtime::{
 	bridge_hub_rococo_config, bridge_hub_wococo_config,
 	constants::fee::WeightToFee,
 	xcm_config::{RelayNetwork, XcmConfig},
-	BridgeRejectObsoleteHeadersAndMessages, DeliveryRewardInBalance, Executive, ExistentialDeposit,
-	ParachainSystem, PolkadotXcm, RequiredStakeForStakeAndSlash, Runtime, RuntimeCall,
-	RuntimeEvent, SessionKeys, SignedExtra, UncheckedExtrinsic,
+	AllPalletsWithoutSystem, BridgeRejectObsoleteHeadersAndMessages, DeliveryRewardInBalance,
+	Executive, ExistentialDeposit, ParachainSystem, PolkadotXcm, RequiredStakeForStakeAndSlash,
+	Runtime, RuntimeCall, RuntimeEvent, SessionKeys, SignedExtra, UncheckedExtrinsic,
 };
 use codec::{Decode, Encode};
 use frame_support::parameter_types;
@@ -106,6 +106,7 @@ mod bridge_hub_rococo_tests {

 	bridge_hub_test_utils::test_cases::include_teleports_for_native_asset_works!(
 		Runtime,
+		AllPalletsWithoutSystem,
 		XcmConfig,
 		CheckingAccount,
 		WeightToFee,
@@ -199,6 +200,7 @@ mod bridge_hub_rococo_tests {
 	fn message_dispatch_routing_works() {
 		bridge_hub_test_utils::test_cases::message_dispatch_routing_works::<
 			Runtime,
+			AllPalletsWithoutSystem,
 			XcmConfig,
 			ParachainSystem,
 			WithBridgeHubWococoMessagesInstance,
@@ -228,6 +230,7 @@ mod bridge_hub_rococo_tests {
 	fn relayed_incoming_message_works() {
 		bridge_hub_test_utils::test_cases::relayed_incoming_message_works::<
 			Runtime,
+			AllPalletsWithoutSystem,
 			XcmConfig,
 			ParachainSystem,
 			BridgeGrandpaWococoInstance,
@@ -248,6 +251,7 @@ mod bridge_hub_rococo_tests {
 	pub fn complex_relay_extrinsic_works() {
 		bridge_hub_test_utils::test_cases::complex_relay_extrinsic_works::<
 			Runtime,
+			AllPalletsWithoutSystem,
 			XcmConfig,
 			ParachainSystem,
 			BridgeGrandpaWococoInstance,
@@ -281,6 +285,7 @@ mod bridge_hub_wococo_tests {

 	bridge_hub_test_utils::test_cases::include_teleports_for_native_asset_works!(
 		Runtime,
+		AllPalletsWithoutSystem,
 		XcmConfig,
 		CheckingAccount,
 		WeightToFee,
@@ -374,6 +379,7 @@ mod bridge_hub_wococo_tests {
 	fn message_dispatch_routing_works() {
 		bridge_hub_test_utils::test_cases::message_dispatch_routing_works::<
 			Runtime,
+			AllPalletsWithoutSystem,
 			XcmConfig,
 			ParachainSystem,
 			WithBridgeHubRococoMessagesInstance,
@@ -403,6 +409,7 @@ mod bridge_hub_wococo_tests {
 	fn relayed_incoming_message_works() {
 		bridge_hub_test_utils::test_cases::relayed_incoming_message_works::<
 			Runtime,
+			AllPalletsWithoutSystem,
 			XcmConfig,
 			ParachainSystem,
 			BridgeGrandpaRococoInstance,
@@ -423,6 +430,7 @@ mod bridge_hub_wococo_tests {
 	pub fn complex_relay_extrinsic_works() {
 		bridge_hub_test_utils::test_cases::complex_relay_extrinsic_works::<
 			Runtime,
+			AllPalletsWithoutSystem,
 			XcmConfig,
 			ParachainSystem,
 			BridgeGrandpaRococoInstance,
@@ -26,15 +26,16 @@ pallet-session = { git = "https://github.com/paritytech/substrate", default-feat
 # Cumulus
 asset-test-utils = { path = "../../assets/test-utils"}
 cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
 parachain-info = { path = "../../../../parachains/pallets/parachain-info", default-features = false }
+parachains-common = { path = "../../../../parachains/common", default-features = false }
 parachains-runtimes-test-utils = { path = "../../test-utils", default-features = false }

 # Polkadot
 pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
-pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false, optional = true }
+pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", default-features = false, optional = true , branch = "master" }
 xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
 xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
@@ -80,6 +81,7 @@ std = [
 	"pallet-bridge-relayers/std",
 	"parachain-info/std",
 	"parachains-runtimes-test-utils/std",
+	"parachains-common/std",
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"pallet-xcm/std",
@@ -36,13 +36,14 @@ use bridge_runtime_common::{
 use codec::Encode;
 use frame_support::{
 	assert_ok,
-	traits::{Get, OriginTrait, PalletInfoAccess},
+	traits::{Get, OnFinalize, OnInitialize, OriginTrait, PalletInfoAccess},
 };
 use frame_system::pallet_prelude::{BlockNumberFor, HeaderFor};
 use pallet_bridge_grandpa::BridgedHeader;
+use parachains_common::AccountId;
 use parachains_runtimes_test_utils::{
-	mock_open_hrmp_channel, AccountIdOf, BalanceOf, CollatorSessionKeys, ExtBuilder, RuntimeHelper,
-	ValidatorIdOf, XcmReceivedFrom,
+	mock_open_hrmp_channel, AccountIdOf, BalanceOf, CollatorSessionKeys, ExtBuilder, ValidatorIdOf,
+	XcmReceivedFrom,
 };
 use sp_core::H256;
 use sp_keyring::AccountKeyring::*;
@@ -54,6 +55,9 @@ use xcm_executor::XcmExecutor;
 // Re-export test_case from assets
 pub use asset_test_utils::include_teleports_for_native_asset_works;

+type RuntimeHelper<Runtime, AllPalletsWithoutSystem = ()> =
+	parachains_runtimes_test_utils::RuntimeHelper<Runtime, AllPalletsWithoutSystem>;
+
 // Re-export test_case from `parachains-runtimes-test-utils`
 pub use parachains_runtimes_test_utils::test_cases::change_storage_constant_by_governance_works;

@@ -210,6 +214,7 @@ pub fn handle_export_message_from_system_parachain_to_outbound_queue_works<
 ///     2. to Sibling parachain
 pub fn message_dispatch_routing_works<
 	Runtime,
+	AllPalletsWithoutSystem,
 	XcmConfig,
 	HrmpChannelOpener,
 	MessagesPalletInstance,
@@ -237,6 +242,10 @@ pub fn message_dispatch_routing_works<
 		+ cumulus_pallet_parachain_system::Config
 		+ cumulus_pallet_xcmp_queue::Config
 		+ pallet_bridge_messages::Config<MessagesPalletInstance, InboundPayload = XcmAsPlainPayload>,
+	AllPalletsWithoutSystem:
+		OnInitialize<BlockNumberFor<Runtime>> + OnFinalize<BlockNumberFor<Runtime>>,
+	<Runtime as frame_system::Config>::AccountId:
+		Into<<<Runtime as frame_system::Config>::RuntimeOrigin as OriginTrait>::AccountId>,
 	XcmConfig: xcm_executor::Config,
 	MessagesPalletInstance: 'static,
 	ValidatorIdOf<Runtime>: From<AccountIdOf<Runtime>>,
@@ -258,6 +267,13 @@ pub fn message_dispatch_routing_works<
 		.with_tracing()
 		.build()
 		.execute_with(|| {
+			let mut alice = [0u8; 32];
+			alice[0] = 1;
+
+			let included_head = RuntimeHelper::<Runtime, AllPalletsWithoutSystem>::run_to_block(
+				2,
+				AccountId::from(alice),
+			);
 			// 1. this message is sent from other global consensus with destination of this Runtime relay chain (UMP)
 			let bridging_message =
 				test_data::simulate_message_exporter_on_bridged_chain::<BridgedNetwork, RuntimeNetwork>(
@@ -299,7 +315,7 @@ pub fn message_dispatch_routing_works<
 						   .count(), 0);

 			// 2.1. WITH hrmp channel -> Ok
-			mock_open_hrmp_channel::<Runtime, HrmpChannelOpener>(runtime_para_id.into(), sibling_parachain_id.into());
+			mock_open_hrmp_channel::<Runtime, HrmpChannelOpener>(runtime_para_id.into(), sibling_parachain_id.into(), included_head, &alice);
 			let result = <<Runtime as pallet_bridge_messages::Config<MessagesPalletInstance>>::MessageDispatch>::dispatch(
 				DispatchMessage {
 					key: MessageKey { lane_id: expected_lane_id, nonce: 1 },
@@ -320,7 +336,7 @@ pub fn message_dispatch_routing_works<

 /// Test-case makes sure that Runtime can dispatch XCM messages submitted by relayer,
 /// with proofs (finality, para heads, message) independently submitted.
-pub fn relayed_incoming_message_works<Runtime, XcmConfig, HrmpChannelOpener, GPI, PPI, MPI, MB>(
+pub fn relayed_incoming_message_works<Runtime, AllPalletsWithoutSystem, XcmConfig, HrmpChannelOpener, GPI, PPI, MPI, MB>(
 	collator_session_key: CollatorSessionKeys<Runtime>,
 	runtime_para_id: u32,
 	bridged_para_id: u32,
@@ -340,6 +356,8 @@ pub fn relayed_incoming_message_works<Runtime, XcmConfig, HrmpChannelOpener, GPI
 	+ pallet_bridge_grandpa::Config<GPI>
 	+ pallet_bridge_parachains::Config<PPI>
 	+ pallet_bridge_messages::Config<MPI, InboundPayload = XcmAsPlainPayload>,
+	AllPalletsWithoutSystem: OnInitialize<BlockNumberFor<Runtime>>
+		+ OnFinalize<BlockNumberFor<Runtime>>,
 	GPI: 'static,
 	PPI: 'static,
 	MPI: 'static,
@@ -370,9 +388,18 @@ pub fn relayed_incoming_message_works<Runtime, XcmConfig, HrmpChannelOpener, GPI
 		.with_tracing()
 		.build()
 		.execute_with(|| {
+			let mut alice = [0u8; 32];
+			alice[0] = 1;
+
+			let included_head = RuntimeHelper::<Runtime, AllPalletsWithoutSystem>::run_to_block(
+				2,
+				AccountId::from(alice),
+			);
 			mock_open_hrmp_channel::<Runtime, HrmpChannelOpener>(
 				runtime_para_id.into(),
 				sibling_parachain_id.into(),
+				included_head,
+				&alice,
 			);

 			// start with bridged chain block#0
@@ -516,7 +543,7 @@ pub fn relayed_incoming_message_works<Runtime, XcmConfig, HrmpChannelOpener, GPI
 /// Test-case makes sure that Runtime can dispatch XCM messages submitted by relayer,
 /// with proofs (finality, para heads, message) batched together in signed extrinsic.
 /// Also verifies relayer transaction signed extensions work as intended.
-pub fn complex_relay_extrinsic_works<Runtime, XcmConfig, HrmpChannelOpener, GPI, PPI, MPI, MB>(
+pub fn complex_relay_extrinsic_works<Runtime, AllPalletsWithoutSystem, XcmConfig, HrmpChannelOpener, GPI, PPI, MPI, MB>(
 	collator_session_key: CollatorSessionKeys<Runtime>,
 	runtime_para_id: u32,
 	bridged_para_id: u32,
@@ -545,6 +572,8 @@ pub fn complex_relay_extrinsic_works<Runtime, XcmConfig, HrmpChannelOpener, GPI,
 	+ pallet_bridge_parachains::Config<PPI>
 	+ pallet_bridge_messages::Config<MPI, InboundPayload = XcmAsPlainPayload>
 	+ pallet_bridge_relayers::Config,
+	AllPalletsWithoutSystem: OnInitialize<BlockNumberFor<Runtime>>
+		+ OnFinalize<BlockNumberFor<Runtime>>,
 	GPI: 'static,
 	PPI: 'static,
 	MPI: 'static,
@@ -588,6 +617,13 @@ pub fn complex_relay_extrinsic_works<Runtime, XcmConfig, HrmpChannelOpener, GPI,
 		.with_tracing()
 		.build()
 		.execute_with(|| {
+			let mut alice = [0u8; 32];
+			alice[0] = 1;
+
+			let included_head = RuntimeHelper::<Runtime, AllPalletsWithoutSystem>::run_to_block(
+				2,
+				AccountId::from(alice),
+			);
 			let zero: BlockNumberFor<Runtime> = 0u32.into();
 			let genesis_hash = frame_system::Pallet::<Runtime>::block_hash(zero);
 			let mut header: HeaderFor<Runtime> = bp_test_utils::test_header(1u32.into());
@@ -597,6 +633,8 @@ pub fn complex_relay_extrinsic_works<Runtime, XcmConfig, HrmpChannelOpener, GPI,
 			mock_open_hrmp_channel::<Runtime, HrmpChannelOpener>(
 				runtime_para_id.into(),
 				sibling_parachain_id.into(),
+				included_head,
+				&alice,
 			);

 			// start with bridged chain block#0
@@ -64,12 +64,11 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", default-feature
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
 cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
 cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false, version = "3.0.0" }
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
-cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", default-features = false }
 cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
 parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
@@ -82,7 +81,9 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", bran
 sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }

 [features]
-default = [ "std" ]
+default = [ 
+	"std",
+]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
@@ -184,7 +185,6 @@ std = [
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
-	"cumulus-primitives-timestamp/std",
 	"cumulus-primitives-utility/std",
 	"pallet-collator-selection/std",
 	"parachain-info/std",
@@ -122,3 +122,15 @@ pub mod fee {
 		}
 	}
 }
+
+/// Consensus-related.
+pub mod consensus {
+	/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+	/// into the relay chain.
+	pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+	/// How many parachain blocks are processed by the relay chain per parent. Limits the
+	/// number of blocks authored per slot.
+	pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+	/// Relay chain slot duration, in milliseconds.
+	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+}
@@ -64,7 +64,7 @@ use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;

 use codec::{Decode, Encode, MaxEncodedLen};
-use constants::{currency::*, fee::WeightToFee};
+use constants::{consensus::*, currency::*, fee::WeightToFee};
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
@@ -368,6 +368,12 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+	type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+		Runtime,
+		RELAY_CHAIN_SLOT_DURATION_MILLIS,
+		BLOCK_PROCESSING_VELOCITY,
+		UNINCLUDED_SEGMENT_CAPACITY,
+	>;
 }

 impl parachain_info::Config for Runtime {}
@@ -894,31 +900,7 @@ impl_runtime_apis! {
 	}
 }

-struct CheckInherents;
-
-impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
-	fn check_inherents(
-		block: &Block,
-		relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,
-	) -> sp_inherents::CheckInherentsResult {
-		let relay_chain_slot = relay_state_proof
-			.read_slot()
-			.expect("Could not read the relay chain slot from the proof");
-
-		let inherent_data =
-			cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(
-				relay_chain_slot,
-				sp_std::time::Duration::from_secs(6),
-			)
-			.create_inherent_data()
-			.expect("Could not create the timestamp inherent data");
-
-		inherent_data.check_extrinsics(block)
-	}
-}
-
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
-	CheckInherents = CheckInherents,
 }
@@ -63,12 +63,11 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", default-feature
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
 cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
 cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false }
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
-cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", default-features = false }
 cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
 parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
@@ -128,7 +127,6 @@ std = [
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
-	"cumulus-primitives-timestamp/std",
 	"cumulus-primitives-utility/std",
 	"substrate-wasm-builder",
 ]
@@ -107,3 +107,15 @@ pub mod fee {
 		}
 	}
 }
+
+/// Consensus-related.
+pub mod consensus {
+	/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+	/// into the relay chain.
+	pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+	/// How many parachain blocks are processed by the relay chain per parent. Limits the
+	/// number of blocks authored per slot.
+	pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+	/// Relay chain slot duration, in milliseconds.
+	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+}
@@ -45,7 +45,7 @@ use sp_std::prelude::*;
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;

-use constants::{currency::*, fee::WeightToFee};
+use constants::{consensus::*, currency::*, fee::WeightToFee};
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
@@ -274,6 +274,12 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+	type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+		Runtime,
+		RELAY_CHAIN_SLOT_DURATION_MILLIS,
+		BLOCK_PROCESSING_VELOCITY,
+		UNINCLUDED_SEGMENT_CAPACITY,
+	>;
 }

 impl pallet_insecure_randomness_collective_flip::Config for Runtime {}
@@ -688,31 +694,7 @@ impl_runtime_apis! {
 	}
 }

-struct CheckInherents;
-
-impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
-	fn check_inherents(
-		block: &Block,
-		relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,
-	) -> sp_inherents::CheckInherentsResult {
-		let relay_chain_slot = relay_state_proof
-			.read_slot()
-			.expect("Could not read the relay chain slot from the proof");
-
-		let inherent_data =
-			cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(
-				relay_chain_slot,
-				sp_std::time::Duration::from_secs(6),
-			)
-			.create_inherent_data()
-			.expect("Could not create the timestamp inherent data");
-
-		inherent_data.check_extrinsics(block)
-	}
-}
-
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
-	CheckInherents = CheckInherents,
 }
@@ -35,7 +35,7 @@ xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features
 xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }

 # Cumulus
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
 parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
@@ -45,7 +45,9 @@ parachains-common = { path = "../../../common", default-features = false }
 substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }

 [features]
-default = [ "std" ]
+default = [ 
+	"std",
+]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
@@ -179,6 +179,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type XcmpMessageHandler = ();
 	type ReservedXcmpWeight = ();
 	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+	type ConsensusHook = cumulus_pallet_parachain_system::consensus_hook::ExpectParentIncluded;
 }

 impl parachain_info::Config for Runtime {}
@@ -397,19 +398,7 @@ impl_runtime_apis! {
 	}
 }

-struct CheckInherents;
-
-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,
 }
@@ -26,7 +26,7 @@ sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default
 sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }

 # Cumulus
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
 cumulus-pallet-solo-to-para = { path = "../../../../pallets/solo-to-para", default-features = false }
 parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
 parachains-common = { path = "../../../common", default-features = false }
@@ -36,7 +36,9 @@ cumulus-primitives-core = { path = "../../../../primitives/core", default-featur
 substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }

 [features]
-default = [ "std" ]
+default = [ 
+	"std",
+]
 std = [
 	"codec/std",
 	"scale-info/std",
@@ -175,6 +175,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type XcmpMessageHandler = ();
 	type ReservedXcmpWeight = ();
 	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+	type ConsensusHook = cumulus_pallet_parachain_system::consensus_hook::ExpectParentIncluded;
 }

 impl parachain_info::Config for Runtime {}
@@ -313,19 +314,7 @@ impl_runtime_apis! {
 	}
 }

-struct CheckInherents;
-
-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,
 }
@@ -30,7 +30,7 @@ xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features
 xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }

 # Cumulus
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
 parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
@@ -40,7 +40,9 @@ parachains-common = { path = "../../../common", default-features = false }
 substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }

 [features]
-default = [ "std" ]
+default = [ 
+	"std",
+]
 std = [
 	"codec/std",
 	"scale-info/std",
@@ -178,6 +178,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type XcmpMessageHandler = ();
 	type ReservedXcmpWeight = ();
 	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+	type ConsensusHook = cumulus_pallet_parachain_system::consensus_hook::ExpectParentIncluded;
 }

 impl parachain_info::Config for Runtime {}
@@ -343,19 +344,7 @@ impl_runtime_apis! {
 	}
 }

-struct CheckInherents;
-
-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,
 }
@@ -21,7 +21,7 @@ sp-std = { git = "https://github.com/paritytech/substrate", default-features = f
 sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }

 # Cumulus
-cumulus-pallet-parachain-system = { path = "../../../pallets/parachain-system", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
 cumulus-pallet-xcmp-queue = { path = "../../../pallets/xcmp-queue", default-features = false }
 cumulus-pallet-dmp-queue = { path = "../../../pallets/dmp-queue", default-features = false }
 pallet-collator-selection = { path = "../../../pallets/collator-selection", default-features = false }
@@ -15,21 +15,26 @@

 use sp_std::marker::PhantomData;

-use codec::DecodeLimit;
-use cumulus_primitives_core::{AbridgedHrmpChannel, ParaId, PersistedValidationData};
+use codec::{Decode, DecodeLimit};
+use cumulus_primitives_core::{
+	relay_chain::Slot, AbridgedHrmpChannel, ParaId, PersistedValidationData,
+};
 use cumulus_primitives_parachain_inherent::ParachainInherentData;
 use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
 use frame_support::{
 	dispatch::{DispatchResult, RawOrigin, UnfilteredDispatchable},
 	inherent::{InherentData, ProvideInherent},
-	traits::OriginTrait,
+	traits::{OnFinalize, OnInitialize, OriginTrait},
 	weights::Weight,
 };
-use parachains_common::AccountId;
-use polkadot_parachain::primitives::{HrmpChannelId, RelayChainBlockNumber, XcmpMessageFormat};
-use sp_consensus_aura::AURA_ENGINE_ID;
+use frame_system::pallet_prelude::{BlockNumberFor, HeaderFor};
+use parachains_common::{AccountId, SLOT_DURATION};
+use polkadot_parachain::primitives::{
+	HeadData, HrmpChannelId, RelayChainBlockNumber, XcmpMessageFormat,
+};
+use sp_consensus_aura::{SlotDuration, AURA_ENGINE_ID};
 use sp_core::Encode;
-use sp_runtime::{BuildStorage, Digest, DigestItem};
+use sp_runtime::{traits::Header, BuildStorage, Digest, DigestItem};
 use xcm::{
 	latest::{MultiAsset, MultiLocation, XcmContext, XcmHash},
 	prelude::*,
@@ -207,36 +212,46 @@ impl<
 	}
 }

-pub struct RuntimeHelper<Runtime>(PhantomData<Runtime>);
+pub struct RuntimeHelper<Runtime, AllPalletsWithoutSystem>(
+	PhantomData<(Runtime, AllPalletsWithoutSystem)>,
+);
 /// Utility function that advances the chain to the desired block number.
 /// If an author is provided, that author information is injected to all the blocks in the meantime.
-impl<Runtime: frame_system::Config> RuntimeHelper<Runtime>
+impl<Runtime: frame_system::Config, AllPalletsWithoutSystem>
+	RuntimeHelper<Runtime, AllPalletsWithoutSystem>
 where
 	AccountIdOf<Runtime>:
 		Into<<<Runtime as frame_system::Config>::RuntimeOrigin as OriginTrait>::AccountId>,
+	AllPalletsWithoutSystem:
+		OnInitialize<BlockNumberFor<Runtime>> + OnFinalize<BlockNumberFor<Runtime>>,
 {
-	pub fn run_to_block(n: u32, author: Option<AccountId>) {
-		while frame_system::Pallet::<Runtime>::block_number() < n.into() {
-			// Set the new block number and author
-			match author {
-				Some(ref author) => {
-					let pre_digest = Digest {
-						logs: vec![DigestItem::PreRuntime(AURA_ENGINE_ID, author.encode())],
-					};
-					frame_system::Pallet::<Runtime>::reset_events();
-					frame_system::Pallet::<Runtime>::initialize(
-						&(frame_system::Pallet::<Runtime>::block_number() + 1u32.into()),
-						&frame_system::Pallet::<Runtime>::parent_hash(),
-						&pre_digest,
-					);
-				},
-				None => {
-					frame_system::Pallet::<Runtime>::set_block_number(
-						frame_system::Pallet::<Runtime>::block_number() + 1u32.into(),
-					);
-				},
+	pub fn run_to_block(n: u32, author: AccountId) -> HeaderFor<Runtime> {
+		let mut last_header = None;
+		loop {
+			let block_number = frame_system::Pallet::<Runtime>::block_number();
+			if block_number >= n.into() {
+				break
 			}
+			// Set the new block number and author
+
+			// Inherent is not created at every block, don't finalize parachain
+			// system to avoid panicking.
+			let header = frame_system::Pallet::<Runtime>::finalize();
+
+			let pre_digest =
+				Digest { logs: vec![DigestItem::PreRuntime(AURA_ENGINE_ID, author.encode())] };
+			frame_system::Pallet::<Runtime>::reset_events();
+
+			let next_block_number = block_number + 1u32.into();
+			frame_system::Pallet::<Runtime>::initialize(
+				&next_block_number,
+				&header.hash(),
+				&pre_digest,
+			);
+			AllPalletsWithoutSystem::on_initialize(next_block_number);
+			last_header = Some(header);
 		}
+		last_header.expect("run_to_block empty block range")
 	}

 	pub fn root_origin() -> <Runtime as frame_system::Config>::RuntimeOrigin {
@@ -250,7 +265,9 @@ where
 	}
 }

-impl<XcmConfig: xcm_executor::Config> RuntimeHelper<XcmConfig> {
+impl<XcmConfig: xcm_executor::Config, AllPalletsWithoutSystem>
+	RuntimeHelper<XcmConfig, AllPalletsWithoutSystem>
+{
 	pub fn do_transfer(
 		from: MultiLocation,
 		to: MultiLocation,
@@ -267,13 +284,19 @@ impl<XcmConfig: xcm_executor::Config> RuntimeHelper<XcmConfig> {
 	}
 }

-impl<Runtime: pallet_xcm::Config + cumulus_pallet_parachain_system::Config> RuntimeHelper<Runtime> {
+impl<
+		Runtime: pallet_xcm::Config + cumulus_pallet_parachain_system::Config,
+		AllPalletsWithoutSystem,
+	> RuntimeHelper<Runtime, AllPalletsWithoutSystem>
+{
 	pub fn do_teleport_assets<HrmpChannelOpener>(
 		origin: <Runtime as frame_system::Config>::RuntimeOrigin,
 		dest: MultiLocation,
 		beneficiary: MultiLocation,
 		(asset, amount): (MultiLocation, u128),
 		open_hrmp_channel: Option<(u32, u32)>,
+		included_head: HeaderFor<Runtime>,
+		slot_digest: &[u8],
 	) -> DispatchResult
 	where
 		HrmpChannelOpener: frame_support::inherent::ProvideInherent<
@@ -285,6 +308,8 @@ impl<Runtime: pallet_xcm::Config + cumulus_pallet_parachain_system::Config> Runt
 			mock_open_hrmp_channel::<Runtime, HrmpChannelOpener>(
 				source_para_id.into(),
 				target_para_id.into(),
+				included_head,
+				slot_digest,
 			);
 		}

@@ -299,8 +324,10 @@ impl<Runtime: pallet_xcm::Config + cumulus_pallet_parachain_system::Config> Runt
 	}
 }

-impl<Runtime: cumulus_pallet_dmp_queue::Config + cumulus_pallet_parachain_system::Config>
-	RuntimeHelper<Runtime>
+impl<
+		Runtime: cumulus_pallet_dmp_queue::Config + cumulus_pallet_parachain_system::Config,
+		AllPalletsWithoutSystem,
+	> RuntimeHelper<Runtime, AllPalletsWithoutSystem>
 {
 	pub fn execute_as_governance(call: Vec<u8>, require_weight_at_most: Weight) -> Outcome {
 		// prepare xcm as governance will do
@@ -329,7 +356,9 @@ pub enum XcmReceivedFrom {
 	Sibling,
 }

-impl<ParachainSystem: cumulus_pallet_parachain_system::Config> RuntimeHelper<ParachainSystem> {
+impl<ParachainSystem: cumulus_pallet_parachain_system::Config, AllPalletsWithoutSystem>
+	RuntimeHelper<ParachainSystem, AllPalletsWithoutSystem>
+{
 	pub fn xcm_max_weight(from: XcmReceivedFrom) -> Weight {
 		use frame_support::traits::Get;
 		match from {
@@ -339,7 +368,9 @@ impl<ParachainSystem: cumulus_pallet_parachain_system::Config> RuntimeHelper<Par
 	}
 }

-impl<Runtime: frame_system::Config + pallet_xcm::Config> RuntimeHelper<Runtime> {
+impl<Runtime: frame_system::Config + pallet_xcm::Config, AllPalletsWithoutSystem>
+	RuntimeHelper<Runtime, AllPalletsWithoutSystem>
+{
 	pub fn assert_pallet_xcm_event_outcome(
 		unwrap_pallet_xcm_event: &Box<dyn Fn(Vec<u8>) -> Option<pallet_xcm::Event<Runtime>>>,
 		assert_outcome: fn(Outcome),
@@ -357,7 +388,11 @@ impl<Runtime: frame_system::Config + pallet_xcm::Config> RuntimeHelper<Runtime>
 	}
 }

-impl<Runtime: frame_system::Config + cumulus_pallet_xcmp_queue::Config> RuntimeHelper<Runtime> {
+impl<
+		Runtime: frame_system::Config + cumulus_pallet_xcmp_queue::Config,
+		AllPalletsWithoutSystem,
+	> RuntimeHelper<Runtime, AllPalletsWithoutSystem>
+{
 	pub fn xcmp_queue_message_sent(
 		unwrap_xcmp_queue_event: Box<
 			dyn Fn(Vec<u8>) -> Option<cumulus_pallet_xcmp_queue::Event<Runtime>>,
@@ -400,18 +435,35 @@ pub fn assert_total<Fungibles, AccountId>(
 	assert_eq!(Fungibles::active_issuance(asset_id.into()), expected_active_issuance.into());
 }

-/// Helper function which emulates opening HRMP channel which is needed for `XcmpQueue` to pass
+/// Helper function which emulates opening HRMP channel which is needed for `XcmpQueue` to pass.
+///
+/// Calls parachain-system's `create_inherent` in case the channel hasn't been opened before, and
+/// thus requires additional parameters for validating it: latest included parachain head and
+/// parachain AuRa-slot.
+///
+/// AuRa consensus hook expects pallets to be initialized, before calling this function make sure to
+/// `run_to_block` at least once.
 pub fn mock_open_hrmp_channel<
 	C: cumulus_pallet_parachain_system::Config,
 	T: ProvideInherent<Call = cumulus_pallet_parachain_system::Call<C>>,
 >(
 	sender: ParaId,
 	recipient: ParaId,
+	included_head: HeaderFor<C>,
+	mut slot_digest: &[u8],
 ) {
+	const RELAY_CHAIN_SLOT_DURATION: SlotDuration = SlotDuration::from_millis(6000);
+	let slot = Slot::decode(&mut slot_digest).expect("failed to decode digest");
+	// Convert para slot to relay chain.
+	let timestamp = slot.saturating_mul(SLOT_DURATION);
+	let relay_slot = Slot::from_timestamp(timestamp.into(), RELAY_CHAIN_SLOT_DURATION);
+
 	let n = 1_u32;
 	let mut sproof_builder = RelayStateSproofBuilder {
 		para_id: sender,
+		included_para_head: Some(HeadData(included_head.encode())),
 		hrmp_egress_channel_index: Some(vec![recipient]),
+		current_slot: relay_slot,
 		..Default::default()
 	};
 	sproof_builder.hrmp_channels.insert(
@@ -458,8 +510,8 @@ pub fn mock_open_hrmp_channel<
 		.expect("dispatch succeeded");
 }

-impl<HrmpChannelSource: cumulus_primitives_core::XcmpMessageSource>
-	RuntimeHelper<HrmpChannelSource>
+impl<HrmpChannelSource: cumulus_primitives_core::XcmpMessageSource, AllPalletsWithoutSystem>
+	RuntimeHelper<HrmpChannelSource, AllPalletsWithoutSystem>
 {
 	pub fn take_xcm(sent_to_para_id: ParaId) -> Option<VersionedXcm<()>> {
 		match HrmpChannelSource::take_outbound_messages(10)[..] {
@@ -16,10 +16,13 @@

 //! Module contains predefined test-case scenarios for `Runtime` with common functionality.

-use crate::{AccountIdOf, CollatorSessionKeys, ExtBuilder, RuntimeHelper, ValidatorIdOf};
+use crate::{AccountIdOf, CollatorSessionKeys, ExtBuilder, ValidatorIdOf};
 use codec::Encode;
 use frame_support::{assert_ok, traits::Get};

+type RuntimeHelper<Runtime, AllPalletsWithoutSystem = ()> =
+	crate::RuntimeHelper<Runtime, AllPalletsWithoutSystem>;
+
 /// Test-case makes sure that `Runtime` can change storage constant via governance-like call
 pub fn change_storage_constant_by_governance_works<Runtime, StorageConstant, StorageConstantType>(
 	collator_session_key: CollatorSessionKeys<Runtime>,
@@ -63,12 +63,11 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", default-feature
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
 cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
 cumulus-pallet-session-benchmarking = {path = "../../../../pallets/session-benchmarking", default-features = false, version = "3.0.0"}
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
-cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", default-features = false }
 cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
 parachain-info = { path = "../../../../parachains/pallets/parachain-info", default-features = false }
@@ -88,7 +87,6 @@ std = [
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
-	"cumulus-primitives-timestamp/std",
 	"cumulus-primitives-utility/std",
 	"frame-executive/std",
 	"frame-support/std",
@@ -271,6 +271,15 @@ const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts(
 	cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64,
 );

+/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+/// into the relay chain.
+const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+/// How many parachain blocks are processed by the relay chain per parent. Limits the
+/// number of blocks authored per slot.
+const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+/// Relay chain slot duration, in milliseconds.
+const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+
 /// The version information used to identify this runtime when compiled natively.
 #[cfg(feature = "std")]
 pub fn native_version() -> NativeVersion {
@@ -457,6 +466,12 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+	type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+		Runtime,
+		RELAY_CHAIN_SLOT_DURATION_MILLIS,
+		BLOCK_PROCESSING_VELOCITY,
+		UNINCLUDED_SEGMENT_CAPACITY,
+	>;
 }

 impl parachain_info::Config for Runtime {}
@@ -816,31 +831,7 @@ impl_runtime_apis! {
 	}
 }

-struct CheckInherents;
-
-impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
-	fn check_inherents(
-		block: &Block,
-		relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,
-	) -> sp_inherents::CheckInherentsResult {
-		let relay_chain_slot = relay_state_proof
-			.read_slot()
-			.expect("Could not read the relay chain slot from the proof");
-
-		let inherent_data =
-			cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(
-				relay_chain_slot,
-				sp_std::time::Duration::from_secs(6),
-			)
-			.create_inherent_data()
-			.expect("Could not create the timestamp inherent data");
-
-		inherent_data.check_extrinsics(block)
-	}
-}
-
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
-	CheckInherents = CheckInherents,
 }
@@ -44,12 +44,11 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", default-feature
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
 cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
 cumulus-ping = { path = "../../../pallets/ping", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
-cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", default-features = false }
 cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
 parachains-common = { path = "../../../common", default-features = false }
 parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
@@ -58,7 +57,9 @@ parachain-info = { path = "../../../pallets/parachain-info", default-features =
 substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }

 [features]
-default = [ "std" ]
+default = [ 
+	"std",
+]
 std = [
 	"codec/std",
 	"scale-info/std",
@@ -95,7 +96,6 @@ std = [
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-ping/std",
 	"cumulus-primitives-core/std",
-	"cumulus-primitives-timestamp/std",
 	"cumulus-primitives-utility/std",
 	"parachain-info/std",
 	"parachains-common/std",
@@ -144,6 +144,15 @@ const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts(
 	cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64,
 );

+/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+/// into the relay chain.
+const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+/// How many parachain blocks are processed by the relay chain per parent. Limits the
+/// number of blocks authored per slot.
+const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+/// Relay chain slot duration, in milliseconds.
+const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+
 parameter_types! {
 	pub const BlockHashCount: BlockNumber = 250;
 	pub const Version: RuntimeVersion = VERSION;
@@ -271,6 +280,12 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+	type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+		Runtime,
+		RELAY_CHAIN_SLOT_DURATION_MILLIS,
+		BLOCK_PROCESSING_VELOCITY,
+		UNINCLUDED_SEGMENT_CAPACITY,
+	>;
 }

 impl parachain_info::Config for Runtime {}
@@ -781,31 +796,7 @@ impl_runtime_apis! {
 	}
 }

-struct CheckInherents;
-
-impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
-	fn check_inherents(
-		block: &Block,
-		relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,
-	) -> sp_inherents::CheckInherentsResult {
-		let relay_chain_slot = relay_state_proof
-			.read_slot()
-			.expect("Could not read the relay chain slot from the proof");
-
-		let inherent_data =
-			cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(
-				relay_chain_slot,
-				sp_std::time::Duration::from_secs(6),
-			)
-			.create_inherent_data()
-			.expect("Could not create the timestamp inherent data");
-
-		inherent_data.check_extrinsics(block)
-	}
-}
-
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
-	CheckInherents = CheckInherents,
 }