blockworks-foundation
/
solana-program-library
mirror of https://github.com/blockworks-foundation/solana-program-library.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

spl-token-cli: Use CLI config wallet for nonce authority fallback

This commit is contained in:
Trent Nelson 2021-04-01 00:44:47 -06:00 committed by Trent Nelson
parent 25a6a6e923
commit 84f2f33f49
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
token/cli/src/main.rs
View File

@ -1954,16 +1954,23 @@ fn main() {
eprintln!("error: {}", e);
exit(1);
});
let (signer, nonce_authority) =
signer_of(&matches, NONCE_AUTHORITY_ARG.name, &mut wallet_manager).unwrap_or_else(
|e| {
eprintln!("error: {}", e);
exit(1);
},
);
if signer.is_some() {
bulk_signers.push(signer);
}
let (signer, nonce_authority) = signer_from_path(
&matches,
matches
.value_of(NONCE_AUTHORITY_ARG.name)
.unwrap_or(&cli_config.keypair_path),
NONCE_AUTHORITY_ARG.name,
&mut wallet_manager,
)
.map(|s| {
let p = s.pubkey();
(Some(s), Some(p))
})
.unwrap_or_else(|e| {
eprintln!("error: {}", e);
exit(1);
});
bulk_signers.push(signer);
let blockhash_query = BlockhashQuery::new_from_matches(matches);
let sign_only = matches.is_present(SIGN_ONLY_ARG.name);