update get_signer to use SignerSource::try_get_signer

Author: samkim-crypto

token/cli/src/clap_app.rs

@@ -4,6 +4,7 @@ use {
     },
     solana_clap_v3_utils::{
         fee_payer::fee_payer_arg,
+        input_parsers::signer::SignerSourceParserBuilder,
         input_validators::{
             is_amount, is_amount_or_all, is_parsable, is_pubkey, is_url_or_moniker,
             is_valid_pubkey, is_valid_signer,
@@ -691,7 +692,7 @@ pub fn app<'a>(
                 .arg(
                     Arg::with_name("token_keypair")
                         .value_name("TOKEN_KEYPAIR")
-                        .validator(|s| is_valid_signer(s))
+                        .value_parser(SignerSourceParserBuilder::default().allow_all().build())
                         .takes_value(true)
                         .index(1)
                         .help(
@@ -1215,7 +1216,7 @@ pub fn app<'a>(
                 .arg(
                     Arg::with_name("account_keypair")
                         .value_name("ACCOUNT_KEYPAIR")
-                        .validator(|s| is_valid_signer(s))
+                        .value_parser(SignerSourceParserBuilder::default().allow_all().build())
                         .takes_value(true)
                         .index(2)
                         .help(
@@ -1250,7 +1251,7 @@ pub fn app<'a>(
                 .arg(
                     Arg::with_name("multisig_member")
                         .value_name("MULTISIG_MEMBER_PUBKEY")
-                        .validator(|s| is_valid_pubkey(s))
+                        .validator(|s| is_valid_signer(s))
                         .takes_value(true)
                         .index(2)
                         .required(true)
@@ -1262,7 +1263,7 @@ pub fn app<'a>(
                     Arg::with_name("address_keypair")
                         .long("address-keypair")
                         .value_name("ADDRESS_KEYPAIR")
-                        .validator(|s| is_valid_signer(s))
+                        .value_parser(SignerSourceParserBuilder::default().allow_all().build())
                         .takes_value(true)
                         .help(
                             "Specify the address keypair. \

token/cli/src/command.rs

@@ -17,7 +17,7 @@ use {
         UiAccountData,
     },
     solana_clap_v3_utils::{
-        input_parsers::{pubkey_of_signer, pubkeys_of_multiple_signers},
+        input_parsers::{pubkey_of_signer, pubkeys_of_multiple_signers, signer::SignerSource},
         keypair::signer_from_path,
     },
     solana_cli_output::{
@@ -101,12 +101,10 @@ fn get_signer(
     keypair_name: &str,
     wallet_manager: &mut Option<Rc<RemoteWalletManager>>,
 ) -> Option<(Arc<dyn Signer>, Pubkey)> {
-    matches.value_of(keypair_name).map(|path| {
-        let signer = signer_from_path(matches, path, keypair_name, wallet_manager)
-            .unwrap_or_else(print_error_and_exit);
-        let signer_pubkey = signer.pubkey();
-        (Arc::from(signer), signer_pubkey)
-    })
+    SignerSource::try_get_signer(matches, keypair_name, wallet_manager)
+        .ok()
+        .flatten()
+        .map(|(signer, pubkey)| (signer.into(), pubkey))
 }
 
 fn parse_amount_or_all(matches: &ArgMatches) -> Option<f64> {