gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make generate_remote_keypair more generic for potential other remote-wallets (#8274)

Browse Source
This commit is contained in:
Tyera Eulberg
2020-02-14 09:38:35 -07:00
committed by GitHub
parent 5b4ecb01ca
commit c350543b46
3 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
keygen/src/keygen.rs
View File

@ -14,10 +14,7 @@ use solana_clap_utils::{
},
};
use solana_cli_config::config::{Config, CONFIG_FILE};
use solana_remote_wallet::{
ledger::{generate_remote_keypair, get_ledger_from_info},
remote_wallet::RemoteWalletInfo,
};
use solana_remote_wallet::remote_keypair::generate_remote_keypair;
use solana_sdk::{
pubkey::write_pubkey_file,
signature::{
@ -82,14 +79,10 @@ fn get_keypair_from_matches(
let mut stdin = std::io::stdin();
Ok(Box::new(read_keypair(&mut stdin)?))
}
KeypairUrl::Usb(path) => {
let (remote_wallet_info, mut derivation_path) = RemoteWalletInfo::parse_path(path)?;
if let Some(derivation) = derivation_of(matches, "derivation_path") {
derivation_path = derivation;
}
let ledger = get_ledger_from_info(remote_wallet_info)?;
Ok(Box::new(generate_remote_keypair(ledger, derivation_path)))
}
KeypairUrl::Usb(path) => Ok(Box::new(generate_remote_keypair(
path,
derivation_of(matches, "derivation_path"),
)?)),
}
}