Add select for multiple wallets

solana-labs · Jan 31, 2020 · bad3bc9 · bad3bc9
1 parent d69ace5
commit bad3bc9
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/keygen/Cargo.toml b/keygen/Cargo.toml
@@ -11,6 +11,7 @@ edition = "2018"
 [dependencies]
 bs58 = "0.3.0"
 clap = "2.33"
+dialoguer = "0.5.0"
 dirs = "2.0.2"
 num_cpus = "1.12.0"
 rpassword = "4.0"

diff --git a/keygen/src/keygen.rs b/keygen/src/keygen.rs
@@ -4,6 +4,7 @@ use clap::{
     crate_description, crate_name, value_t, values_t_or_exit, App, AppSettings, Arg, ArgMatches,
     SubCommand,
 };
+use dialoguer::{theme::ColorfulTheme, Select};
 use num_cpus;
 use solana_clap_utils::{
     input_parsers::{derivation_of, pubkey_of},
@@ -396,21 +397,42 @@ fn main() -> Result<(), Box<dyn error::Error>> {
                 }
                 let wallet_base_pubkey =
                     pubkey_of(matches, "wallet_base_pubkey").unwrap_or_else(|| {
+                        let devices = wallet_manager.list_devices();
                         if device_count > 1 {
-                            // TODO: Prompt for choice
-                            println!("Choosing between multiple wallets currently not supported");
-                            exit(1);
+                            let select_devices: Vec<String> = devices
+                                .iter()
+                                .map(|device_info| {
+                                    format!(
+                                        "{}, {}, base pubkey: {:?}",
+                                        device_info.manufacturer,
+                                        device_info.name,
+                                        device_info.pubkey
+                                    )
+                                })
+                                .collect();
+
+                            let selection = Select::with_theme(&ColorfulTheme::default())
+                                .with_prompt(
+                                    "Multiple hardware wallets found. Please select a device",
+                                )
+                                .default(0)
+                                .items(&select_devices[..])
+                                .interact()
+                                .unwrap();
+                            devices[selection].pubkey
+                        } else {
+                            devices[0].pubkey
                         }
-                        wallet_manager.list_devices()[0].pubkey
                     });
 
                 let ledger = wallet_manager.get_ledger(&wallet_base_pubkey).unwrap_or_else(|_| {
                     println!("Wallet {:?} not found. Make sure the Solana Wallet app is still running.", wallet_base_pubkey);
                     exit(1);
                 });
+                let wallet_info = wallet_manager.get_wallet_info(&wallet_base_pubkey).unwrap();
                 println!(
-                    "Getting key from wallet: {:?}",
-                    wallet_manager.get_wallet_info(&wallet_base_pubkey).unwrap()
+                    "Getting key from wallet: {}, {}, {:?}",
+                    wallet_info.manufacturer, wallet_info.name, wallet_info.pubkey
                 );
 
                 let derivation = derivation_of(matches, "derivation")