diff --git a/Cargo.lock b/Cargo.lock index 5a7374e1ba..8fcedb3070 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3611,11 +3611,13 @@ dependencies = [ [[package]] name = "rpassword" -version = "5.0.1" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" +checksum = "49b7ef46d67d4cecf32ad486814d625738e79e4ccd62531dde0548b2f242f894" dependencies = [ "libc", + "serde", + "serde_json", "winapi 0.3.9", ] diff --git a/clap-utils/Cargo.toml b/clap-utils/Cargo.toml index fbd356ae9d..9f330e34f1 100644 --- a/clap-utils/Cargo.toml +++ b/clap-utils/Cargo.toml @@ -12,7 +12,7 @@ edition = "2021" [dependencies] chrono = "0.4" clap = "2.33.0" -rpassword = "5.0" +rpassword = "6.0" solana-perf = { path = "../perf", version = "=1.10.3" } solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.3", default-features = false } solana-sdk = { path = "../sdk", version = "=1.10.3" } diff --git a/clap-utils/src/keypair.rs b/clap-utils/src/keypair.rs index 927e455a83..1634e6bb3e 100644 --- a/clap-utils/src/keypair.rs +++ b/clap-utils/src/keypair.rs @@ -17,7 +17,7 @@ use { }, bip39::{Language, Mnemonic, Seed}, clap::ArgMatches, - rpassword::prompt_password_stderr, + rpassword::prompt_password, solana_remote_wallet::{ locator::{Locator as RemoteWalletLocator, LocatorError as RemoteWalletLocatorError}, remote_keypair::generate_remote_keypair, @@ -945,9 +945,9 @@ pub const SKIP_SEED_PHRASE_VALIDATION_ARG: ArgConstant<'static> = ArgConstant { /// Prompts user for a passphrase and then asks for confirmirmation to check for mistakes pub fn prompt_passphrase(prompt: &str) -> Result> { - let passphrase = prompt_password_stderr(prompt)?; + let passphrase = prompt_password(prompt)?; if !passphrase.is_empty() { - let confirmed = rpassword::prompt_password_stderr("Enter same passphrase again: ")?; + let confirmed = rpassword::prompt_password("Enter same passphrase again: ")?; if confirmed != passphrase { return Err("Passphrases did not match".into()); } @@ -1055,7 +1055,7 @@ pub fn keypair_from_seed_phrase( derivation_path: Option, legacy: bool, ) -> Result> { - let seed_phrase = prompt_password_stderr(&format!("[{}] seed phrase: ", keypair_name))?; + let seed_phrase = prompt_password(&format!("[{}] seed phrase: ", keypair_name))?; let seed_phrase = seed_phrase.trim(); let passphrase_prompt = format!( "[{}] If this seed phrase has an associated passphrase, enter it now. Otherwise, press ENTER to continue: ", diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 50c9bb026a..c10c758f31 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -2325,11 +2325,13 @@ dependencies = [ [[package]] name = "rpassword" -version = "5.0.1" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" +checksum = "49b7ef46d67d4cecf32ad486814d625738e79e4ccd62531dde0548b2f242f894" dependencies = [ "libc", + "serde", + "serde_json", "winapi", ]