[testnet] AssetHubRococo nits (#1954)

This PR addresses several minor issues: - Fixes the symlink for `asset-hub-rococo.json` chainspec. - Corrects the `asset-hub-rococo-genesis` invulnerables setup. - Relocates common bash functions for bridge testing to a separate file `bridges_common.sh`.
paritytech · Oct 20, 2023 · 7699435 · 7699435
1 parent 69c986f
commit 7699435
Show file tree

Hide file tree

Showing 7 changed files with 483 additions and 485 deletions.
diff --git a/cumulus/parachains/chain-specs/asset-hub-wococo.json b/cumulus/parachains/chain-specs/asset-hub-wococo.json
diff --git a/cumulus/polkadot-parachain/chain-specs/asset-hub-rococo.json b/cumulus/polkadot-parachain/chain-specs/asset-hub-rococo.json
diff --git a/cumulus/polkadot-parachain/chain-specs/asset-hub-rococo.json b/cumulus/polkadot-parachain/chain-specs/asset-hub-rococo.json
@@ -0,0 +1 @@
+../../parachains/chain-specs/asset-hub-rococo.json
diff --git a/cumulus/polkadot-parachain/chain-specs/asset-hub-wococo.json b/cumulus/polkadot-parachain/chain-specs/asset-hub-wococo.json
diff --git a/cumulus/polkadot-parachain/chain-specs/asset-hub-wococo.json b/cumulus/polkadot-parachain/chain-specs/asset-hub-wococo.json
@@ -0,0 +1 @@
+../../parachains/chain-specs/asset-hub-wococo.json
diff --git a/cumulus/polkadot-parachain/src/chain_spec/asset_hubs.rs b/cumulus/polkadot-parachain/src/chain_spec/asset_hubs.rs
@@ -796,39 +796,107 @@ fn asset_hub_rococo_like_local_config(
 	)
 }
 
