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

Add flag to confirm key on device (#8478)

Browse Source
This commit is contained in:
Tyera Eulberg
2020-02-26 15:24:44 -07:00
committed by GitHub
parent d47a47924a
commit f6f0f94e17
5 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,9 +20,10 @@ impl RemoteKeypair {
pub fn new(
wallet_type: RemoteWalletType,
derivation_path: DerivationPath,
confirm_key: bool,
) -> Result<Self, RemoteWalletError> {
let pubkey = match &wallet_type {
RemoteWalletType::Ledger(wallet) => wallet.get_pubkey(&derivation_path)?,
RemoteWalletType::Ledger(wallet) => wallet.get_pubkey(&derivation_path, confirm_key)?,
};
Ok(Self {
@@ -51,6 +52,7 @@ pub fn generate_remote_keypair(
path: String,
explicit_derivation_path: Option<DerivationPath>,
wallet_manager: &RemoteWalletManager,
confirm_key: bool,
) -> Result<RemoteKeypair, RemoteWalletError> {
let (remote_wallet_info, mut derivation_path) = RemoteWalletInfo::parse_path(path)?;
if let Some(derivation) = explicit_derivation_path {
@@ -61,6 +63,7 @@ pub fn generate_remote_keypair(
Ok(RemoteKeypair::new(
RemoteWalletType::Ledger(ledger),
derivation_path,
confirm_key,
)?)
} else {
Err(RemoteWalletError::DeviceTypeMismatch)