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

CLI: Add authority to show-nonce-account output (#7969)

This commit is contained in:
Trent Nelson 2020-01-25 07:21:23 -07:00 committed by GitHub
parent b5125479ec
commit e2570c98ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cli/src/nonce.rs
View File

@ -10,7 +10,7 @@ use solana_sdk::{
account::Account,
account_utils::StateMut,
hash::Hash,
nonce_state::NonceState,
nonce_state::{Meta, NonceState},
pubkey::Pubkey,
signature::{Keypair, KeypairUtil},
system_instruction::{
@ -558,7 +558,7 @@ pub fn process_show_nonce_account(
))
.into());
}
let print_account = |hash: Option<Hash>| {
let print_account = |data: Option<(Meta, Hash)>| {
println!(
"balance: {}",
build_balance_message(nonce_account.lamports, use_lamports_unit, true)
@ -571,15 +571,21 @@ pub fn process_show_nonce_account(
true
)
);
match hash {
Some(hash) => println!("nonce: {}", hash),
None => println!("nonce: uninitialized"),
match data {
Some((meta, hash)) => {
println!("nonce: {}", hash);
println!("authority: {}", meta.nonce_authority);
}
None => {
println!("nonce: uninitialized");
println!("authority: uninitialized");
}
}
Ok("".to_string())
};
match nonce_account.state() {
Ok(NonceState::Uninitialized) => print_account(None),
Ok(NonceState::Initialized(_, hash)) => print_account(Some(hash)),
Ok(NonceState::Initialized(meta, hash)) => print_account(Some((meta, hash))),
Err(err) => Err(CliError::RpcRequestError(format!(
"Account data could not be deserialized to nonce state: {:?}",
err