v2.0: cli: show max vote credits in vote-account based on TVC activat…

…ion epoch (backport of #3776) (#3779) * cli: show max vote credits in vote-account based on TVC activation epoch (#3776) (cherry picked from commit b543f25) * use solana_sdk::feature_set --------- Co-authored-by: Ashwin Sekar <[email protected]> Co-authored-by: Ashwin Sekar <[email protected]>
jito-foundation · Dec 7, 2024 · 84e7b03 · 84e7b03
1 parent 2c653b0
commit 84e7b03
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/cli-output/src/cli_output.rs b/cli-output/src/cli_output.rs
@@ -1163,8 +1163,9 @@ fn show_votes_and_credits(
         )?;
         writeln!(
             f,
-            "  credits/slots: {}/{}",
-            entry.credits_earned, entry.slots_in_epoch
+            "  credits/max credits: {}/{}",
+            entry.credits_earned,
+            entry.slots_in_epoch * u64::from(entry.max_credits_per_slot)
         )?;
     }
     if let Some(oldest) = epoch_voting_history.iter().next() {
@@ -1733,6 +1734,7 @@ pub struct CliEpochVotingHistory {
     pub credits_earned: u64,
     pub credits: u64,
     pub prev_credits: u64,
+    pub max_credits_per_slot: u8,
 }
 
 #[derive(Serialize, Deserialize)]

diff --git a/cli/src/vote.rs b/cli/src/vote.rs
@@ -38,7 +38,9 @@ use {
     solana_vote_program::{
         vote_error::VoteError,
         vote_instruction::{self, withdraw, CreateVoteAccountConfig},
-        vote_state::{VoteAuthorize, VoteInit, VoteState, VoteStateVersions},
+        vote_state::{
+            VoteAuthorize, VoteInit, VoteState, VoteStateVersions, VOTE_CREDITS_MAXIMUM_PER_SLOT,
+        },
     },
     std::rc::Rc,
 };
@@ -1237,6 +1239,9 @@ pub fn process_show_vote_account(
         get_vote_account(rpc_client, vote_account_address, config.commitment)?;
 
     let epoch_schedule = rpc_client.get_epoch_schedule()?;
+    let tvc_activation_slot = rpc_client
+        .get_feature_activation_slot(&solana_sdk::feature_set::timely_vote_credits::id())?;
+    let tvc_activation_epoch = tvc_activation_slot.map(|s| epoch_schedule.get_epoch(s));
 
     let mut votes: Vec<CliLandedVote> = vec![];
     let mut epoch_voting_history: Vec<CliEpochVotingHistory> = vec![];
@@ -1247,12 +1252,19 @@ pub fn process_show_vote_account(
         for (epoch, credits, prev_credits) in vote_state.epoch_credits().iter().copied() {
             let credits_earned = credits.saturating_sub(prev_credits);
             let slots_in_epoch = epoch_schedule.get_slots_in_epoch(epoch);
+            let is_tvc_active = tvc_activation_epoch.map(|e| epoch >= e).unwrap_or_default();
+            let max_credits_per_slot = if is_tvc_active {
+                VOTE_CREDITS_MAXIMUM_PER_SLOT
+            } else {
+                1
+            };
             epoch_voting_history.push(CliEpochVotingHistory {
                 epoch,
                 slots_in_epoch,
                 credits_earned,
                 credits,
                 prev_credits,
+                max_credits_per_slot,
             });
         }
     }