Merge Subkey into sc-cli

bin/node-template/node/Cargo.toml

@@ -33,7 +33,9 @@ sc-client = { version = "0.8.0-alpha.2", path = "../../../client/" }
 sc-client-api = { version = "2.0.0-alpha.2", path = "../../../client/api" }
 sp-runtime = { version = "2.0.0-alpha.2", path = "../../../primitives/runtime" }
 sc-basic-authorship = { path = "../../../client/basic-authorship" , version = "0.8.0-alpha.2"}
-
+frame-system = { version = "2.0.0-alpha.3", path= "../../../frame/system" }
+pallet-transaction-payment = { version = "2.0.0-alpha.3", path = "../../../frame/transaction-payment" }
+pallet-indices = { version = "2.0.0-alpha.3", path = "../../../frame/indices" }
 node-template-runtime = { version = "2.0.0-alpha.2", path = "../runtime" }
 
 [build-dependencies]

bin/node-template/node/src/command.rs

@@ -15,10 +15,33 @@
 // 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::cli::Cli;
+use sc_cli::{VersionInfo, RuntimeAdapter};
+use node_template_runtime::{Runtime, SignedExtra, Index, Balance};
+use crate::{chain_spec, service, cli::Cli};
+use sp_runtime::{MultiSignature, MultiSigner, generic::Era, traits::StaticLookup};
+use sp_core::sr25519;
+
+struct Adapter;
+
+impl RuntimeAdapter for Adapter {
+	type Pair = sr25519::Pair;
+	type Public =  sr25519::Public;
+	type Signature = MultiSignature;
+	type Runtime = Runtime;
+	type Extra = SignedExtra;
+	type Address = <pallet_indices::Module<Runtime> as StaticLookup>::Source;
+
+	fn build_extra(index: Index) -> Self::Extra {
+		(
+			frame_system::CheckVersion::new(),
+			frame_system::CheckGenesis::new(),
+			frame_system::CheckEra::from(Era::Immortal),
+			frame_system::CheckNonce::from(index),
+			frame_system::CheckWeight::new(),
+			pallet_transaction_payment::ChargeTransactionPayment::from(0),
+		)
+	}
+}
 
 /// Parse and run command line arguments
 pub fn run(version: VersionInfo) -> sc_cli::Result<()> {
@@ -30,7 +53,7 @@ pub fn run(version: VersionInfo) -> sc_cli::Result<()> {
 		Some(subcommand) => {
 			subcommand.init(&version)?;
 			subcommand.update_config(&mut config, chain_spec::load_spec, &version)?;
-			subcommand.run(
+			subcommand.run::<Adapter, _, _, _>(
 				config,
 				|config: _| Ok(new_full_start!(config).0),
 			)

bin/node/cli/build.rs

@@ -15,8 +15,8 @@
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
 fn main() {
-	#[cfg(feature = "cli")]
-	cli::main();
+	// #[cfg(feature = "cli")]
+	// cli::main();
 }
 
 #[cfg(feature = "cli")]

bin/utils/subkey/src/main.rs

@@ -81,7 +81,7 @@ trait Crypto: Sized {
 	{
 		if let Ok((pair, seed)) = Self::Pair::from_phrase(uri, password) {
 			let public_key = Self::public_from_pair(&pair);
-			
+
 			match output {
 				OutputType::Json => {
 					let json = json!({
@@ -99,11 +99,11 @@ trait Crypto: Sized {
 						Public key (hex): {}\n  \
 						Account ID:       {}\n  \
 						SS58 Address:     {}",
-						uri,
-						format_seed::<Self>(seed),
-						format_public_key::<Self>(public_key.clone()),
-						format_account_id::<Self>(public_key),
-						Self::ss58_from_pair(&pair),
+					         uri,
+					         format_seed::<Self>(seed),
+					         format_public_key::<Self>(public_key.clone()),
+					         format_account_id::<Self>(public_key),
+					         Self::ss58_from_pair(&pair),
 					);
 				},
 			}
@@ -127,17 +127,17 @@ trait Crypto: Sized {
 						Public key (hex): {}\n  \
 						Account ID:       {}\n  \
 						SS58 Address:     {}",
-						uri,
-						if let Some(seed) = seed { format_seed::<Self>(seed) } else { "n/a".into() },
-						format_public_key::<Self>(public_key.clone()),
-						format_account_id::<Self>(public_key),
-						Self::ss58_from_pair(&pair),
+					         uri,
+					         if let Some(seed) = seed { format_seed::<Self>(seed) } else { "n/a".into() },
+					         format_public_key::<Self>(public_key.clone()),
+					         format_account_id::<Self>(public_key),
+					         Self::ss58_from_pair(&pair),
 					);
 				},
 			}
-			
+
 		} else if let Ok((public_key, v)) =
-			<Self::Pair as Pair>::Public::from_string_with_version(uri)
+		<Self::Pair as Pair>::Public::from_string_with_version(uri)
 		{
 			let v = network_override.unwrap_or(v);
 
@@ -158,11 +158,11 @@ trait Crypto: Sized {
 						Public key (hex):   {}\n  \
 						Account ID:         {}\n  \
 						SS58 Address:       {}",
-						uri,
-						String::from(v),
-						format_public_key::<Self>(public_key.clone()),
-						format_account_id::<Self>(public_key.clone()),
-						public_key.to_ss58check_with_version(v),
+					         uri,
+					         String::from(v),
+					         format_public_key::<Self>(public_key.clone()),
+					         format_account_id::<Self>(public_key.clone()),
+					         public_key.to_ss58check_with_version(v),
 					);
 				},
 			}
@@ -369,9 +369,9 @@ fn static_err(msg: &'static str) -> Result<(), Error> {
 }
 
 fn execute<C: Crypto>(matches: ArgMatches) -> Result<(), Error>
-where
-	SignatureOf<C>: SignatureT,
-	PublicOf<C>: PublicT,
+	where
+		SignatureOf<C>: SignatureT,
+		PublicOf<C>: PublicT,
 {
 	let password_interactive = matches.is_present("password-interactive");
 	let password = matches.value_of("password");
@@ -395,7 +395,7 @@ where
 		Some(Err(e)) => return Err(e),
 		Some(Ok(v)) => Some(v),
 		None => None,
-	 };
+	};
 
 	if let Some(network) = maybe_network {
 		set_default_ss58_version(network);
@@ -405,7 +405,7 @@ where
 		Some(Err(_)) => return Err(Error::Static("Invalid output name. See --help for available outputs.")),
 		Some(Ok(v)) => v,
 		None => OutputType::Text,
-	 };
+	};
 
 	match matches.subcommand() {
 		("generate", Some(matches)) => {
@@ -521,19 +521,19 @@ fn generate_mnemonic(matches: &ArgMatches) -> Result<Mnemonic, Error> {
 }
 
 fn do_sign<C: Crypto>(suri: &str, message: Vec<u8>, password: Option<&str>) -> Result<String, Error>
-where
-	SignatureOf<C>: SignatureT,
-	PublicOf<C>: PublicT,
+	where
+		SignatureOf<C>: SignatureT,
+		PublicOf<C>: PublicT,
 {
 	let pair = read_pair::<C>(Some(suri), password)?;
 	let signature = pair.sign(&message);
 	Ok(format_signature::<C>(&signature))
 }
 
 fn do_verify<C: Crypto>(matches: &ArgMatches, uri: &str, message: Vec<u8>) -> Result<bool, Error>
-where
-	SignatureOf<C>: SignatureT,
-	PublicOf<C>: PublicT,
+	where
+		SignatureOf<C>: SignatureT,
+		PublicOf<C>: PublicT,
 {
 
 	let signature = read_signature::<C>(matches)?;
@@ -582,9 +582,9 @@ fn read_genesis_hash(matches: &ArgMatches) -> Result<H256, Error> {
 }
 
 fn read_signature<C: Crypto>(matches: &ArgMatches) -> Result<SignatureOf<C>, Error>
-where
-	SignatureOf<C>: SignatureT,
-	PublicOf<C>: PublicT,
+	where
+		SignatureOf<C>: SignatureT,
+		PublicOf<C>: PublicT,
 {
 	let sig_data = matches
 		.value_of("sig")
@@ -603,8 +603,8 @@ where
 }
 
 fn read_public_key<C: Crypto>(matched_uri: Option<&str>) -> PublicOf<C>
-where
-	PublicOf<C>: PublicT,
+	where
+		PublicOf<C>: PublicT,
 {
 	let uri = matched_uri.expect("parameter is required; thus it can't be None; qed");
 	let uri = if uri.starts_with("0x") {
@@ -724,9 +724,9 @@ mod tests {
 	use super::*;
 
 	fn test_generate_sign_verify<CryptoType: Crypto>()
-	where
-		SignatureOf<CryptoType>: SignatureT,
-		PublicOf<CryptoType>: PublicT,
+		where
+			SignatureOf<CryptoType>: SignatureT,
+			PublicOf<CryptoType>: PublicT,
 	{
 		let usage = get_usage();
 		let app = get_app(&usage);

client/cli/Cargo.toml

@@ -23,8 +23,17 @@ tokio = { version = "0.2.9", features = [ "signal", "rt-core", "rt-threaded" ] }
 futures = "0.3.1"
 fdlimit = "0.1.1"
 serde_json = "1.0.41"
+parity-scale-codec = "1.2.0"
+hex = "0.4.2"
+frame-system = { version = "2.0.0-alpha.3", path = "../../frame/system" }
+frame-support = { version = "2.0.0-alpha.3", path = "../../frame/support" }
+pallet-balances = { version = "2.0.0-alpha.3", path = "../../frame/balances" }
+pallet-indices = { version = "2.0.0-alpha.3", path = "../../frame/indices" }
+pallet-transaction-payment = { version = "2.0.0-alpha.3", path = "../../frame/transaction-payment" }
 sc-informant = { version = "0.8.0-alpha.2", path = "../informant" }
 sp-panic-handler = { version = "2.0.0-alpha.2", path = "../../primitives/panic-handler" }
+sp-version = { version = "2.0.0-alpha.3", path = "../../primitives/version" }
+sp-io = { version = "2.0.0-alpha.3", path = "../../primitives/io" }
 sc-client-api = { version = "2.0.0-alpha.2", path = "../api" }
 sp-blockchain = { version = "2.0.0-alpha.2", path = "../../primitives/blockchain" }
 sc-network = { version = "0.8.0-alpha.2", path = "../network" }
@@ -36,16 +45,27 @@ sc-telemetry = { version = "2.0.0-alpha.2", path = "../telemetry" }
 substrate-prometheus-endpoint = { path = "../../utils/prometheus" , version = "0.8.0-alpha.2"}
 sp-keyring = { version = "2.0.0-alpha.2", path = "../../primitives/keyring" }
 names = "0.11.0"
-structopt = "0.3.8"
+structopt = "0.3.11"
+hyper = "0.12.35"
+rand = "0.7.2"
+serde = "1.0.104"
+futures01 = { package = "futures", version = "0.1.29" }
+sc-rpc = { version = "2.0.0-alpha.3", path = "../../client/rpc" }
+jsonrpc-core-client = { version = "14.0.3", features = ["http"] }
 sc-tracing = { version = "2.0.0-alpha.2", path = "../tracing" }
 chrono = "0.4.10"
 parity-util-mem = { version = "0.5.1", default-features = false, features = ["primitive-types"] }
+tiny-bip39 = "0.6.2"
+libp2p = "0.15.0"
+hex-literal = "0.2.1"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 rpassword = "4.0.1"
 
 [dev-dependencies]
 tempfile = "3.1.0"
+substrate-test-runtime = { version = "2.0.0-dev", features = ["indices-lookup"], path = "../../test-utils/runtime" }
+sp-application-crypto = { version = "2.0.0-alpha.2", default-features = false, path = "../../primitives/application-crypto" }
 
 [features]
 wasmtime = [

client/cli/src/arg_enums.rs

@@ -82,6 +82,15 @@ arg_enum! {
 	}
 }
 
+arg_enum! {
+	#[allow(missing_docs)]
+	#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+	pub enum OutputType {
+		Json,
+		Text,
+	}
+}
+
 arg_enum! {
 	/// How to execute blocks
 	#[derive(Debug, Clone, Copy, PartialEq, Eq)]

client/cli/src/commands/generate.rs

@@ -0,0 +1,84 @@
+// Copyright 2018-2020 Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Substrate is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Substrate is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Implementation of the `generate` subcommand
+
+use super::{SharedParams, RuntimeAdapter, get_password};
+use crate::error::{self, Error};
+use bip39::{MnemonicType, Mnemonic, Language};
+use structopt::StructOpt;
+use crate::{AccountIdFor, VersionInfo};
+use sp_core::crypto::{Ss58Codec, Derive};
+use sc_service::{Configuration, ChainSpec};
+
+/// The `generate` command
+#[derive(Debug, StructOpt, Clone)]
+#[structopt(name = "generate", about = "Generate a random account")]
+pub struct GenerateCmd {
+	/// The number of words in the phrase to generate. One of 12 default), 15, 18, 21 and 24.
+	#[structopt(long, short = "w", value_name = "WORDS")]
+	words: Option<usize>,
+
+	#[allow(missing_docs)]
+	#[structopt(flatten)]
+	pub shared_params: SharedParams,
+}
+
+impl GenerateCmd {
+	/// Run the command
+	pub fn run<RA: RuntimeAdapter>(self) -> error::Result<()>
+		where
+			AccountIdFor<RA>: Ss58Codec + Derive,
+	{
+		let words = match self.words {
+			Some(words) => {
+				MnemonicType::for_word_count(words)
+					.map_err(|_| {
+						Error::Input("Invalid number of words given for phrase: must be 12/15/18/21/24".into())
+					})?
+			},
+			None => MnemonicType::Words12,
+		};
+		let mnemonic = Mnemonic::new(words, Language::English);
+		let password = get_password(&self.shared_params)?;
+		let maybe_network = self.shared_params.network;
+		let output = self.shared_params.output_type;
+
+		RA::print_from_uri(
+			mnemonic.phrase(),
+			Some(password.as_str()),
+			maybe_network,
+			output
+		);
+
+		Ok(())
+	}
+
+	/// Update and prepare a `Configuration` with command line parameters
+	pub fn update_config<F>(
+		&self,
+		mut config: &mut Configuration,
+		spec_factory: F,
+		version: &VersionInfo,
+	) -> error::Result<()> where
+		F: FnOnce(&str) -> Result<Box<dyn ChainSpec>, String>,
+	{
+		self.shared_params.update_config(&mut config, spec_factory, version)?;
+		config.use_in_memory_keystore()?;
+
+		Ok(())
+	}
+}