WIP

Signed-off-by: Oliver Tale-Yazdi <[email protected]>

Cargo.toml

@@ -516,14 +516,13 @@ members = [
 	"templates/minimal/node",
 	"templates/minimal/pallets/template",
 	"templates/minimal/runtime",
+	"templates/parachain/node",
+	"templates/parachain/pallets/template",
+	"templates/parachain/runtime",
 	"templates/solochain/node",
 	"templates/solochain/pallets/template",
 	"templates/solochain/runtime",
 	"umbrella",
-
-	"templates/parachain/node",
-	"templates/parachain/pallets/template",
-	"templates/parachain/runtime",
 ]
 default-members = [
 	"polkadot",

substrate/bin/node/cli/Cargo.toml

@@ -66,27 +66,31 @@ criterion = { version = "0.4.0", features = ["async_tokio"] }
 tokio = { version = "1.22.0", features = ["macros", "parking_lot", "time"] }
 tokio-util = { version = "0.7.4", features = ["compat"] }
 wait-timeout = "0.2"
-substrate-cli-test-utils = { path = "../../../test-utils/cli" }
-sc-service-test = { path = "../../../client/service/test" }
-
 wat = "1.0"
-node-testing = { path = "../testing" }
 serde_json = { workspace = true, default-features = true }
 scale-info = { version = "2.11.1", features = ["derive", "serde"] }
 
+node-testing = { path = "../testing" }
+
+substrate-cli-test-utils = { path = "../../../test-utils/cli" }
+sc-service-test = { path = "../../../client/service/test" }
+
 [build-dependencies]
 clap = { version = "4.5.3", optional = true }
 clap_complete = { version = "4.0.2", optional = true }
+
 node-inspect = { package = "staging-node-inspect", path = "../inspect", optional = true }
-substrate-build-script-utils = { path = "../../../utils/build-script-utils", optional = true }
+
+polkadot-sdk = { path = "../../../../umbrella", features = ["substrate-build-script-utils"], optional = true }
+
 
 [features]
 default = ["cli"]
 cli = [
 	"clap",
 	"clap_complete",
 	"node-inspect",
-	"substrate-build-script-utils",
+	"polkadot-sdk",
 ]
 runtime-benchmarks = [
 	"kitchensink-runtime/runtime-benchmarks",

substrate/bin/node/cli/build.rs

@@ -28,7 +28,7 @@ mod cli {
 	use clap::{CommandFactory, ValueEnum};
 	use clap_complete::{generate_to, Shell};
 	use std::{env, fs, path::Path};
-	use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed};
+	use polkadot_sdk::substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed};
 
 	pub fn main() {
 		//build_shell_completion();