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

CLI: Strive for at least one signer (bp #14767) (#14778)

Browse Source 
* CLI: Strive for at least one signer

(cherry picked from commit 8f8d593457)

* CLI: Allow missing pubkey in `--verbose` config output

(cherry picked from commit 90e1778cd2)

* CLI: Don't scare the users

(cherry picked from commit e9c98f2416)

Co-authored-by: Trent Nelson <trent@solana.com>
This commit is contained in:
mergify[bot]
2021-01-22 19:46:17 +00:00
committed by GitHub
parent 1041532c0e
commit feb27f0add
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cli/src/cli.rs
View File

@ -1163,7 +1163,11 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
println_name_value("RPC URL:", &config.json_rpc_url); println_name_value("RPC URL:", &config.json_rpc_url);
println_name_value("Default Signer Path:", &config.keypair_path); println_name_value("Default Signer Path:", &config.keypair_path);
if config.keypair_path.starts_with("usb://") { if config.keypair_path.starts_with("usb://") {
println_name_value("Pubkey:", &format!("{:?}", config.pubkey()?)); let pubkey = config
.pubkey()
.map(|pubkey| format!("{:?}", pubkey))
.unwrap_or_else(|_| "Unavailable".to_string());
println_name_value("Pubkey:", &pubkey);
} }
println_name_value("Commitment:", &config.commitment.commitment.to_string()); println_name_value("Commitment:", &config.commitment.commitment.to_string());
} }

15
cli/src/main.rs
View File

@ -184,8 +184,18 @@ pub fn parse_args<'a>(
path: default_signer_path.clone(), path: default_signer_path.clone(),
}; };
let CliCommandInfo { command, signers } = let CliCommandInfo {
parse_command(&matches, &default_signer, &mut wallet_manager)?; command,
mut signers,
} = parse_command(&matches, &default_signer, &mut wallet_manager)?;
if signers.is_empty() {
if let Ok(signer_info) =
default_signer.generate_unique_signers(vec![None], matches, &mut wallet_manager)
{
signers.extend(signer_info.signers);
}
}
let verbose = matches.is_present("verbose"); let verbose = matches.is_present("verbose");
let output_format = matches let output_format = matches
@ -232,7 +242,6 @@ pub fn parse_args<'a>(
} }
fn main() -> Result<(), Box<dyn error::Error>> { fn main() -> Result<(), Box<dyn error::Error>> {
solana_logger::setup();
let matches = app( let matches = app(
crate_name!(), crate_name!(),
crate_description!(), crate_description!(),