From 5c8690efb0c86d50879b3f623ec7107e2a70abae Mon Sep 17 00:00:00 2001
From: Martin <martin.hloska@gmail.com>
Date: Tue, 14 May 2024 14:44:46 +0200
Subject: [PATCH] fix: runtime pallet order

---
 Cargo.lock                             |  2 +-
 launch-configs/chopsticks/basilisk.yml | 11 +++++++++--
 runtime/basilisk/Cargo.toml            |  2 +-
 runtime/basilisk/src/lib.rs            | 14 ++++++--------
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c1ce5033551..1a186541b8d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -953,7 +953,7 @@ dependencies = [
 
 [[package]]
 name = "basilisk-runtime"
-version = "114.0.0"
+version = "115.0.0"
 dependencies = [
  "cumulus-pallet-aura-ext",
  "cumulus-pallet-parachain-system",
diff --git a/launch-configs/chopsticks/basilisk.yml b/launch-configs/chopsticks/basilisk.yml
index 478fa70fa96..a75c84942db 100644
--- a/launch-configs/chopsticks/basilisk.yml
+++ b/launch-configs/chopsticks/basilisk.yml
@@ -3,6 +3,7 @@ mock-signature-host: true
 #block: 2734198
 db: ./db.sqlite
 wasm-override: ./basilisk_runtime.compact.compressed.wasm
+#runtime-log-level: 5
 
 import-storage:
   System:
@@ -10,8 +11,9 @@ import-storage:
       -
         -
           - 5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY
-        - data:
-            free: 1000000000000000
+        - providers: 1
+          data:
+            free: "1000000000000000000000"
   Tokens:
     Accounts:
       -
@@ -19,6 +21,11 @@ import-storage:
           - 5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY
           - 2
         - free: '100000000000000000000'
+      -
+        -
+          - 5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY
+          - 1
+        - free: '100000000000000000000'
   Council:
     Members: [5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY]
   TechnicalCommittee:
diff --git a/runtime/basilisk/Cargo.toml b/runtime/basilisk/Cargo.toml
index 9a515dd93d2..2adee973163 100644
--- a/runtime/basilisk/Cargo.toml
+++ b/runtime/basilisk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "basilisk-runtime"
-version = "114.0.0"
+version = "115.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 370e9ddf271..4a2b49217d4 100644
--- a/runtime/basilisk/src/lib.rs
+++ b/runtime/basilisk/src/lib.rs
@@ -101,7 +101,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("basilisk"),
 	impl_name: create_runtime_str!("basilisk"),
 	authoring_version: 1,
-	spec_version: 114,
+	spec_version: 115,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -167,6 +167,8 @@ construct_runtime!(
 		Timestamp: pallet_timestamp = 1,
 		Balances: pallet_balances = 2,
 		TransactionPayment: pallet_transaction_payment exclude_parts { Config } = 3,
+		// due to multi payment pallet prices, this needs to be initialized at the very beginning
+		MultiTransactionPayment: pallet_transaction_multi_payment = 106,
 		Treasury: pallet_treasury = 4,
 		Utility: pallet_utility = 5,
 		//NOTE: 6 - is used by Scheduler which must be after cumulus_pallet_parachain_system
@@ -190,14 +192,12 @@ construct_runtime!(
 		Multisig: pallet_multisig = 22,
 		StateTrieMigration: pallet_state_trie_migration = 23,
 
-		// Parachain and XCM - starts at index 50
+		// The order of next 3 pallest is important
+		RelayChainInfo: pallet_relaychain_info = 108,
+		Scheduler: pallet_scheduler = 6,
 		ParachainSystem: cumulus_pallet_parachain_system exclude_parts { Config } = 50,
 		ParachainInfo: staging_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,
@@ -210,8 +210,6 @@ construct_runtime!(
 		Duster: pallet_duster = 102,
 		LBP: pallet_lbp = 104,
 		NFT: pallet_nft = 105,
-		MultiTransactionPayment: pallet_transaction_multi_payment = 106,
-		RelayChainInfo: pallet_relaychain_info = 108,
 		Marketplace: pallet_marketplace = 109,
 		TransactionPause: pallet_transaction_pause = 110,
 		Router: pallet_route_executor = 111,