Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v2.1: cli: show max vote credits in vote-account based on TVC activation epoch (backport of #3776) #3780

Open
wants to merge 1 commit into
base: v2.1
Choose a base branch
from
Open

v2.1: cli: show max vote credits in vote-account based on TVC activation epoch (backport of #3776) #3780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions cli-output/src/cli_output.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -1740,6 +1741,7 @@ pub struct CliEpochVotingHistory {
pub credits_earned: u64,
pub credits: u64,
pub prev_credits: u64,
pub max_credits_per_slot: u8,
}

#[derive(Serialize, Deserialize)]
Expand Down
14 changes: 13 additions & 1 deletion cli/src/vote.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,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,
};
Expand Down Expand Up @@ -1277,6 +1279,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_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![];
Expand All @@ -1287,12 +1292,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,
});
}
}
Expand Down
Loading