Add parachain related parameters to chain-spec-builder

substrate/bin/utils/chain-spec-builder/Cargo.toml

@@ -28,4 +28,5 @@ clap = { features = ["derive"], workspace = true }
 log = { workspace = true, default-features = true }
 sc-chain-spec = { features = ["clap"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
+serde = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }

substrate/bin/utils/chain-spec-builder/bin/main.rs

@@ -26,9 +26,9 @@ use sc_chain_spec::{
 	GenesisConfigBuilderRuntimeCaller,
 };
 use staging_chain_spec_builder as chain_spec_builder;
-use std::fs;
+use std::{fs, path::Path};
 
-type ChainSpec = GenericChainSpec<(), ()>;
+type ChainSpec = GenericChainSpec<()>;
 
 //avoid error message escaping
 fn main() {
@@ -38,6 +38,14 @@ fn main() {
 	}
 }
 
+/// Extract any chain spec and convert it to JSON
+fn extract_chain_spec_json(input_chain_spec: &Path) -> Result<serde_json::Value, String> {
+	let chain_spec = &fs::read(input_chain_spec)
+		.map_err(|e| format!("Provided chain spec could not be read: {e}"))?;
+
+	serde_json::from_slice(&chain_spec).map_err(|e| format!("Conversion to json failed: {e}"))
+}
+
 fn inner_main() -> Result<(), String> {
 	sp_tracing::try_init_simple();
 
@@ -53,11 +61,8 @@ fn inner_main() -> Result<(), String> {
 			ref input_chain_spec,
 			ref runtime_wasm_path,
 		}) => {
-			let chain_spec = ChainSpec::from_json_file(input_chain_spec.clone())?;
+			let mut chain_spec_json = extract_chain_spec_json(input_chain_spec.as_path())?;
 
-			let mut chain_spec_json =
-				serde_json::from_str::<serde_json::Value>(&chain_spec.as_json(false)?)
-					.map_err(|e| format!("Conversion to json failed: {e}"))?;
 			update_code_in_json_chain_spec(
 				&mut chain_spec_json,
 				&fs::read(runtime_wasm_path.as_path())
@@ -73,11 +78,7 @@ fn inner_main() -> Result<(), String> {
 			ref runtime_wasm_path,
 			block_height,
 		}) => {
-			let chain_spec = ChainSpec::from_json_file(input_chain_spec.clone())?;
-
-			let mut chain_spec_json =
-				serde_json::from_str::<serde_json::Value>(&chain_spec.as_json(false)?)
-					.map_err(|e| format!("Conversion to json failed: {e}"))?;
+			let mut chain_spec_json = extract_chain_spec_json(input_chain_spec.as_path())?;
 
 			set_code_substitute_in_json_chain_spec(
 				&mut chain_spec_json,
@@ -135,6 +136,6 @@ fn inner_main() -> Result<(), String> {
 				.map_err(|e| format!("getting default config from runtime should work: {e}"))?;
 			println!("{preset}");
 		},
-	};
+	}
 	Ok(())
 }

substrate/bin/utils/chain-spec-builder/src/lib.rs

@@ -120,9 +120,12 @@
 use std::{fs, path::PathBuf};
 
 use clap::{Parser, Subcommand};
-use sc_chain_spec::{ChainType, GenericChainSpec, GenesisConfigBuilderRuntimeCaller};
+use sc_chain_spec::{
+	ChainSpecExtension, ChainSpecGroup, ChainType, GenericChainSpec,
+	GenesisConfigBuilderRuntimeCaller,
+};
+use serde::{Deserialize, Serialize};
 use serde_json::Value;
-
 /// A utility to easily create a chain spec definition.
 #[derive(Debug, Parser)]
 #[command(rename_all = "kebab-case", version, about)]
@@ -158,6 +161,15 @@ pub struct CreateCmd {
 	/// The chain type.
 	#[arg(value_enum, short = 't', default_value = "live")]
 	chain_type: ChainType,
+	/// If you're generating a config for a parachain
+	#[arg(long, value_enum, default_value = "false")]
+	parachain: bool,
+	/// The para ID for your chain.
+	#[arg(value_enum, short = 'p', default_value = "100")]
+	para_id: u32,
+	/// The relay chain you wish to connect to.
+	#[arg(value_enum, short = 'c', default_value = "polkadot")]
+	relay_chain: String,
 	/// The path to runtime wasm blob.
 	#[arg(long, short)]
 	runtime_wasm_path: PathBuf,
@@ -279,17 +291,40 @@ pub struct VerifyCmd {
 	pub input_chain_spec: PathBuf,
 }
 
+/// The extensions for the [`ChainSpec`].
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, ChainSpecGroup, ChainSpecExtension)]
+#[serde(deny_unknown_fields)]
+pub struct Extensions {
+	/// The relay chain of the Parachain.
+	pub relay_chain: Option<String>,
+	/// The id of the Parachain.
+	pub para_id: Option<u32>,
+}
+
 /// Processes `CreateCmd` and returns JSON version of `ChainSpec`.
 pub fn generate_chain_spec_for_runtime(cmd: &CreateCmd) -> Result<String, String> {
 	let code = fs::read(cmd.runtime_wasm_path.as_path())
 		.map_err(|e| format!("wasm blob shall be readable {e}"))?;
 
 	let chain_type = &cmd.chain_type;
+	let relay_chain = &cmd.relay_chain;
+	let builder = match cmd.parachain {
+		true => GenericChainSpec::<Extensions>::builder(
+			&code[..],
+			Extensions { relay_chain: Some(relay_chain.to_string()), para_id: Some(cmd.para_id) },
+		)
+		.with_name(&cmd.chain_name[..])
+		.with_id(&cmd.chain_id[..])
+		.with_chain_type(chain_type.clone()),
 
-	let builder = GenericChainSpec::<()>::builder(&code[..], Default::default())
+		false => GenericChainSpec::<Extensions>::builder(
+			&code[..],
+			Extensions { relay_chain: None, para_id: None },
+		)
 		.with_name(&cmd.chain_name[..])
 		.with_id(&cmd.chain_id[..])
-		.with_chain_type(chain_type.clone());
+		.with_chain_type(chain_type.clone()),
+	};
 
 	let builder = match cmd.action {
 		GenesisBuildAction::NamedPreset(NamedPresetCmd { ref preset_name }) =>