feat: Restore Substrate pallets for on-chain upgrade that were temporarily removed to minimise genesis runtime size for Rococo launch

Cargo.toml

@@ -4,6 +4,6 @@ panic = 'unwind'
 [workspace]
 members = [
     'node',
-    'pallets/primitives',
+    'pallets/*',
     'runtime',
 ]

node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = 'datahighway-collator'
-version = '3.4.0'
+version = '3.5.0'
 authors = ['Anonymous']
 description = 'DataHighway parachain collator FRAME-based Substrate Node based upon the Cumulus.'
 license = 'Unlicense'
@@ -17,7 +17,7 @@ path = 'src/main.rs'
 derive_more = '0.99.2'
 log = '0.4.14'
 codec = { version = '3.1.2', package = 'parity-scale-codec', default-features = false, features = ['derive', 'max-encoded-len'] }
-clap = { version = '3.1', features = ['derive'] }
+clap = { version = '3.1.6', features = ['derive'] }
 serde = { version = '1.0.136', features = ['derive'] }
 serde_json = '1.0.74'
 hex = { version = '0.4.3', default_features = false, features = ['alloc'] }
@@ -26,7 +26,7 @@ hex-literal = '0.3.4'
 jsonrpc-core = '18.0.0'
 
 # Local
-datahighway-parachain-runtime = { path = '../runtime', version = '3.4.0' }
+datahighway-parachain-runtime = { path = '../runtime', version = '3.5.0' }
 module-primitives = { version = '3.0.6', default-features = false, path = '../pallets/primitives' }
 
 # Substrate
@@ -69,7 +69,7 @@ sp-tracing = { git = 'https://github.com/paritytech/substrate', branch = 'polkad
 sp-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.18' }
 substrate-frame-rpc-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.18' }
 substrate-prometheus-endpoint = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.18' }
-try-runtime-cli = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.18' }
+try-runtime-cli = { git = 'https://github.com/paritytech/substrate', optional = true, branch = 'polkadot-v0.9.18' }
 
 # Polkadot
 polkadot-cli = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.18' }
@@ -98,9 +98,14 @@ futures = { version = '0.3.19' }
 substrate-build-script-utils = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.18' }
 
 [features]
+default = []
 runtime-benchmarks = [
     'datahighway-parachain-runtime/runtime-benchmarks',
     'polkadot-cli/runtime-benchmarks',
-
 ]
-try-runtime = [ 'datahighway-parachain-runtime/try-runtime' ]
+# Enable features that allow the runtime to be tried and debugged. Name might be subject to change
+# in the near future.
+try-runtime = [
+    'datahighway-parachain-runtime/try-runtime',
+    'try-runtime-cli',
+]

node/src/chain_spec.rs

@@ -5,12 +5,17 @@ use datahighway_parachain_runtime::{
     AuraConfig,
     BalancesConfig,
     CollatorSelectionConfig,
+    CouncilConfig,
+    DemocracyConfig,
+    ElectionsConfig,
     GenesisConfig,
     IndicesConfig,
     SessionConfig,
     SessionKeys,
     SudoConfig,
     SystemConfig,
+    TechnicalCommitteeConfig,
+    TechnicalMembershipConfig,
     TransactionPaymentConfig,
     TreasuryConfig,
 };
@@ -1218,8 +1223,28 @@ fn spreehafen_testnet_genesis(
                 })
                 .collect(),
         },
+        democracy: DemocracyConfig::default(),
+        elections: ElectionsConfig {
+            members: endowed_accounts
+                .iter()
+                .take((num_endowed_accounts + 1) / 2)
+                .cloned()
+                .map(|member| (member, INITIAL_ENDOWMENT))
+                .collect(),
+        },
+        // https://github.com/paritytech/substrate/commit/d6ac9f551b71d9c7b69afcebfc68ace310ef74ee
+        // collective_Instance1
+        council: CouncilConfig::default(),
+        // collective_Instance2
+        technical_committee: TechnicalCommitteeConfig::default(),
         // it will panic if we pass anything to Aura. Session will take care of this instead.
         aura: Default::default(),
+        // pallet_membership_Instance1
+        technical_membership: TechnicalMembershipConfig {
+            members: vec![root_key.clone()],
+            phantom: Default::default(),
+        },
+        assets: Default::default(),
         transaction_payment: TransactionPaymentConfig::default(),
         aura_ext: Default::default(),
         parachain_system: Default::default(),
@@ -1277,8 +1302,28 @@ fn testnet_genesis(
                 })
                 .collect(),
         },
