From e89e45974f861b1c78af18425e19ebc91cf0543a Mon Sep 17 00:00:00 2001 From: martinfridrich Date: Mon, 20 Feb 2023 17:12:55 +0100 Subject: [PATCH] Scheduler pallet moved after ParachainSystem --- Cargo.lock | 4 ++-- runtime/basilisk/Cargo.toml | 2 +- runtime/basilisk/src/lib.rs | 8 ++++++-- runtime/testing-basilisk/Cargo.toml | 2 +- runtime/testing-basilisk/src/lib.rs | 8 ++++++-- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f1b76555be1..8c8a19fcd88 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -495,7 +495,7 @@ dependencies = [ [[package]] name = "basilisk-runtime" -version = "91.0.0" +version = "92.0.0" dependencies = [ "common-runtime", "cumulus-pallet-aura-ext", @@ -11716,7 +11716,7 @@ dependencies = [ [[package]] name = "testing-basilisk-runtime" -version = "91.0.0" +version = "92.0.0" dependencies = [ "common-runtime", "cumulus-pallet-aura-ext", diff --git a/runtime/basilisk/Cargo.toml b/runtime/basilisk/Cargo.toml index 4d45268f1ab..b937a154e58 100644 --- a/runtime/basilisk/Cargo.toml +++ b/runtime/basilisk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "basilisk-runtime" -version = "91.0.0" +version = "92.0.0" authors = ["GalacticCouncil"] edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" diff --git a/runtime/basilisk/src/lib.rs b/runtime/basilisk/src/lib.rs index c2aa7c7f0e0..b5340d1f2df 100644 --- a/runtime/basilisk/src/lib.rs +++ b/runtime/basilisk/src/lib.rs @@ -111,7 +111,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("basilisk"), impl_name: create_runtime_str!("basilisk"), authoring_version: 1, - spec_version: 91, + spec_version: 92, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -946,7 +946,7 @@ construct_runtime!( TransactionPayment: pallet_transaction_payment exclude_parts { Config } = 3, Treasury: pallet_treasury = 4, Utility: pallet_utility = 5, - Scheduler: pallet_scheduler = 6, + //NOTE: 6 - is used by Scheduler which must be after cumulus_pallet_parachain_system Democracy: pallet_democracy exclude_parts { Config } = 7, Elections: pallet_elections_phragmen = 8, Council: pallet_collective:: = 9, @@ -969,6 +969,10 @@ construct_runtime!( ParachainSystem: cumulus_pallet_parachain_system exclude_parts { Config } = 50, ParachainInfo: parachain_info = 51, + //NOTE: Scheduler must be after ParachainSystem otherwise RelayChainBlockNumberProvider + //will return 0 as current block number when used with Scheduler(democracy). + Scheduler: pallet_scheduler = 6, + PolkadotXcm: pallet_xcm = 52, CumulusXcm: cumulus_pallet_xcm = 53, XcmpQueue: cumulus_pallet_xcmp_queue exclude_parts { Call } = 54, diff --git a/runtime/testing-basilisk/Cargo.toml b/runtime/testing-basilisk/Cargo.toml index 23e717a4807..3f2cc42de30 100644 --- a/runtime/testing-basilisk/Cargo.toml +++ b/runtime/testing-basilisk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "testing-basilisk-runtime" -version = "91.0.0" +version = "92.0.0" authors = ["GalacticCouncil"] edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" diff --git a/runtime/testing-basilisk/src/lib.rs b/runtime/testing-basilisk/src/lib.rs index f7d901f8fa0..17cc1139410 100644 --- a/runtime/testing-basilisk/src/lib.rs +++ b/runtime/testing-basilisk/src/lib.rs @@ -129,7 +129,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("testing-basilisk"), impl_name: create_runtime_str!("testing-basilisk"), authoring_version: 1, - spec_version: 91, + spec_version: 92, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -911,7 +911,7 @@ construct_runtime!( TransactionPayment: pallet_transaction_payment exclude_parts { Config } = 3, Treasury: pallet_treasury = 4, Utility: pallet_utility = 5, - Scheduler: pallet_scheduler = 6, + //NOTE: 6 - is used by Scheduler which must be after cumulus_pallet_parachain_system Democracy: pallet_democracy exclude_parts { Config } = 7, Elections: pallet_elections_phragmen = 8, Council: pallet_collective:: = 9, @@ -934,6 +934,10 @@ construct_runtime!( ParachainSystem: cumulus_pallet_parachain_system exclude_parts { Config } = 50, ParachainInfo: parachain_info = 51, + //NOTE: Scheduler must be after ParachainSystem otherwise RelayChainBlockNumberProvider + //will return 0 as current block number when used with Scheduler(democracy). + Scheduler: pallet_scheduler = 6, + PolkadotXcm: pallet_xcm = 52, CumulusXcm: cumulus_pallet_xcm = 53, XcmpQueue: cumulus_pallet_xcmp_queue exclude_parts { Call } = 54,