Merge pull request #52 from hicommonwealth/drew.spec

Drew.spec: Spec changes, new identity logic, and version bump

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "edgeware"
-version = "0.1.5"
+version = "0.1.6"
 authors = ["Commonwealth Labs <[email protected]>"]
 build = "build.rs"
 

node/src/chain_spec.rs

@@ -33,46 +33,45 @@ const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
 pub type ChainSpec = substrate_service::ChainSpec<GenesisConfig>;
 
 pub fn edgeware_testnet_config() -> ChainSpec {
-	match ChainSpec::from_json_file(std::path::PathBuf::from("testnets/v0.1.5/edgeware.json")) {
+	match ChainSpec::from_json_file(std::path::PathBuf::from("testnets/v0.1.6/edgeware.json")) {
 		Ok(spec) => spec,
 		Err(e) => panic!(e),
 	}
 }
 
 pub fn edgeware_config_gensis() -> GenesisConfig {
 	testnet_genesis(
-		vec![(
-			hex!["7ef7449d0d0224e0d9cabc66fe29aeff73dc923e10c8e199cb5aab0afb69d0e5"].into(),
-			hex!["be3e3264a06a61d9c5c8055807bce41a71e2497257ee72f8745d251429014a2b"].into(),
-			hex!["619473a7bd9f608bfdfa93582b53cc8867245e91c9fe5026fee379d47c94dd09"].into(),
-		), (
-			hex!["ab66295ab4f3015a6108e391181f8ac13e40b437cedfa87983688c7e5065bb70"].into(),
-			hex!["01489c5e4c7d0cc8af9fba72c72b95785357e2db50fd8c5ae907ac799a66d9dd"].into(),
-			hex!["e48e7a2b1c381a7a0821d61791daaa695bfd070815dd9fe02b51f60f81f0e034"].into(),
-		), (
-			hex!["8510ba4363ac9a70b34fd586a5a6a1335e3484ec4767617f49db060865e899c4"].into(),
-			hex!["83191772bc526b7625ee6ca197a63f984ca10afc2231ad87865d71a6fda0b84d"].into(),
-			hex!["d04fa941c18fef1461da631b36766e410ef0017817a06f5c8728e3b23d87f660"].into(),
-		), (
-			hex!["b30d0b164273c00050d4c2e1eb1cc8be6ade9ac9078abbb692c649c81b4c21b4"].into(),
-			hex!["d3739f9e24a0644f34b1301bb490745a1afdfa45bd1c699fbcba0a6723ecc87c"].into(),
-			hex!["cf77ff32f8728fd08e9bbd70b0161ba979c55e166de193c17c35a328ecf5cdc2"].into(),
-		)],
-		hex!["7ef7449d0d0224e0d9cabc66fe29aeff73dc923e10c8e199cb5aab0afb69d0e5"].into(),
+		vec![
+			get_authority_keys_from_seed("A"),
+			get_authority_keys_from_seed("B"),
+			get_authority_keys_from_seed("C"),
+			get_authority_keys_from_seed("D"),
+		],
+		get_account_id_from_seed("Alice").into(),
 		Some(vec![
-			hex!["7ef7449d0d0224e0d9cabc66fe29aeff73dc923e10c8e199cb5aab0afb69d0e5"].into(),
-			hex!["be3e3264a06a61d9c5c8055807bce41a71e2497257ee72f8745d251429014a2b"].into(),
-			hex!["619473a7bd9f608bfdfa93582b53cc8867245e91c9fe5026fee379d47c94dd09"].into(),
-			hex!["ab66295ab4f3015a6108e391181f8ac13e40b437cedfa87983688c7e5065bb70"].into(),
-			hex!["01489c5e4c7d0cc8af9fba72c72b95785357e2db50fd8c5ae907ac799a66d9dd"].into(),
-			hex!["e48e7a2b1c381a7a0821d61791daaa695bfd070815dd9fe02b51f60f81f0e034"].into(),
-			hex!["8510ba4363ac9a70b34fd586a5a6a1335e3484ec4767617f49db060865e899c4"].into(),
-			hex!["83191772bc526b7625ee6ca197a63f984ca10afc2231ad87865d71a6fda0b84d"].into(),
-			hex!["d04fa941c18fef1461da631b36766e410ef0017817a06f5c8728e3b23d87f660"].into(),
-			hex!["b30d0b164273c00050d4c2e1eb1cc8be6ade9ac9078abbb692c649c81b4c21b4"].into(),
-			hex!["d3739f9e24a0644f34b1301bb490745a1afdfa45bd1c699fbcba0a6723ecc87c"].into(),
-			hex!["cf77ff32f8728fd08e9bbd70b0161ba979c55e166de193c17c35a328ecf5cdc2"].into(),
-		])
+			get_account_id_from_seed("Alice"),
+			get_account_id_from_seed("Bob"),
+			get_account_id_from_seed("Charlie"),
+			get_account_id_from_seed("Dave"),
+			get_account_id_from_seed("Eve"),
+			get_account_id_from_seed("A"),
+			get_account_id_from_seed("B"),
+			get_account_id_from_seed("C"),
+			get_account_id_from_seed("D"),
+			get_account_id_from_seed("E"),
+			get_account_id_from_seed("F"),
+			get_account_id_from_seed("G"),
+			get_account_id_from_seed("H"),
+			get_account_id_from_seed("I"),
+			get_account_id_from_seed("J"),
+			get_account_id_from_seed("K"),
+			get_account_id_from_seed("L"),
+			get_account_id_from_seed("M"),
+			get_account_id_from_seed("N"),
+			get_account_id_from_seed("O"),
+			get_account_id_from_seed("P"),
+			get_account_id_from_seed("Q"),
+		]),
 	)
 }
 

node/src/cli.rs

@@ -49,7 +49,6 @@ impl ChainSpec {
 	}
 
 	pub(crate) fn from(s: &str) -> Option<Self> {
-		println!("Network {:?}", s);
 		match s {
 			"dev" => Some(ChainSpec::Development),
 			"local" => Some(ChainSpec::LocalTestnet),