+        democracy: DemocracyConfig::default(),
+        elections: ElectionsConfig {
+            members: endowed_accounts
+                .iter()
+                .take((num_endowed_accounts + 1) / 2)
+                .cloned()
+                .map(|member| (member, INITIAL_ENDOWMENT))
+                .collect(),
+        },
+        // https://github.com/paritytech/substrate/commit/d6ac9f551b71d9c7b69afcebfc68ace310ef74ee
+        // collective_Instance1
+        council: CouncilConfig::default(),
+        // collective_Instance2
+        technical_committee: TechnicalCommitteeConfig::default(),
         // it will panic if we pass anything to Aura. Session will take care of this instead.
         aura: Default::default(),
+        // pallet_membership_Instance1
+        technical_membership: TechnicalMembershipConfig {
+            members: vec![root_key.clone()],
+            phantom: Default::default(),
+        },
+        assets: Default::default(),
         transaction_payment: TransactionPaymentConfig::default(),
         aura_ext: Default::default(),
         parachain_system: Default::default(),
@@ -1336,8 +1381,28 @@ fn dev_genesis(
                 })
                 .collect(),
         },
+        democracy: DemocracyConfig::default(),
+        elections: ElectionsConfig {
+            members: endowed_accounts
+                .iter()
+                .take((num_endowed_accounts + 1) / 2)
+                .cloned()
+                .map(|member| (member, INITIAL_ENDOWMENT))
+                .collect(),
+        },
+        // https://github.com/paritytech/substrate/commit/d6ac9f551b71d9c7b69afcebfc68ace310ef74ee
+        // collective_Instance1
+        council: CouncilConfig::default(),
+        // collective_Instance2
+        technical_committee: TechnicalCommitteeConfig::default(),
         // it will panic if we pass anything to Aura. Session will take care of this instead.
         aura: Default::default(),
+        // pallet_membership_Instance1
+        technical_membership: TechnicalMembershipConfig {
+            members: vec![root_key.clone()],
+            phantom: Default::default(),
+        },
+        assets: Default::default(),
         transaction_payment: TransactionPaymentConfig::default(),
         aura_ext: Default::default(),
         parachain_system: Default::default(),
@@ -1406,8 +1471,28 @@ fn baikal_testnet_genesis(
                 })
                 .collect(),
         },
+        democracy: DemocracyConfig::default(),
+        elections: ElectionsConfig {
+            members: endowed_accounts
+                .iter()
+                .take((num_endowed_accounts + 1) / 2)
+                .cloned()
+                .map(|member| (member, INITIAL_ENDOWMENT))
+                .collect(),
+        },
+        // https://github.com/paritytech/substrate/commit/d6ac9f551b71d9c7b69afcebfc68ace310ef74ee
+        // collective_Instance1
+        council: CouncilConfig::default(),
+        // collective_Instance2
+        technical_committee: TechnicalCommitteeConfig::default(),
         // it will panic if we pass anything to Aura. Session will take care of this instead.
         aura: Default::default(),
+        // pallet_membership_Instance1
+        technical_membership: TechnicalMembershipConfig {
+            members: vec![root_key.clone()],
+            phantom: Default::default(),
+        },
+        assets: Default::default(),
         transaction_payment: TransactionPaymentConfig::default(),
         aura_ext: Default::default(),
         parachain_system: Default::default(),
@@ -1465,8 +1550,28 @@ fn tanganika_testnet_genesis(
                 })
                 .collect(),
         },
+        democracy: DemocracyConfig::default(),
+        elections: ElectionsConfig {
+            members: endowed_accounts
+                .iter()
+                .take((num_endowed_accounts + 1) / 2)
+                .cloned()
+                .map(|member| (member, INITIAL_ENDOWMENT))
+                .collect(),
+        },
+        // https://github.com/paritytech/substrate/commit/d6ac9f551b71d9c7b69afcebfc68ace310ef74ee
+        // collective_Instance1
+        council: CouncilConfig::default(),
+        // collective_Instance2
+        technical_committee: TechnicalCommitteeConfig::default(),
         // it will panic if we pass anything to Aura. Session will take care of this instead.
         aura: Default::default(),
+        // pallet_membership_Instance1
+        technical_membership: TechnicalMembershipConfig {
+            members: vec![root_key.clone()],
+            phantom: Default::default(),
+        },
+        assets: Default::default(),
         transaction_payment: TransactionPaymentConfig::default(),
         aura_ext: Default::default(),
         parachain_system: Default::default(),

node/src/command.rs

@@ -280,7 +280,6 @@ pub fn run() -> Result<()> {
                 let task_manager =
                     sc_service::TaskManager::new(config.tokio_handle.clone(), registry)
                         .map_err(|e| sc_cli::Error::Service(sc_service::Error::Prometheus(e)))?;
-
                 Ok((cmd.run::<Block, ExecutorDispatch>(config), task_manager))
             })
         },