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

Ledger: return specific error if ledger-app-solana is not running (#8684)

Browse Source 
* Specific error if ledger-app-solana is not running

* Return helpful error

* Include signer name in multiple-device prompt
This commit is contained in:
Tyera Eulberg
2020-03-06 16:03:23 -07:00
committed by GitHub
parent 39b3ce9bd3
commit ca8bf8f964
4 changed files with 55 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
remote-wallet/src/remote_keypair.rs
View File

@@ -53,13 +53,14 @@ pub fn generate_remote_keypair(
explicit_derivation_path: Option<DerivationPath>,
wallet_manager: &RemoteWalletManager,
confirm_key: bool,
keypair_name: &str,
) -> Result<RemoteKeypair, RemoteWalletError> {
let (remote_wallet_info, mut derivation_path) = RemoteWalletInfo::parse_path(path)?;
if let Some(derivation) = explicit_derivation_path {
derivation_path = derivation;
}
if remote_wallet_info.manufacturer == "ledger" {
let ledger = get_ledger_from_info(remote_wallet_info, wallet_manager)?;
let ledger = get_ledger_from_info(remote_wallet_info, keypair_name, wallet_manager)?;
Ok(RemoteKeypair::new(
RemoteWalletType::Ledger(ledger),
derivation_path,