paritytech · bkchr · Apr 7, 2020 · Mar 13, 2020 · Mar 13, 2020 · Mar 13, 2020
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,6 +21,7 @@ members = [
 	"client/chain-spec",
 	"client/chain-spec/derive",
 	"client/cli",
+	"client/cli-derive",
 	"client/consensus/aura",
 	"client/consensus/babe",
 	"client/consensus/babe/rpc",

diff --git a/bin/node-template/node/Cargo.toml b/bin/node-template/node/Cargo.toml
@@ -2,6 +2,7 @@
 name = "node-template"
 version = "2.0.0-alpha.4"
 authors = ["Anonymous"]
+description = "Substrate Node template"
 edition = "2018"
 license = "Unlicense"
 build = "build.rs"
@@ -37,5 +38,4 @@ sc-basic-authorship = { path = "../../../client/basic-authorship", version = "0.
 node-template-runtime = { version = "2.0.0-alpha.4", path = "../runtime" }
 
 [build-dependencies]
-vergen = "3.0.4"
-build-script-utils = { version = "2.0.0-alpha.4", package = "substrate-build-script-utils", path = "../../../utils/build-script-utils" }
+sc-cli = { version = "0.8.0-alpha.4", path = "../../../client/cli" }
diff --git a/bin/node-template/node/build.rs b/bin/node-template/node/build.rs
@@ -1,9 +1,7 @@
-use vergen::{ConstantsFlags, generate_cargo_keys};
-
-const ERROR_MSG: &str = "Failed to generate metadata files";
+use sc_cli;
 
 fn main() {
-	generate_cargo_keys(ConstantsFlags::SHA_SHORT).expect(ERROR_MSG);
+	sc_cli::generate_cargo_keys();
 
-	build_script_utils::rerun_if_git_head_changed();
+	sc_cli::rerun_if_git_head_changed();
 }
diff --git a/bin/node-template/node/src/chain_spec.rs b/bin/node-template/node/src/chain_spec.rs
@@ -141,10 +141,3 @@ fn testnet_genesis(initial_authorities: Vec<(AuraId, GrandpaId)>,
 		}),
 	}
 }
-
-pub fn load_spec(id: &str) -> Result<Box<dyn sc_service::ChainSpec>, String> {
-	Ok(match Alternative::from(id) {
-		Some(spec) => Box::new(spec.load()?),
-		None => Box::new(ChainSpec::from_json_file(std::path::PathBuf::from(id))?),
-	})
-}
diff --git a/bin/node-template/node/src/command.rs b/bin/node-template/node/src/command.rs
@@ -14,36 +14,36 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-use sp_consensus_aura::sr25519::{AuthorityPair as AuraPair};
-use sc_cli::VersionInfo;
-use crate::service;
-use crate::chain_spec;
+use crate::chain_spec::{Alternative, ChainSpec};
 use crate::cli::Cli;
+use crate::service;
+use sc_cli::{spec_factory, SubstrateCLI};
+use sp_consensus_aura::sr25519::AuthorityPair as AuraPair;
 
-/// Parse and run command line arguments
-pub fn run(version: VersionInfo) -> sc_cli::Result<()> {
-	let opt = sc_cli::from_args::<Cli>(&version);
+#[spec_factory(
+	impl_name = "Substrate Node",
+	support_url = "support.anonymous.an",
+	copyright_start_year = 2017
+)]
+fn spec_factory(id: &str) -> Result<Box<dyn sc_service::ChainSpec>, String> {
+	Ok(match Alternative::from(id) {
+		Some(spec) => Box::new(spec.load()?),
+		None => Box::new(ChainSpec::from_json_file(std::path::PathBuf::from(id))?),
+	})
+}
 
-	let mut config = sc_service::Configuration::from_version(&version);
+/// Parse and run command line arguments
+pub fn run() -> sc_cli::Result<()> {
+	let opt = Cli::from_args();
 
 	match opt.subcommand {
 		Some(subcommand) => {
-			subcommand.init(&version)?;
-			subcommand.update_config(&mut config, chain_spec::load_spec, &version)?;
-			subcommand.run(
-				config,
-				|config: _| Ok(new_full_start!(config).0),
-			)
-		},
+			let runtime = Cli::create_runtime(&subcommand)?;
+			runtime.run_subcommand(subcommand, |config| Ok(new_full_start!(config).0))
+		}
 		None => {
-			opt.run.init(&version)?;
-			opt.run.update_config(&mut config, chain_spec::load_spec, &version)?;
-			opt.run.run(
-				config,
-				service::new_light,
-				service::new_full,
-				&version,
-			)
-		},
+			let runtime = Cli::create_runtime(&opt.run)?;
+			runtime.run_node(service::new_light, service::new_full)
+		}
 	}
 }
diff --git a/bin/node-template/node/src/main.rs b/bin/node-template/node/src/main.rs
@@ -8,16 +8,5 @@ mod cli;
 mod command;
 
 fn main() -> sc_cli::Result<()> {
-	let version = sc_cli::VersionInfo {
-		name: "Substrate Node",
-		commit: env!("VERGEN_SHA_SHORT"),
-		version: env!("CARGO_PKG_VERSION"),
-		executable_name: "node-template",
-		author: "Anonymous",
-		description: "Template Node",
-		support_url: "support.anonymous.an",
-		copyright_start_year: 2017,
-	};
-
-	command::run(version)
+	command::run()
 }
diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
@@ -74,7 +74,7 @@ pub fn new_full(config: Configuration)
 {
 	let is_authority = config.roles.is_authority();
 	let force_authoring = config.force_authoring;
-	let name = config.name.clone();
+	let name = config.network.node_name.clone();
 	let disable_grandpa = config.disable_grandpa;
 
 	// sentry nodes announce themselves as authorities to the network

diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
@@ -2,7 +2,7 @@
 name = "node-cli"
 version = "2.0.0-alpha.4"
 authors = ["Parity Technologies <[email protected]>"]
-description = "Substrate node implementation in Rust."
+description = "Generic Substrate node implementation in Rust."
 build = "build.rs"
 edition = "2018"
 license = "GPL-3.0"
@@ -112,7 +112,6 @@ nix = "0.17"
 serde_json = "1.0"
 
 [build-dependencies]
-build-script-utils = { version = "2.0.0-alpha.4", package = "substrate-build-script-utils", path = "../../../utils/build-script-utils" }
 structopt = { version = "0.3.8", optional = true }
 node-transaction-factory = { version = "0.8.0-alpha.4", optional = true, path = "../transaction-factory" }
 node-inspect = { version = "0.8.0-alpha.4", optional = true, path = "../inspect" }
@@ -124,10 +123,6 @@ package = "sc-cli"
 path = "../../../client/cli"
 optional = true
 
-[build-dependencies.vergen]
-version = "3.0.4"
-optional = true
-
 [features]
 default = ["cli", "wasmtime"]
 browser = [
@@ -143,7 +138,6 @@ cli = [
 	"frame-benchmarking-cli",
 	"sc-service/rocksdb",
 	"structopt",
-	"vergen",
 ]
 wasmtime = [
 	"cli",

diff --git a/bin/node/cli/bin/main.rs b/bin/node/cli/bin/main.rs
@@ -19,16 +19,5 @@
 #![warn(missing_docs)]
 
 fn main() -> sc_cli::Result<()> {
-	let version = sc_cli::VersionInfo {
-		name: "Substrate Node",
-		commit: env!("VERGEN_SHA_SHORT"),
-		version: env!("CARGO_PKG_VERSION"),
-		executable_name: "substrate",
-		author: "Parity Technologies <[email protected]>",
-		description: "Generic substrate node",
-		support_url: "https://github.com/paritytech/substrate/issues/new",
-		copyright_start_year: 2017,
-	};
-
-	node_cli::run(std::env::args(), version)
+	node_cli::run()
 }
diff --git a/bin/node/cli/build.rs b/bin/node/cli/build.rs
@@ -24,14 +24,13 @@ mod cli {
 	include!("src/cli.rs");
 
 	use std::{fs, env, path::Path};
-	use sc_cli::{structopt::clap::Shell};
-	use vergen::{ConstantsFlags, generate_cargo_keys};
+	use sc_cli::{structopt::clap::Shell, generate_cargo_keys, rerun_if_git_head_changed};
 
 	pub fn main() {
 		build_shell_completion();
-		generate_cargo_keys(ConstantsFlags::all()).expect("Failed to generate metadata files");
+		generate_cargo_keys();
 
-		build_script_utils::rerun_if_git_head_changed();
+		rerun_if_git_head_changed();
 	}
 
 	/// Build shell completion scripts for all known shells

diff --git a/bin/node/cli/src/browser.rs b/bin/node/cli/src/browser.rs
@@ -41,10 +41,10 @@ async fn start_inner(chain_spec: String, log_level: String) -> Result<Client, Bo
 	let config = browser_configuration(chain_spec).await?;
 
 	info!("Substrate browser node");
-	info!("  version {}", config.full_version());
+	info!("  version {}", config.impl_version);
 	info!("  by Parity Technologies, 2017-2020");
-	info!("Chain specification: {}", config.expect_chain_spec().name());
-	info!("Node name: {}", config.name);
+	info!("Chain specification: {}", config.chain_spec.name());
+	info!("Node name: {}", config.network.node_name);
 	info!("Roles: {:?}", config.roles);
 
 	// Create the service. This is the most heavy initialization step.

diff --git a/bin/node/cli/src/cli.rs b/bin/node/cli/src/cli.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-use sc_cli::{SharedParams, ImportParams, RunCmd};
+use sc_cli::{ImportParams, RunCmd, SharedParams};
 use structopt::StructOpt;
 
 /// An overarching CLI command definition.
@@ -50,10 +50,7 @@ pub enum Subcommand {
 	Inspect(node_inspect::cli::InspectCmd),
 
 	/// The custom benchmark subcommmand benchmarking runtime pallets.
-	#[structopt(
-		name = "benchmark",
-		about = "Benchmark runtime pallets."
-	)]
+	#[structopt(name = "benchmark", about = "Benchmark runtime pallets.")]
 	Benchmark(frame_benchmarking_cli::BenchmarkCmd),
 }
 
@@ -62,11 +59,11 @@ pub enum Subcommand {
 #[derive(Debug, StructOpt, Clone)]
 pub struct FactoryCmd {
 	/// Number of blocks to generate.
-	#[structopt(long="blocks", default_value = "1")]
+	#[structopt(long = "blocks", default_value = "1")]
 	pub blocks: u32,
 
 	/// Number of transactions to push per block.
-	#[structopt(long="transactions", default_value = "8")]
+	#[structopt(long = "transactions", default_value = "8")]
 	pub transactions: u32,
 
 	#[allow(missing_docs)]