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

Update wallet to trigger keygen if no keypair provided and no keypair found in default location

This commit is contained in:
Tyera Eulberg 2018-09-14 18:13:12 -06:00 committed by Tyera Eulberg
parent 10daa015c4
commit a06f4b1d44
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/wallet.rs
View File

@ -13,6 +13,7 @@ use solana::thin_client::poll_gossip_for_leader;
use solana::wallet::{parse_command, process_command, WalletConfig, WalletError};
use std::error;
use std::net::SocketAddr;
use std::process::Command;
pub fn parse_args(matches: &ArgMatches) -> Result<WalletConfig, Box<error::Error>> {
let network = if let Some(addr) = matches.value_of("network") {
@ -35,6 +36,15 @@ pub fn parse_args(matches: &ArgMatches) -> Result<WalletConfig, Box<error::Error
matches.value_of("keypair").unwrap()
} else {
path.extend(&[".config", "solana", "id.json"]);
if !path.exists() {
Command::new("cargo")
.arg("run")
.arg("--bin")
.arg("solana-keygen")
.status()
.expect("failed to execute process");
}
path.to_str().unwrap()
};
let id = read_keypair(id_path).or_else(|err| {