effort towards getting chainspecbuilder into omni-node fix 5567 (#7619)

Adding chain-spec-builder as a subcommand into Polkadot omni node

cumulus/polkadot-omni-node/lib/Cargo.toml

@@ -16,6 +16,7 @@ path = "src/lib.rs"
 
 [dependencies]
 async-trait = { workspace = true }
+chain-spec-builder = { workspace = true }
 clap = { features = ["derive"], workspace = true }
 codec = { workspace = true, default-features = true }
 color-print = { workspace = true }

cumulus/polkadot-omni-node/lib/src/cli.rs

@@ -23,6 +23,7 @@ use crate::{
 		NodeExtraArgs,
 	},
 };
+use chain_spec_builder::ChainSpecBuilder;
 use clap::{Command, CommandFactory, FromArgMatches};
 use sc_chain_spec::ChainSpec;
 use sc_cli::{
@@ -31,7 +32,6 @@ use sc_cli::{
 };
 use sc_service::{config::PrometheusConfig, BasePath};
 use std::{fmt::Debug, marker::PhantomData, path::PathBuf};
-
 /// Trait that can be used to customize some of the customer-facing info related to the node binary
 /// that is being built using this library.
 ///
@@ -89,9 +89,16 @@ pub enum Subcommand {
 	/// Revert the chain to a previous state.
 	Revert(sc_cli::RevertCmd),
 
+	/// Subcommand for generating and managing chain specifications.
+	///
+	/// Unlike `build-spec`, which generates a chain specification based on existing
+	/// configurations, `chain-spec-builder` provides a more interactive and customizable approach
+	/// to defining a chain spec. It allows users to create specifications with additional
+	/// parameters and validation steps before finalizing the output.
+	ChainSpecBuilder(ChainSpecBuilder),
+
 	/// Remove the whole chain.
 	PurgeChain(cumulus_client_cli::PurgeChainCmd),
-
 	/// Export the genesis state of the parachain.
 	#[command(alias = "export-genesis-state")]
 	ExportGenesisHead(cumulus_client_cli::ExportGenesisHeadCommand),

cumulus/polkadot-omni-node/lib/src/command.rs

@@ -148,6 +148,9 @@ pub fn run<CliConfig: crate::cli::CliConfig>(cmd_config: RunConfig) -> Result<()
 				node.prepare_revert_cmd(config, cmd)
 			})
 		},
+		Some(Subcommand::ChainSpecBuilder(cmd)) =>
+			cmd.run().map_err(|err| sc_cli::Error::Application(err.into())),
+
 		Some(Subcommand::PurgeChain(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 			let polkadot_cli =

prdoc/pr_7619.prdoc

@@ -0,0 +1,11 @@
+title: 'Add chain-spec-builder as a subcommand to the polkadot-omni-node'
+doc:
+- audience: Runtime Dev
+
+  description: |-
+    This PR add chain-spec-builder as a subcommand to the polkadot-omni-node
+crates:
+- name: polkadot-omni-node-lib
+  bump: major
+- name: staging-chain-spec-builder
+  bump: patch

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

@@ -224,10 +224,10 @@ type ChainSpec = GenericChainSpec<()>;
 
 impl ChainSpecBuilder {
 	/// Executes the internal command.
-	pub fn run(self) -> Result<(), String> {
+	pub fn run(&self) -> Result<(), String> {
 		let chain_spec_path = self.chain_spec_path.to_path_buf();
 
-		match self.command {
+		match &self.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())?;
@@ -259,7 +259,7 @@ impl ChainSpecBuilder {
 					&mut chain_spec_json,
 					&fs::read(runtime.as_path())
 						.map_err(|e| format!("Wasm blob file could not be read: {e}"))?[..],
-					block_height,
+					*block_height,
 				);
 				let chain_spec_json = serde_json::to_string_pretty(&chain_spec_json)
 					.map_err(|e| format!("to pretty failed: {e}"))?;

substrate/frame/delegated-staking/src/tests.rs

@@ -1366,8 +1366,6 @@ mod pool_integration {
 
 	#[test]
 	fn stakers_cannot_join_pool() {
-		// A pool member is able to stake directly since staking only uses free funds but once a
-		// staker, they cannot join/add extra bond to the pool. They can still withdraw funds.
 		ExtBuilder::default().build_and_execute(|| {
 			start_era(1);
 			// GIVEN: a pool.