From e7220d01c1fa9bb7b3039853afdf5a8eb020cc62 Mon Sep 17 00:00:00 2001
From: librelois <c@elo.tf>
Date: Sat, 8 Jan 2022 22:28:32 +0100
Subject: [PATCH] fixed pallets index

---
 runtime/g1/src/lib.rs    | 40 ++++++++++++++++++++++++++++------------
 runtime/gdev/src/lib.rs  | 38 +++++++++++++++++++++++++++-----------
 runtime/gtest/src/lib.rs | 40 ++++++++++++++++++++++++++++------------
 3 files changed, 83 insertions(+), 35 deletions(-)

diff --git a/runtime/g1/src/lib.rs b/runtime/g1/src/lib.rs
index 225834450..88c2eaf38 100644
--- a/runtime/g1/src/lib.rs
+++ b/runtime/g1/src/lib.rs
@@ -156,18 +156,34 @@ construct_runtime!(
         NodeBlock = common_runtime::Block,
         UncheckedExtrinsic = UncheckedExtrinsic
     {
-        System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-        RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage},
-        Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
-        Aura: pallet_aura::{Pallet, Config<T>},
-        Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event},
-        Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-        TransactionPayment: pallet_transaction_payment::{Pallet, Storage},
-        Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>},
-        UdAccountsStorage: pallet_ud_accounts_storage::{Pallet, Config<T>, Storage},
-        UniversalDividend: pallet_universal_dividend::{Pallet, Config<T>, Storage, Event<T>},
-        Identity: pallet_identity::{Pallet, Call, Config<T>, Storage, Event<T>},
-        StrongCert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>},
+        // Basic stuff
+        System: frame_system::{Pallet, Call, Config, Storage, Event<T>} = 0,
+        //Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 1,
+
+        // Must be before session.
+        Aura: pallet_aura::{Pallet, Config<T>} = 2,
+
+        Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3,
+        Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 5,
+        TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 32,
+
+        // Consensus support.
+        Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event} = 10,
+        RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 11,
+
+        // Governance stuff.
+        Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>} = 20,
+
+        // Cunning utilities.
+        //Utility: pallet_utility::{Pallet, Call, Event} = 30,
+
+        // Universal dividend.
+        UdAccountsStorage: pallet_ud_accounts_storage::{Pallet, Config<T>, Storage} = 40,
+        UniversalDividend: pallet_universal_dividend::{Pallet, Config<T>, Storage, Event<T>} = 41,
+
+        // Web Of Trust
+        Identity: pallet_identity::{Pallet, Call, Config<T>, Storage, Event<T>} = 50,
+        StrongCert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 51,
     }
 );
 
diff --git a/runtime/gdev/src/lib.rs b/runtime/gdev/src/lib.rs
index 5b3bb50ea..8ce521229 100644
--- a/runtime/gdev/src/lib.rs
+++ b/runtime/gdev/src/lib.rs
@@ -153,17 +153,33 @@ construct_runtime!(
         NodeBlock = common_runtime::Block,
         UncheckedExtrinsic = UncheckedExtrinsic
     {
-        System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-        RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage},
-        Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event},
-        Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-        Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>},
-        TransactionPayment: pallet_transaction_payment::{Pallet, Storage},
-        Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>},
-        UdAccountsStorage: pallet_ud_accounts_storage::{Pallet, Config<T>, Storage},
-        UniversalDividend: pallet_universal_dividend::{Pallet, Config<T>, Storage, Event<T>},
-        Identity: pallet_identity::{Pallet, Call, Config<T>, Storage, Event<T>},
-        StrongCert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>},
+        // Basic stuff
+        System: frame_system::{Pallet, Call, Config, Storage, Event<T>} = 0,
+        //Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 1,
+
+        Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 5,
+        TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 32,
+
+        // Consensus support.
+        Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event} = 10,
+        RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 11,
+
+        // Governance stuff.
+        Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>} = 20,
+
+        // Cunning utilities.
+        //Utility: pallet_utility::{Pallet, Call, Event} = 30,
+
+        // Universal dividend.
+        UdAccountsStorage: pallet_ud_accounts_storage::{Pallet, Config<T>, Storage} = 40,
+        UniversalDividend: pallet_universal_dividend::{Pallet, Config<T>, Storage, Event<T>} = 41,
+
+        // Web Of Trust
+        Identity: pallet_identity::{Pallet, Call, Config<T>, Storage, Event<T>} = 50,
+        StrongCert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 51,
+
+        // Multisig dispatch.
+        Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 60,
     }
 );
 
diff --git a/runtime/gtest/src/lib.rs b/runtime/gtest/src/lib.rs
index c6af1214f..6d6f0dbed 100644
--- a/runtime/gtest/src/lib.rs
+++ b/runtime/gtest/src/lib.rs
@@ -156,18 +156,34 @@ construct_runtime!(
         NodeBlock = common_runtime::Block,
         UncheckedExtrinsic = UncheckedExtrinsic
     {
-        System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-        RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage},
-        Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
-        Aura: pallet_aura::{Pallet, Config<T>},
-        Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event},
-        Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-        TransactionPayment: pallet_transaction_payment::{Pallet, Storage},
-        Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>},
-        UdAccountsStorage: pallet_ud_accounts_storage::{Pallet, Config<T>, Storage},
-        UniversalDividend: pallet_universal_dividend::{Pallet, Config<T>, Storage, Event<T>},
-        Identity: pallet_identity::{Pallet, Call, Config<T>, Storage, Event<T>},
-        StrongCert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>},
+        // Basic stuff
+        System: frame_system::{Pallet, Call, Config, Storage, Event<T>} = 0,
+        //Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 1,
+
+        // Must be before session.
+        Aura: pallet_aura::{Pallet, Config<T>} = 2,
+
+        Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3,
+        Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 5,
+        TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 32,
+
+        // Consensus support.
+        Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event} = 10,
+        RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 11,
+
+        // Governance stuff.
+        Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>} = 20,
+
+        // Cunning utilities.
+        //Utility: pallet_utility::{Pallet, Call, Event} = 30,
+
+        // Universal dividend.
+        UdAccountsStorage: pallet_ud_accounts_storage::{Pallet, Config<T>, Storage} = 40,
+        UniversalDividend: pallet_universal_dividend::{Pallet, Config<T>, Storage, Event<T>} = 41,
+
+        // Web Of Trust
+        Identity: pallet_identity::{Pallet, Call, Config<T>, Storage, Event<T>} = 50,
+        StrongCert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 51,
     }
 );
 
-- 
GitLab