chain-spec-builder: cleanup (#2174)

This PR removes: - `New`, `Generate`, `Edit` commands, - `kitchensink` dependency from the `chain-spec-builder` util. New `convert-to-raw`, `update-code` commands were added. Additionally renames the `runtime` command (which was added in #1256) to `create`. --------- Co-authored-by: Sebastian Kunert <[email protected]> Co-authored-by: Bastian Köcher <[email protected]> Co-authored-by: command-bot <>
paritytech · Nov 21, 2023 · 2fd8c51 · 2fd8c51
1 parent 126f64a
commit 2fd8c51
Show file tree

Hide file tree

Showing 4 changed files with 116 additions and 320 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/substrate/bin/utils/chain-spec-builder/Cargo.toml b/substrate/bin/utils/chain-spec-builder/Cargo.toml
@@ -20,15 +20,8 @@ name = "chain-spec-builder"
 crate-type = ["rlib"]
 
 [dependencies]
-ansi_term = "0.12.1"
 clap = { version = "4.4.6", features = ["derive"] }
-rand = "0.8"
-kitchensink-runtime = { version = "3.0.0-dev", path = "../../node/runtime" }
 log = "0.4.17"
-node-cli = { package = "staging-node-cli", path = "../../node/cli" }
 sc-chain-spec = { path = "../../../client/chain-spec" }
-sc-keystore = { path = "../../../client/keystore" }
 serde_json = "1.0.108"
-sp-core = { path = "../../../primitives/core" }
-sp-keystore = { path = "../../../primitives/keystore" }
 sp-tracing = { version = "10.0.0", path = "../../../primitives/tracing" }
diff --git a/substrate/bin/utils/chain-spec-builder/bin/main.rs b/substrate/bin/utils/chain-spec-builder/bin/main.rs
@@ -17,125 +17,60 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use chain_spec_builder::{
-	generate_authority_keys_and_store, generate_chain_spec, generate_chain_spec_for_runtime,
-	print_seeds, ChainSpecBuilder, ChainSpecBuilderCmd, EditCmd, GenerateCmd, NewCmd, VerifyCmd,
+	generate_chain_spec_for_runtime, ChainSpecBuilder, ChainSpecBuilderCmd, ConvertToRawCmd,
+	UpdateCodeCmd, VerifyCmd,
 };
 use clap::Parser;
-use node_cli::chain_spec;
-use rand::{distributions::Alphanumeric, rngs::OsRng, Rng};
 use sc_chain_spec::{update_code_in_json_chain_spec, GenericChainSpec};
-use sp_core::{crypto::Ss58Codec, sr25519};
 use staging_chain_spec_builder as chain_spec_builder;
 use std::fs;
 
 fn main() -> Result<(), String> {
 	sp_tracing::try_init_simple();
 
 	let builder = ChainSpecBuilder::parse();
-	#[cfg(build_type = "debug")]
-	if matches!(builder.command, ChainSpecBuilderCmd::Generate(_) | ChainSpecBuilderCmd::New(_)) {
-		println!(
-			"The chain spec builder builds a chain specification that includes a Substrate runtime \
-		 compiled as WASM. To ensure proper functioning of the included runtime compile (or run) \
-		 the chain spec builder binary in `--release` mode.\n",
-		 );
-	}
-
 	let chain_spec_path = builder.chain_spec_path.to_path_buf();
-	let mut write_chain_spec = true;
-
-	let chain_spec_json = match builder.command {
-		ChainSpecBuilderCmd::Generate(GenerateCmd {
-			authorities,
-			nominators,
-			endowed,
-			keystore_path,
-		}) => {
-			let authorities = authorities.max(1);
-			let rand_str = || -> String {
-				OsRng.sample_iter(&Alphanumeric).take(32).map(char::from).collect()
-			};
-
-			let authority_seeds = (0..authorities).map(|_| rand_str()).collect::<Vec<_>>();
-			let nominator_seeds = (0..nominators).map(|_| rand_str()).collect::<Vec<_>>();
-			let endowed_seeds = (0..endowed).map(|_| rand_str()).collect::<Vec<_>>();
-			let sudo_seed = rand_str();
-
-			print_seeds(&authority_seeds, &nominator_seeds, &endowed_seeds, &sudo_seed);
-
-			if let Some(keystore_path) = keystore_path {
-				generate_authority_keys_and_store(&authority_seeds, &keystore_path)?;
-			}
-
-			let nominator_accounts = nominator_seeds
-				.into_iter()
-				.map(|seed| {
-					chain_spec::get_account_id_from_seed::<sr25519::Public>(&seed).to_ss58check()
-				})
-				.collect();
-
-			let endowed_accounts = endowed_seeds
-				.into_iter()
-				.map(|seed| {
-					chain_spec::get_account_id_from_seed::<sr25519::Public>(&seed).to_ss58check()
-				})
-				.collect();
 
-			let sudo_account =
-				chain_spec::get_account_id_from_seed::<sr25519::Public>(&sudo_seed).to_ss58check();
-
-			generate_chain_spec(authority_seeds, nominator_accounts, endowed_accounts, sudo_account)
+	match builder.command {
+		ChainSpecBuilderCmd::Create(cmd) => {
+			let chain_spec_json = generate_chain_spec_for_runtime(&cmd)?;
+			fs::write(chain_spec_path, chain_spec_json).map_err(|err| err.to_string())?;
 		},
-		ChainSpecBuilderCmd::New(NewCmd {
-			authority_seeds,
-			nominator_accounts,
-			endowed_accounts,
-			sudo_account,
-		}) =>
-			generate_chain_spec(authority_seeds, nominator_accounts, endowed_accounts, sudo_account),
-		ChainSpecBuilderCmd::Runtime(cmd) => generate_chain_spec_for_runtime(&cmd),
-		ChainSpecBuilderCmd::Edit(EditCmd {
+		ChainSpecBuilderCmd::UpdateCode(UpdateCodeCmd {
 			ref input_chain_spec,
 			ref runtime_wasm_path,
-			convert_to_raw,
 		}) => {
 			let chain_spec = GenericChainSpec::<()>::from_json_file(input_chain_spec.clone())?;
 
 			let mut chain_spec_json =
-				serde_json::from_str::<serde_json::Value>(&chain_spec.as_json(convert_to_raw)?)
+				serde_json::from_str::<serde_json::Value>(&chain_spec.as_json(false)?)
 					.map_err(|e| format!("Conversion to json failed: {e}"))?;
-			if let Some(path) = runtime_wasm_path {
-				update_code_in_json_chain_spec(
-					&mut chain_spec_json,
-					&fs::read(path.as_path())
-						.map_err(|e| format!("Wasm blob file could not be read: {e}"))?[..],
-				);
-			}
-
-			serde_json::to_string_pretty(&chain_spec_json)
-				.map_err(|e| format!("to pretty failed: {e}"))
+			update_code_in_json_chain_spec(
+				&mut chain_spec_json,
+				&fs::read(runtime_wasm_path.as_path())
+					.map_err(|e| format!("Wasm blob file could not be read: {e}"))?[..],
+			);
+
+			let chain_spec_json = serde_json::to_string_pretty(&chain_spec_json)
+				.map_err(|e| format!("to pretty failed: {e}"))?;
+			fs::write(chain_spec_path, chain_spec_json).map_err(|err| err.to_string())?;
 		},
-		ChainSpecBuilderCmd::Verify(VerifyCmd { ref input_chain_spec, ref runtime_wasm_path }) => {
-			write_chain_spec = false;
+		ChainSpecBuilderCmd::ConvertToRaw(ConvertToRawCmd { ref input_chain_spec }) => {
 			let chain_spec = GenericChainSpec::<()>::from_json_file(input_chain_spec.clone())?;
-			let mut chain_spec_json =
+
+			let chain_spec_json =
 				serde_json::from_str::<serde_json::Value>(&chain_spec.as_json(true)?)
 					.map_err(|e| format!("Conversion to json failed: {e}"))?;
-			if let Some(path) = runtime_wasm_path {
-				update_code_in_json_chain_spec(
-					&mut chain_spec_json,
-					&fs::read(path.as_path())
-						.map_err(|e| format!("Wasm blob file could not be read: {e}"))?[..],
-				);
-			};
-			serde_json::to_string_pretty(&chain_spec_json)
-				.map_err(|e| format!("to pretty failed: {e}"))
-		},
-	}?;
 
-	if write_chain_spec {
-		fs::write(chain_spec_path, chain_spec_json).map_err(|err| err.to_string())
-	} else {
-		Ok(())
-	}
+			let chain_spec_json = serde_json::to_string_pretty(&chain_spec_json)
+				.map_err(|e| format!("Conversion to pretty failed: {e}"))?;
+			fs::write(chain_spec_path, chain_spec_json).map_err(|err| err.to_string())?;
+		},
+		ChainSpecBuilderCmd::Verify(VerifyCmd { ref input_chain_spec }) => {
+			let chain_spec = GenericChainSpec::<()>::from_json_file(input_chain_spec.clone())?;
+			let _ = serde_json::from_str::<serde_json::Value>(&chain_spec.as_json(true)?)
+				.map_err(|e| format!("Conversion to json failed: {e}"))?;
+		},
+	};
+	Ok(())
 }