Add commitment flag to vote-account and validators commands (#8597) (#8606)

automerge
2020-03-03 17:47:14 -08:00
parent dc75837500
commit 061319f35a
6 changed files with 104 additions and 58 deletions
--- a/cli/src/cli.rs
+++ b/cli/src/cli.rs
@@ -208,6 +208,7 @@ pub enum CliCommand {
    },
    ShowValidators {
        use_lamports_unit: bool,
+        commitment_config: CommitmentConfig,
    },
    // Nonce commands
    AuthorizeNonceAccount {
@@ -353,6 +354,7 @@ pub enum CliCommand {
    ShowVoteAccount {
        pubkey: Pubkey,
        use_lamports_unit: bool,
+        commitment_config: CommitmentConfig,
    },
    VoteAuthorize {
        vote_account_pubkey: Pubkey,
@@ -1559,13 +1561,13 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
        CliCommand::GetBlockTime { slot } => process_get_block_time(&rpc_client, *slot),
        CliCommand::GetGenesisHash => process_get_genesis_hash(&rpc_client),
        CliCommand::GetEpochInfo { commitment_config } => {
-            process_get_epoch_info(&rpc_client, commitment_config)
+            process_get_epoch_info(&rpc_client, *commitment_config)
        }
        CliCommand::GetSlot { commitment_config } => {
-            process_get_slot(&rpc_client, commitment_config)
+            process_get_slot(&rpc_client, *commitment_config)
        }
        CliCommand::GetTransactionCount { commitment_config } => {
-            process_get_transaction_count(&rpc_client, commitment_config)
+            process_get_transaction_count(&rpc_client, *commitment_config)
        }
        CliCommand::LeaderSchedule => process_leader_schedule(&rpc_client),
        CliCommand::LiveSlots => process_live_slots(&config.websocket_url),
@@ -1582,7 +1584,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
            interval,
            count,
            timeout,
-            commitment_config,
+            *commitment_config,
        ),
        CliCommand::ShowBlockProduction { epoch, slot_limit } => {
            process_show_block_production(&rpc_client, config, *epoch, *slot_limit)
@@ -1596,9 +1598,10 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
            *use_lamports_unit,
            vote_account_pubkeys.as_deref(),
        ),
-        CliCommand::ShowValidators { use_lamports_unit } => {
-            process_show_validators(&rpc_client, *use_lamports_unit)
-        }
+        CliCommand::ShowValidators {
+            use_lamports_unit,
+            commitment_config,
+        } => process_show_validators(&rpc_client, *use_lamports_unit, *commitment_config),

        // Nonce Commands

@@ -1910,11 +1913,13 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
        CliCommand::ShowVoteAccount {
            pubkey: vote_account_pubkey,
            use_lamports_unit,
+            commitment_config,
        } => process_show_vote_account(
            &rpc_client,
            config,
            &vote_account_pubkey,
            *use_lamports_unit,
+            *commitment_config,
        ),
        CliCommand::VoteAuthorize {
            vote_account_pubkey,
--- a/cli/src/cluster_query.rs
+++ b/cli/src/cluster_query.rs
@@ -217,6 +217,14 @@ impl ClusterQuerySubCommands for App<'_, '_> {
            SubCommand::with_name("validators")
                .about("Show summary information about the current validators")
                .alias("show-validators")
+                .arg(
+                    Arg::with_name("confirmed")
+                        .long("confirmed")
+                        .takes_value(false)
+                        .help(
+                            "Return information at maximum-lockout commitment level",
+                        ),
+                )
                .arg(
                    Arg::with_name("lamports")
                        .long("lamports")
@@ -329,9 +337,17 @@ pub fn parse_show_stakes(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, Cli

 pub fn parse_show_validators(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, CliError> {
    let use_lamports_unit = matches.is_present("lamports");
+    let commitment_config = if matches.is_present("confirmed") {
+        CommitmentConfig::default()
+    } else {
+        CommitmentConfig::recent()
+    };

    Ok(CliCommandInfo {
-        command: CliCommand::ShowValidators { use_lamports_unit },
+        command: CliCommand::ShowValidators {
+            use_lamports_unit,
+            commitment_config,
+        },
        signers: vec![],
    })
 }
@@ -466,7 +482,7 @@ fn slot_to_human_time(slot: Slot) -> String {

 pub fn process_get_epoch_info(
    rpc_client: &RpcClient,
-    commitment_config: &CommitmentConfig,
+    commitment_config: CommitmentConfig,
 ) -> ProcessResult {
    let epoch_info = rpc_client.get_epoch_info_with_commitment(commitment_config.clone())?;
    println!();
@@ -512,7 +528,7 @@ pub fn process_get_genesis_hash(rpc_client: &RpcClient) -> ProcessResult {

 pub fn process_get_slot(
    rpc_client: &RpcClient,
-    commitment_config: &CommitmentConfig,
+    commitment_config: CommitmentConfig,
 ) -> ProcessResult {
    let slot = rpc_client.get_slot_with_commitment(commitment_config.clone())?;
    Ok(slot.to_string())
@@ -701,7 +717,7 @@ pub fn process_show_block_production(

 pub fn process_get_transaction_count(
    rpc_client: &RpcClient,
-    commitment_config: &CommitmentConfig,
+    commitment_config: CommitmentConfig,
 ) -> ProcessResult {
    let transaction_count =
        rpc_client.get_transaction_count_with_commitment(commitment_config.clone())?;
@@ -715,7 +731,7 @@ pub fn process_ping(
    interval: &Duration,
    count: &Option<u64>,
    timeout: &Duration,
-    commitment_config: &CommitmentConfig,
+    commitment_config: CommitmentConfig,
 ) -> ProcessResult {
    let to = Keypair::new().pubkey();

@@ -1006,9 +1022,13 @@ pub fn process_show_stakes(
    Ok("".to_string())
 }

-pub fn process_show_validators(rpc_client: &RpcClient, use_lamports_unit: bool) -> ProcessResult {
-    let epoch_info = rpc_client.get_epoch_info()?;
-    let vote_accounts = rpc_client.get_vote_accounts()?;
+pub fn process_show_validators(
+    rpc_client: &RpcClient,
+    use_lamports_unit: bool,
+    commitment_config: CommitmentConfig,
+) -> ProcessResult {
+    let epoch_info = rpc_client.get_epoch_info_with_commitment(commitment_config)?;
+    let vote_accounts = rpc_client.get_vote_accounts_with_commitment(commitment_config)?;
    let total_active_stake = vote_accounts
        .current
        .iter()
--- a/cli/src/vote.rs
+++ b/cli/src/vote.rs
@@ -9,6 +9,7 @@ use solana_client::rpc_client::RpcClient;
 use solana_remote_wallet::remote_wallet::RemoteWalletManager;
 use solana_sdk::{
    account::Account,
+    commitment_config::CommitmentConfig,
    message::Message,
    pubkey::Pubkey,
    system_instruction::{create_address_with_seed, SystemError},
@@ -158,6 +159,14 @@ impl VoteSubCommands for App<'_, '_> {
            SubCommand::with_name("vote-account")
                .about("Show the contents of a vote account")
                .alias("show-vote-account")
+                .arg(
+                    Arg::with_name("confirmed")
+                        .long("confirmed")
+                        .takes_value(false)
+                        .help(
+                            "Return information at maximum-lockout commitment level",
+                        ),
+                )
                .arg(
                    Arg::with_name("vote_account_pubkey")
                        .index(1)
@@ -267,10 +276,16 @@ pub fn parse_vote_get_account_command(
 ) -> Result<CliCommandInfo, CliError> {
    let vote_account_pubkey = pubkey_of(matches, "vote_account_pubkey").unwrap();
    let use_lamports_unit = matches.is_present("lamports");
+    let commitment_config = if matches.is_present("confirmed") {
+        CommitmentConfig::default()
+    } else {
+        CommitmentConfig::recent()
+    };
    Ok(CliCommandInfo {
        command: CliCommand::ShowVoteAccount {
            pubkey: vote_account_pubkey,
            use_lamports_unit,
+            commitment_config,
        },
        signers: vec![],
    })
@@ -423,8 +438,14 @@ pub fn process_vote_update_validator(
 fn get_vote_account(
    rpc_client: &RpcClient,
    vote_account_pubkey: &Pubkey,
+    commitment_config: CommitmentConfig,
 ) -> Result<(Account, VoteState), Box<dyn std::error::Error>> {
-    let vote_account = rpc_client.get_account(vote_account_pubkey)?;
+    let vote_account = rpc_client
+        .get_account_with_commitment(vote_account_pubkey, commitment_config)?
+        .value
+        .ok_or_else(|| {
+            CliError::RpcRequestError(format!("{:?} account does not exist", vote_account_pubkey))
+        })?;

    if vote_account.owner != solana_vote_program::id() {
        return Err(CliError::RpcRequestError(format!(
@@ -447,8 +468,10 @@ pub fn process_show_vote_account(
    _config: &CliConfig,
    vote_account_pubkey: &Pubkey,
    use_lamports_unit: bool,
+    commitment_config: CommitmentConfig,
 ) -> ProcessResult {
-    let (vote_account, vote_state) = get_vote_account(rpc_client, vote_account_pubkey)?;
+    let (vote_account, vote_state) =
+        get_vote_account(rpc_client, vote_account_pubkey, commitment_config)?;

    let epoch_schedule = rpc_client.get_epoch_schedule()?;