mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-27 18:37:59 +00:00
6963272451
* 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>
124 lines
3.9 KiB
Rust
124 lines
3.9 KiB
Rust
// This file is part of Substrate.
|
|
|
|
// Copyright (C) 2018-2020 Parity Technologies (UK) Ltd.
|
|
// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
|
|
|
|
// This program 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.
|
|
|
|
// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
use crate::error::Result;
|
|
use sc_service::config::KeystoreConfig;
|
|
use std::fs;
|
|
use std::path::PathBuf;
|
|
use structopt::StructOpt;
|
|
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";
|
|
|
|
/// Parameters of the keystore
|
|
#[derive(Debug, StructOpt)]
|
|
pub struct KeystoreParams {
|
|
/// Specify custom keystore path.
|
|
#[structopt(long = "keystore-path", value_name = "PATH", parse(from_os_str))]
|
|
pub keystore_path: Option<PathBuf>,
|
|
|
|
/// Use interactive shell for entering the password used by the keystore.
|
|
#[structopt(
|
|
long = "password-interactive",
|
|
conflicts_with_all = &[ "password", "password-filename" ]
|
|
)]
|
|
pub password_interactive: bool,
|
|
|
|
/// Password used by the keystore.
|
|
#[structopt(
|
|
long = "password",
|
|
parse(try_from_str = secret_string_from_str),
|
|
conflicts_with_all = &[ "password-interactive", "password-filename" ]
|
|
)]
|
|
pub password: Option<SecretString>,
|
|
|
|
/// File that contains the password used by the keystore.
|
|
#[structopt(
|
|
long = "password-filename",
|
|
value_name = "PATH",
|
|
parse(from_os_str),
|
|
conflicts_with_all = &[ "password-interactive", "password" ]
|
|
)]
|
|
pub password_filename: Option<PathBuf>,
|
|
}
|
|
|
|
/// Parse a sercret string, returning a displayable error.
|
|
pub fn secret_string_from_str(s: &str) -> std::result::Result<SecretString, String> {
|
|
Ok(std::str::FromStr::from_str(s)
|
|
.map_err(|_e| "Could not get SecretString".to_string())?)
|
|
}
|
|
|
|
impl KeystoreParams {
|
|
/// Get the keystore configuration for the parameters
|
|
pub fn keystore_config(&self, base_path: &PathBuf) -> Result<KeystoreConfig> {
|
|
let password = if self.password_interactive {
|
|
#[cfg(not(target_os = "unknown"))]
|
|
{
|
|
let mut password = input_keystore_password()?;
|
|
let secret = std::str::FromStr::from_str(password.as_str())
|
|
.map_err(|()| "Error reading password")?;
|
|
password.zeroize();
|
|
Some(secret)
|
|
}
|
|
#[cfg(target_os = "unknown")]
|
|
None
|
|
} else if let Some(ref file) = self.password_filename {
|
|
let mut password = fs::read_to_string(file)
|
|
.map_err(|e| format!("{}", e))?;
|
|
let secret = std::str::FromStr::from_str(password.as_str())
|
|
.map_err(|()| "Error reading password")?;
|
|
password.zeroize();
|
|
Some(secret)
|
|
} else {
|
|
self.password.clone()
|
|
};
|
|
|
|
let path = self
|
|
.keystore_path
|
|
.clone()
|
|
.unwrap_or_else(|| base_path.join(DEFAULT_KEYSTORE_CONFIG_PATH));
|
|
|
|
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"))]
|
|
fn input_keystore_password() -> Result<String> {
|
|
rpassword::read_password_from_tty(Some("Keystore password: "))
|
|
.map_err(|e| format!("{:?}", e).into())
|
|
}
|