updates to chain spec and github action

Author: Max Gravitt

.github/workflows/check.yml

@@ -4,9 +4,9 @@ name: Check Set-Up & Build
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [ master ]
+    branches: [ master, develop ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, develop ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -38,7 +38,7 @@ jobs:
         run: |
           SKIP_WASM_BUILD=1 cargo check --release
 
-      - name: Check Build for Benchmarking
-        run: >
-          pushd node &&
-          cargo check --features=runtime-benchmarks --release
+      # - name: Check Build for Benchmarking
+      #   run: >
+      #     pushd node &&
+      #     cargo check --features=runtime-benchmarks --release

collator/src/chain_spec/hashed.rs

@@ -1,12 +1,13 @@
 use sc_service::ChainType;
 use sp_core::sr25519;
+use hex_literal::hex;
 
 use super::{
 	get_account_id_from_seed, get_collator_keys_from_seed, session_keys, SAFE_XCM_VERSION, Extensions,
 };
 
 use cumulus_primitives_core::ParaId;
-use hashed_parachain_runtime::{AccountId, AuraId, EXISTENTIAL_DEPOSIT};
+use hashed_parachain_runtime::{AccountId, AuraId, SudoConfig, EXISTENTIAL_DEPOSIT};
 
 /// Specialized `ChainSpec` for Hashed Network
 pub type HashedChainSpec =
@@ -53,6 +54,7 @@ pub fn get_chain_spec() -> HashedChainSpec {
 					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
 					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
 				],
+				hex!["f83a0218e100ce3ede12c5d403116ef034124c62b181fff6935403cea9396d2f"].into(), 
 				1000.into(),
 			)
 		},
@@ -71,6 +73,7 @@ pub fn get_chain_spec() -> HashedChainSpec {
 fn hashed_genesis(
 	invulnerables: Vec<(AccountId, AuraId)>,
 	endowed_accounts: Vec<AccountId>,
+	root_key: AccountId,
 	id: ParaId,
 ) -> hashed_parachain_runtime::GenesisConfig {
 	hashed_parachain_runtime::GenesisConfig {
@@ -82,6 +85,7 @@ fn hashed_genesis(
 		balances: hashed_parachain_runtime::BalancesConfig {
 			balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(),
 		},
+		sudo: SudoConfig { key: Some(root_key) },
 		council: Default::default(),
 		treasury: Default::default(),
 		parachain_info: hashed_parachain_runtime::ParachainInfoConfig { parachain_id: id },

collator/src/chain_spec/luhn.rs

@@ -7,7 +7,7 @@ use super::{
 };
 
 use cumulus_primitives_core::ParaId;
-use hashed_parachain_runtime::{AccountId, AuraId, Balance, CouncilConfig, SudoConfig, EXISTENTIAL_DEPOSIT, constants::DOLLARS};
+use hashed_parachain_runtime::{AccountId, AuraId, CouncilConfig, SudoConfig, EXISTENTIAL_DEPOSIT};
 
 /// Specialized `ChainSpec` for MD5 Network.
 pub type Md5ChainSpec =
@@ -82,11 +82,6 @@ fn md5_genesis(
 	id: ParaId,
 ) -> hashed_parachain_runtime::GenesisConfig {
 
-	let num_endowed_accounts = endowed_accounts.len();
-
-	const ENDOWMENT: Balance = 10_000_000 * DOLLARS;
-	const STASH: Balance = ENDOWMENT / 1000;
-
 	hashed_parachain_runtime::GenesisConfig {
 		system: hashed_parachain_runtime::SystemConfig {
 			code: hashed_parachain_runtime::WASM_BINARY
@@ -100,8 +95,8 @@ fn md5_genesis(
 		treasury: Default::default(),
 		council: CouncilConfig {
 			members: vec![
-				get_account_id_from_seed::<sr25519::Public>("Alice"),
-				get_account_id_from_seed::<sr25519::Public>("Bob"),
+				hex!["f83a0218e100ce3ede12c5d403116ef034124c62b181fff6935403cea9396d2f"].into(),
+				hex!["4a70d789b0f0897e0880e8d3d532187ac77cbda04228cfadf8bededdd0b1005e"].into(),
 			],
 			phantom: Default::default(),
 		},

collator/src/chain_spec/md5.rs

@@ -2,13 +2,12 @@ use cumulus_primitives_core::ParaId;
 use serde::{Deserialize, Serialize};
 use sp_core::{sr25519, Pair, Public};
 
-use hashed_parachain_runtime::{AccountId, AuraId, Signature, EXISTENTIAL_DEPOSIT};
+use hashed_parachain_runtime::{AccountId, AuraId, Signature, SudoConfig, EXISTENTIAL_DEPOSIT};
 use sc_chain_spec::{ChainSpecExtension};
 use sc_service::ChainType;
 use sp_runtime::traits::{IdentifyAccount, Verify};
 
 pub mod hashed;
-pub mod luhn;
 pub mod md5;
 
 /// Specialized `ChainSpec` for the normal parachain runtime.
@@ -116,6 +115,7 @@ pub fn development_config() -> ChainSpec {
 					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
 					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
 				],
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
 				1000.into(),
 			)
 		},
@@ -171,6 +171,7 @@ pub fn local_testnet_config() -> ChainSpec {
 					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
 					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
 				],
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
 				1000.into(),
 			)
 		},
@@ -195,6 +196,7 @@ pub fn local_testnet_config() -> ChainSpec {
 fn testnet_genesis(
 	invulnerables: Vec<(AccountId, AuraId)>,
 	endowed_accounts: Vec<AccountId>,
+	root_key: AccountId,
 	id: ParaId,
 ) -> hashed_parachain_runtime::GenesisConfig {
 	hashed_parachain_runtime::GenesisConfig {
@@ -206,6 +208,7 @@ fn testnet_genesis(
 		balances: hashed_parachain_runtime::BalancesConfig {
 			balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(),
 		},
+		sudo: SudoConfig { key: Some(root_key) },
 		council: Default::default(),
 		treasury: Default::default(),
 		parachain_info: hashed_parachain_runtime::ParachainInfoConfig { parachain_id: id },

collator/src/chain_spec/mod.rs

@@ -27,7 +27,7 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
 	Ok(match id {
 		"dev" => Box::new(chain_spec::development_config()),
 		"hashed" => Box::new(chain_spec::hashed::get_chain_spec()),
-		"luhn" => Box::new(chain_spec::luhn::get_chain_spec()),
+		// "luhn" => Box::new(chain_spec::luhn::get_chain_spec()),
 		"md5" => Box::new(chain_spec::md5::get_chain_spec()),
 		"" | "local" => Box::new(chain_spec::local_testnet_config()),
 		path => Box::new(chain_spec::ChainSpec::from_json_file(std::path::PathBuf::from(path))?),