From e2570c98eed62266baacf8a93586895e2a1ec154 Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Sat, 25 Jan 2020 07:21:23 -0700 Subject: [PATCH] CLI: Add authority to show-nonce-account output (#7969) --- cli/src/nonce.rs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/cli/src/nonce.rs b/cli/src/nonce.rs index 8cadfc6e85..42b4cdba27 100644 --- a/cli/src/nonce.rs +++ b/cli/src/nonce.rs @@ -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| { + 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