blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

keygen: Support not writing keypairs to disk (#7136) 

* keygen: Add flag to prevent new from writing keypair to disk

* check_for_overwrite bails, do it before prompts
This commit is contained in:
Trent Nelson 2019-11-25 22:43:03 -07:00 committed by GitHub
parent acd1505050
commit 506ff5809e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
keygen/src/keygen.rs
View File

@ -78,6 +78,12 @@ fn main() -> Result<(), Box<dyn error::Error>> {
.long("no-passphrase") .long("no-passphrase")
.help("Do not prompt for a passphrase"), .help("Do not prompt for a passphrase"),
) )
.arg(
Arg::with_name("no_outfile")
.long("no-outfile")
.conflicts_with_all(&["outfile", "silent"])
.help("Only print a seed phrase and pubkey. Do not output a keypair file"),
)
.arg( .arg(
Arg::with_name("silent") Arg::with_name("silent")
.short("s") .short("s")
@ -201,14 +207,18 @@ fn main() -> Result<(), Box<dyn error::Error>> {
("new", Some(matches)) => { ("new", Some(matches)) => {
let mut path = dirs::home_dir().expect("home directory"); let mut path = dirs::home_dir().expect("home directory");
let outfile = if matches.is_present("outfile") { let outfile = if matches.is_present("outfile") {
matches.value_of("outfile").unwrap() matches.value_of("outfile")
} else if matches.is_present("no_outfile") {
None
} else { } else {
path.extend(&[".config", "solana", "id.json"]); path.extend(&[".config", "solana", "id.json"]);
path.to_str().unwrap() Some(path.to_str().unwrap())
}; };
if outfile != "-" { match outfile {
check_for_overwrite(&outfile, &matches); Some("-") => (),
Some(outfile) => check_for_overwrite(&outfile, &matches),
None => (),
} }
let mnemonic = Mnemonic::new(MnemonicType::Words12, Language::English); let mnemonic = Mnemonic::new(MnemonicType::Words12, Language::English);
@ -223,7 +233,9 @@ fn main() -> Result<(), Box<dyn error::Error>> {
let seed = Seed::new(&mnemonic, &passphrase); let seed = Seed::new(&mnemonic, &passphrase);
let keypair = keypair_from_seed(seed.as_bytes())?; let keypair = keypair_from_seed(seed.as_bytes())?;
output_keypair(&keypair, &outfile, "new")?; if let Some(outfile) = outfile {
output_keypair(&keypair, &outfile, "new")?;
}
let silent = matches.is_present("silent"); let silent = matches.is_present("silent");
if !silent { if !silent {