Merge Subkey into sc-cli (#4954)

* draft * revert * WIP * all that remains is tests * update Cargo.lock * tests WIP * WIP refactor node-template-runtime and node-runtime * implments sc_cli::RuntimeAdapter for node_template_runtime::Runtime * final draft * fix update_config for subcommands * proper AccountId decoding * test-runtime tests * revert * move RuntimeAdapter to cli-utils * use &'static str for TryFrom::<&'a str>::Error for Ss58AddressFormat * tests * add frame-system to sc-cli dev-dependencies * add frame-system to sc-cli dev-dependencies * fix ui test * wip * fixed inspect test * bump impl version * bump impl version, fixx spaces remove todos * pallet-balances-cli, rustc for some reason cannot resolve pallet_balances_cli in node-cli 😩 * wip * Subcommand::run takes &self * can't believe i missed that 🤦🏾‍♂️ * bump wasm-bindgen for some reason * adds key subcommand, rename generate-node-key to generate-node-id * cargo update and crossed fingers 🤞🏽 * update ui test * update more ui tests * should be all good now * revert subkey change * revert subkey change * adds frame-utilities-cli * Apply suggestions from code review Co-authored-by: Benjamin Kampmann <ben@gnunicorn.org> * removes frame from sc-cli, fix license * my editor and ci disagrees on line width * bump spec version * turn off default features for parity-scale-codec * enable full_crypto feature for sp-core in cli-utils * merge frame-utilities-cli with pallet-balances-cli * remove full_crypto feature from sp_core in cli-utils * bump Cargo.lock * cli-utils -> frame-utils * rename BlockNumber to GenericNumber, fix spaces * fix spaces * construct additional_signed manually * sign test * remove unused vars * implement subkey with frame-utilities-cli and sc_cli * fix moduleid test * CI and clion disagree on line widths * adds associated Params type to SignedExtensionProvider * Apply suggestions from code review Co-authored-by: Benjamin Kampmann <ben@gnunicorn.org> * move some code around * removes unneccesary generic params * moves module_id back to frame_utilities_cli * Apply suggestions from code review Co-authored-by: Benjamin Kampmann <ben@gnunicorn.org> Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * remove print_ext * remove MaybeDisplay from pallet_balances::Trait::Balance * a lot of stuff tbh * adds ExtrasParamsBuilder * remove tests for ModuleIdCmd * address comments from PR * bump Cargo.lock * manually insert key into keystore * remove unnecessary SharedParams * add validation to vanity pattern, remove unused arg * remove SharedParams from Sign, Vanity, Verify * remove SharedParams from ModuleIdCmd, remove expect from Verify, new line to Cargo.toml * remove SharedParams from InsertCmd * 🤦🏾‍♂️ * deleted prometheus.yml * move a few things around * fix vanity test Co-authored-by: Benjamin Kampmann <ben@gnunicorn.org> Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> Co-authored-by: Benjamin Kampmann <ben@parity.io>
2026-04-26 23:57:56 +00:00 · 2020-08-20 10:55:03 +01:00
parent 481ad884d6
commit 6963272451
42 changed files with 2335 additions and 1522 deletions
@@ -21,7 +21,9 @@ use sc_service::config::KeystoreConfig;
 use std::fs;
 use std::path::PathBuf;
 use structopt::StructOpt;
-use sp_core::crypto::SecretString;
+use crate::error;
+use sp_core::crypto::{SecretString, Zeroize};
+use std::str::FromStr;

 /// default sub directory for the key store
 const DEFAULT_KEYSTORE_CONFIG_PATH: &'static str = "keystore";
@@ -73,7 +75,6 @@ impl KeystoreParams {
 				let mut password = input_keystore_password()?;
 				let secret = std::str::FromStr::from_str(password.as_str())
 					.map_err(|()| "Error reading password")?;
-				use sp_core::crypto::Zeroize;
 				password.zeroize();
 				Some(secret)
 			}
@@ -84,7 +85,6 @@ impl KeystoreParams {
 				.map_err(|e| format!("{}", e))?;
 			let secret = std::str::FromStr::from_str(password.as_str())
 				.map_err(|()| "Error reading password")?;
-			use sp_core::crypto::Zeroize;
 			password.zeroize();
 			Some(secret)
 		} else {
@@ -98,6 +98,22 @@ impl KeystoreParams {

 		Ok(KeystoreConfig::Path { path, password })
 	}
+
+	/// helper method to fetch password from `KeyParams` or read from stdin
+	pub fn read_password(&self) -> error::Result<Option<SecretString>> {
+		let (password_interactive, password) = (self.password_interactive, self.password.clone());
+
+		let pass = if password_interactive {
+			let mut password = rpassword::read_password_from_tty(Some("Key password: "))?;
+			let pass = Some(FromStr::from_str(&password).map_err(|()| "Error reading password")?);
+			password.zeroize();
+			pass
+		} else {
+			password
+		};
+
+		Ok(pass)
+	}
 }

 #[cfg(not(target_os = "unknown"))]
@@ -25,8 +25,11 @@ mod pruning_params;
 mod shared_params;
 mod transaction_pool_params;

-use std::{fmt::Debug, str::FromStr};
+use std::{fmt::Debug, str::FromStr, convert::TryFrom};
 use sp_runtime::{generic::BlockId, traits::{Block as BlockT, NumberFor}};
+use sp_core::crypto::Ss58AddressFormat;
+use crate::arg_enums::{OutputType, CryptoScheme};
+use structopt::StructOpt;

 pub use crate::params::database_params::*;
 pub use crate::params::import_params::*;
@@ -39,10 +42,10 @@ pub use crate::params::shared_params::*;
 pub use crate::params::transaction_pool_params::*;

 /// Wrapper type of `String` that holds an unsigned integer of arbitrary size, formatted as a decimal.
-#[derive(Debug)]
-pub struct BlockNumber(String);
+#[derive(Debug, Clone)]
+pub struct GenericNumber(String);

-impl FromStr for BlockNumber {
+impl FromStr for GenericNumber {
 	type Err = String;

 	fn from_str(block_number: &str) -> Result<Self, Self::Err> {
@@ -57,15 +60,15 @@ impl FromStr for BlockNumber {
 	}
 }

-impl BlockNumber {
+impl GenericNumber {
 	/// Wrapper on top of `std::str::parse<N>` but with `Error` as a `String`
 	///
 	/// See `https://doc.rust-lang.org/std/primitive.str.html#method.parse` for more elaborate
 	/// documentation.
 	pub fn parse<N>(&self) -> Result<N, String>
-	where
-		N: FromStr,
-		N::Err: std::fmt::Debug,
+		where
+			N: FromStr,
+			N::Err: std::fmt::Debug,
 	{
 		FromStr::from_str(&self.0).map_err(|e| format!("Failed to parse block number: {:?}", e))
 	}
@@ -89,7 +92,7 @@ impl FromStr for BlockNumberOrHash {
 				Ok(Self(block_number.into()))
 			}
 		} else {
-			BlockNumber::from_str(block_number).map(|v| Self(v.0))
+			GenericNumber::from_str(block_number).map(|v| Self(v.0))
 		}
 	}
 }
@@ -109,11 +112,55 @@ impl BlockNumberOrHash {
 					.map_err(|e| format!("Failed to parse block hash: {:?}", e))?
 			))
 		} else {
-			BlockNumber(self.0.clone()).parse().map(BlockId::Number)
+			GenericNumber(self.0.clone()).parse().map(BlockId::Number)
 		}
 	}
 }