-pub fn asset_hub_rococo_config() -> AssetHubRococoChainSpec {
+pub fn asset_hub_rococo_genesis_config() -> AssetHubRococoChainSpec {
 	let mut properties = sc_chain_spec::Properties::new();
-	properties.insert("ss58Format".into(), 42.into());
 	properties.insert("tokenSymbol".into(), "ROC".into());
 	properties.insert("tokenDecimals".into(), 12.into());
-	asset_hub_rococo_like_local_config(properties, "Rococo Asset Hub", "asset-hub-rococo", 1000)
+	let para_id = 1000;
+	AssetHubRococoChainSpec::from_genesis(
+		// Name
+		"Rococo Asset Hub",
+		// ID
+		"asset-hub-rococo",
+		ChainType::Live,
+		move || {
+			asset_hub_rococo_genesis(
+				// initial collators.
+				vec![
+					// E8XC6rTJRsioKCp6KMy6zd24ykj4gWsusZ3AkSeyavpVBAG
+					(
+						hex!("44cb62d1d6cdd2fff2a5ef3bb7ef827be5b3e117a394ecaa634d8dd9809d5608")
+							.into(),
+						hex!("44cb62d1d6cdd2fff2a5ef3bb7ef827be5b3e117a394ecaa634d8dd9809d5608")
+							.unchecked_into(),
+					),
+					// G28iWEybndgGRbhfx83t7Q42YhMPByHpyqWDUgeyoGF94ri
+					(
+						hex!("9864b85e23aa4506643db9879c3dbbeabaa94d269693a4447f537dd6b5893944")
+							.into(),
+						hex!("9864b85e23aa4506643db9879c3dbbeabaa94d269693a4447f537dd6b5893944")
+							.unchecked_into(),
+					),
+					// G839e2eMiq7UXbConsY6DS1XDAYG2XnQxAmLuRLGGQ3Px9c
+					(
+						hex!("9ce5741ee2f1ac3bdedbde9f3339048f4da2cb88ddf33a0977fa0b4cf86e2948")
+							.into(),
+						hex!("9ce5741ee2f1ac3bdedbde9f3339048f4da2cb88ddf33a0977fa0b4cf86e2948")
+							.unchecked_into(),
+					),
+					// GLao4ukFUW6qhexuZowdFrKa2NLCfnEjZMftSXXfvGv1vvt
+					(
+						hex!("a676ed15f5a325eab49ed8d5f8c00f3f814b19bb58cda14ad10894c078dd337f")
+							.into(),
+						hex!("a676ed15f5a325eab49ed8d5f8c00f3f814b19bb58cda14ad10894c078dd337f")
+							.unchecked_into(),
+					),
+				],
+				Vec::new(),
+				para_id.into(),
+			)
+		},
+		Vec::new(),
+		None,
+		None,
+		None,
+		Some(properties),
+		Extensions { relay_chain: "rococo".into(), para_id },
+	)
 }
 
-pub fn asset_hub_wococo_config() -> AssetHubWococoChainSpec {
+pub fn asset_hub_wococo_genesis_config() -> AssetHubWococoChainSpec {
 	let mut properties = sc_chain_spec::Properties::new();
 	properties.insert("ss58Format".into(), 42.into());
 	properties.insert("tokenSymbol".into(), "WOC".into());
 	properties.insert("tokenDecimals".into(), 12.into());
-	asset_hub_rococo_like_config(properties, "Wococo Asset Hub", "asset-hub-wococo", 1000)
-}
-
-fn asset_hub_rococo_like_config(
-	properties: sc_chain_spec::Properties,
-	name: &str,
-	chain_id: &str,
-	para_id: u32,
-) -> AssetHubRococoChainSpec {
-	AssetHubRococoChainSpec::from_genesis(
+	let para_id = 1000;
+	AssetHubWococoChainSpec::from_genesis(
 		// Name
-		name,
+		"Wococo Asset Hub",
 		// ID
-		chain_id,
+		"asset-hub-wococo",
 		ChainType::Live,
 		move || {
 			asset_hub_rococo_genesis(
 				// initial collators.
 				vec![
-					// TODO: add invulnerables? from Rockmine?
+					// 5C8RGkS8t5K93fB2hkgKbvSYs5iG6AknJMuQmbBDeazon9Lj
+					(
+						hex!("02d526f43cf27e94f478f9db785dc86052a77c695e7c855211839d3fde3ce534")
+							.into(),
+						hex!("02d526f43cf27e94f478f9db785dc86052a77c695e7c855211839d3fde3ce534")
+							.unchecked_into(),
+					),
+					// 5GePeDZQeBagXH7kH5QPKnQKi39Z5hoYFB5FmUtEvc4yxKej
+					(
+						hex!("caa1f623ca183296c4521b56cc29c484ca017830f8cb538f30f2d4664d631814")
+							.into(),
+						hex!("caa1f623ca183296c4521b56cc29c484ca017830f8cb538f30f2d4664d631814")
+							.unchecked_into(),
+					),
+					// 5CfnTTb9NMJDNKDntA83mHKoedZ7wjDC8ypLCTDd4NwUx3zv
+					(
+						hex!("1ac112d635db2bd34e79ae2b99486cf7c0b71a928668e4feb3dc4633d368f965")
+							.into(),
+						hex!("1ac112d635db2bd34e79ae2b99486cf7c0b71a928668e4feb3dc4633d368f965")
+							.unchecked_into(),
+					),
+					// 5EqheiwiG22gvGpN7cvrbeaQzhg7rzsYYVkYK4yj5vRrTQRQ
+					(
+						hex!("7ac9d11be07334cd27e9eb849f5fc7677a10ad36b6ab38b377d3c8b2c0b08b66")
+							.into(),
+						hex!("7ac9d11be07334cd27e9eb849f5fc7677a10ad36b6ab38b377d3c8b2c0b08b66")
+							.unchecked_into(),
+					),
 				],
 				Vec::new(),
 				para_id.into(),
@@ -839,7 +907,7 @@ fn asset_hub_rococo_like_config(
 		None,
 		None,
 		Some(properties),
-		Extensions { relay_chain: "rococo".into(), para_id },
+		Extensions { relay_chain: "wococo".into(), para_id },
 	)
 }
 

diff --git a/cumulus/polkadot-parachain/src/command.rs b/cumulus/polkadot-parachain/src/command.rs
@@ -176,8 +176,8 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
 		"asset-hub-rococo-local" =>
 			Box::new(chain_spec::asset_hubs::asset_hub_rococo_local_config()),
 		// the chain spec as used for generating the upgrade genesis values
-		"asset-hub-rococo-genesis" => Box::new(chain_spec::asset_hubs::asset_hub_rococo_config()),
-		// the shell-based chain spec as used for syncing
+		"asset-hub-rococo-genesis" =>
+			Box::new(chain_spec::asset_hubs::asset_hub_rococo_genesis_config()),
 		"asset-hub-rococo" =>
 			Box::new(chain_spec::asset_hubs::AssetHubRococoChainSpec::from_json_bytes(
 				&include_bytes!("../chain-specs/asset-hub-rococo.json")[..],
@@ -189,7 +189,8 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
 		"asset-hub-wococo-local" =>
 			Box::new(chain_spec::asset_hubs::asset_hub_wococo_local_config()),
 		// the chain spec as used for generating the upgrade genesis values
-		"asset-hub-wococo-genesis" => Box::new(chain_spec::asset_hubs::asset_hub_wococo_config()),
+		"asset-hub-wococo-genesis" =>
+			Box::new(chain_spec::asset_hubs::asset_hub_wococo_genesis_config()),
 		"asset-hub-wococo" =>
 			Box::new(chain_spec::asset_hubs::AssetHubWococoChainSpec::from_json_bytes(
 				&include_bytes!("../chain-specs/asset-hub-wococo.json")[..],
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../parachains/chain-specs/asset-hub-rococo.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../parachains/chain-specs/asset-hub-wococo.json