8e20176337
Closes #1487 Closes #1427 Directory restructure in accordance with #1487. Also has temporary migration code to move the old directories into new structure. Also extracts all default directory names and utility functions into a `directory` crate to avoid repetitio. ~Since `validator_definition.yaml` stores absolute paths, users will have to manually change the keystore paths or delete the file to get the validators picked up by the vc.~. `validator_definition.yaml` is migrated as well from the default directories. Co-authored-by: realbigsean <seananderson33@gmail.com> Co-authored-by: Paul Hauner <paul@paulhauner.com>
68 lines
2.3 KiB
Rust
68 lines
2.3 KiB
Rust
use account_utils::PlainText;
|
|
use account_utils::{read_input_from_user, strip_off_newlines};
|
|
use eth2_wallet::bip39::{Language, Mnemonic};
|
|
use std::fs;
|
|
use std::path::PathBuf;
|
|
use std::str::from_utf8;
|
|
use std::thread::sleep;
|
|
use std::time::Duration;
|
|
|
|
pub const MNEMONIC_PROMPT: &str = "Enter the mnemonic phrase:";
|
|
pub const WALLET_NAME_PROMPT: &str = "Enter wallet name:";
|
|
|
|
pub fn read_mnemonic_from_cli(
|
|
mnemonic_path: Option<PathBuf>,
|
|
stdin_inputs: bool,
|
|
) -> Result<Mnemonic, String> {
|
|
let mnemonic = match mnemonic_path {
|
|
Some(path) => fs::read(&path)
|
|
.map_err(|e| format!("Unable to read {:?}: {:?}", path, e))
|
|
.and_then(|bytes| {
|
|
let bytes_no_newlines: PlainText = strip_off_newlines(bytes).into();
|
|
let phrase = from_utf8(&bytes_no_newlines.as_ref())
|
|
.map_err(|e| format!("Unable to derive mnemonic: {:?}", e))?;
|
|
Mnemonic::from_phrase(phrase, Language::English).map_err(|e| {
|
|
format!(
|
|
"Unable to derive mnemonic from string {:?}: {:?}",
|
|
phrase, e
|
|
)
|
|
})
|
|
})?,
|
|
None => loop {
|
|
eprintln!("");
|
|
eprintln!("{}", MNEMONIC_PROMPT);
|
|
|
|
let mnemonic = read_input_from_user(stdin_inputs)?;
|
|
|
|
match Mnemonic::from_phrase(mnemonic.as_str(), Language::English) {
|
|
Ok(mnemonic_m) => {
|
|
eprintln!("Valid mnemonic provided.");
|
|
eprintln!("");
|
|
sleep(Duration::from_secs(1));
|
|
break mnemonic_m;
|
|
}
|
|
Err(_) => {
|
|
eprintln!("Invalid mnemonic");
|
|
}
|
|
}
|
|
},
|
|
};
|
|
Ok(mnemonic)
|
|
}
|
|
|
|
/// Reads in a wallet name from the user. If the `--wallet-name` flag is provided, use it. Otherwise
|
|
/// read from an interactive prompt using tty unless the `--stdin-inputs` flag is provided.
|
|
pub fn read_wallet_name_from_cli(
|
|
wallet_name: Option<String>,
|
|
stdin_inputs: bool,
|
|
) -> Result<String, String> {
|
|
match wallet_name {
|
|
Some(name) => Ok(name),
|
|
None => {
|
|
eprintln!("{}", WALLET_NAME_PROMPT);
|
|
|
|
read_input_from_user(stdin_inputs)
|
|
}
|
|
}
|
|
}
|