+
+/// Optional flag for specifying crypto algorithm
+#[derive(Debug, StructOpt)]
+pub struct CryptoSchemeFlag {
+	/// cryptography scheme
+	#[structopt(
+		long,
+		value_name = "SCHEME",
+		possible_values = &CryptoScheme::variants(),
+		case_insensitive = true,
+		default_value = "Sr25519"
+	)]
+	pub scheme: CryptoScheme,
+}
+
+/// Optional flag for specifying output type
+#[derive(Debug, StructOpt)]
+pub struct OutputTypeFlag {
+	/// output format
+	#[structopt(
+		long,
+		value_name = "FORMAT",
+		possible_values = &OutputType::variants(),
+		case_insensitive = true,
+		default_value = "Text"
+	)]
+	pub output_type: OutputType,
+}
+
+/// Optional flag for specifying network scheme
+#[derive(Debug, StructOpt)]
+pub struct NetworkSchemeFlag {
+	/// network address format
+	#[structopt(
+		long,
+		value_name = "NETWORK",
+		possible_values = &Ss58AddressFormat::all_names()[..],
+		parse(try_from_str = Ss58AddressFormat::try_from),
+		case_insensitive = true,
+		default_value = "polkadot"
+	)]
+	pub network: Ss58AddressFormat,
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;