Skip to content

clean up remaining vote state v4 TODOs #8540

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

Merged
buffalojoec merged 3 commits into from
Oct 20, 2025
Merged

clean up remaining vote state v4 TODOs #8540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c421e2c
vote-state-v4: clean up remaining TODOs
buffalojoec Oct 16, 2025
8ad68e5
vote: update tests/benches
buffalojoec Oct 16, 2025
5dcd34c
review
buffalojoec Oct 20, 2025
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
10 changes: 5 additions & 5 deletions genesis/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ use {
solana_signer::Signer,
solana_stake_interface::state::StakeStateV2,
solana_stake_program::stake_state,
solana_vote_program::vote_state::{self, VoteStateV3},
solana_vote_program::vote_state::{self, VoteStateV4},
std::{
collections::HashMap,
error,
Expand Down Expand Up @@ -254,7 +254,7 @@ fn add_validator_accounts(
identity_pubkey,
identity_pubkey,
commission,
rent.minimum_balance(VoteStateV3::size_of()).max(1),
rent.minimum_balance(VoteStateV4::size_of()).max(1),
);

genesis_config.add_account(
Expand Down Expand Up @@ -314,7 +314,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {

// vote account
let default_bootstrap_validator_lamports = &(500 * LAMPORTS_PER_SOL)
.max(rent.minimum_balance(VoteStateV3::size_of()))
.max(rent.minimum_balance(VoteStateV4::size_of()))
.to_string();
// stake account
let default_bootstrap_validator_stake_lamports = &(LAMPORTS_PER_SOL / 2)
Expand Down Expand Up @@ -1322,10 +1322,10 @@ mod tests {
// check vote account
let vote_pk = b64_account.vote_account.parse().unwrap();
let vote_data = genesis_config.accounts[&vote_pk].data.clone();
let vote_state = VoteStateV3::deserialize(&vote_data).unwrap();
let vote_state = VoteStateV4::deserialize(&vote_data, &vote_pk).unwrap();
assert_eq!(vote_state.node_pubkey, identity_pk);
assert_eq!(vote_state.authorized_withdrawer, identity_pk);
let authorized_voters = vote_state.authorized_voters();
let authorized_voters = &vote_state.authorized_voters;
assert_eq!(authorized_voters.first().unwrap().1, &identity_pk);

// check stake account
Expand Down
6 changes: 3 additions & 3 deletions program-test/tests/setup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use {
solana_transaction::Transaction,
solana_vote_program::{
vote_instruction,
vote_state::{self, VoteInit, VoteStateV3},
vote_state::{self, VoteInit, VoteStateV4},
},
};

Expand Down Expand Up @@ -54,7 +54,7 @@ pub async fn setup_vote(context: &mut ProgramTestContext) -> Pubkey {
0,
&system_program::id(),
));
let vote_lamports = Rent::default().minimum_balance(VoteStateV3::size_of());
let vote_lamports = Rent::default().minimum_balance(VoteStateV4::size_of());
let vote_keypair = Keypair::new();
let user_keypair = Keypair::new();
instructions.append(&mut vote_instruction::create_account_with_config(
Expand All @@ -67,7 +67,7 @@ pub async fn setup_vote(context: &mut ProgramTestContext) -> Pubkey {
},
vote_lamports,
vote_instruction::CreateVoteAccountConfig {
space: vote_state::VoteStateV3::size_of() as u64,
space: vote_state::VoteStateV4::size_of() as u64,
..vote_instruction::CreateVoteAccountConfig::default()
},
));
Expand Down
14 changes: 6 additions & 8 deletions rpc/src/rpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4588,7 +4588,7 @@ pub mod tests {
EncodedConfirmedBlock, EncodedTransaction, EncodedTransactionWithStatusMeta,
TransactionDetails,
},
solana_vote_interface::state::VoteStateV3,
solana_vote_interface::state::VoteStateV4,
solana_vote_program::{
vote_instruction,
vote_state::{TowerSync, VoteInit, VoteStateVersions, MAX_LOCKOUT_HISTORY},
Expand Down Expand Up @@ -5041,10 +5041,10 @@ pub mod tests {
bank
}

fn store_vote_account(&self, vote_pubkey: &Pubkey, vote_state: VoteStateV3) {
fn store_vote_account(&self, vote_pubkey: &Pubkey, vote_state: VoteStateV4) {
let bank = self.working_bank();
let versioned = VoteStateVersions::new_v3(vote_state);
let space = VoteStateV3::size_of();
let versioned = VoteStateVersions::new_v4(vote_state);
let space = VoteStateV4::size_of();
let balance = bank.get_minimum_balance_for_rent_exemption(space);
let mut vote_account =
AccountSharedData::new(balance, space, &solana_vote_program::id());
Expand Down Expand Up @@ -7698,11 +7698,9 @@ pub mod tests {
assert_eq!(bank.vote_accounts().len(), 1);

// Create a vote account with no stake.
// TODO: Update this test to use `VoteStateV4` after vote program
// migration is complete. Currently using `VoteStateV3` because this
// test invokes the vote program which hasn't been migrated to v4 yet.
let alice_vote_keypair = Keypair::new();
let alice_vote_state = VoteStateV3::new(
let alice_vote_state = VoteStateV4::new(
&alice_vote_keypair.pubkey(),
&VoteInit {
node_pubkey: mint_keypair.pubkey(),
authorized_voter: alice_vote_keypair.pubkey(),
Expand Down
20 changes: 13 additions & 7 deletions vote/benches/vote_account.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ use {
solana_account::AccountSharedData,
solana_pubkey::Pubkey,
solana_vote::vote_account::VoteAccount,
solana_vote_interface::state::{VoteInit, VoteStateV3, VoteStateVersions},
solana_vote_interface::state::{VoteInit, VoteStateV4, VoteStateVersions},
};

fn new_rand_vote_account<R: Rng>(
rng: &mut R,
node_pubkey: Option<Pubkey>,
) -> (AccountSharedData, VoteStateV3) {
) -> (AccountSharedData, VoteStateV4) {
let vote_pubkey = Pubkey::new_unique();
let vote_init = VoteInit {
node_pubkey: node_pubkey.unwrap_or_else(Pubkey::new_unique),
authorized_voter: Pubkey::new_unique(),
Expand All @@ -24,11 +25,10 @@ fn new_rand_vote_account<R: Rng>(
leader_schedule_epoch: rng.gen(),
unix_timestamp: rng.gen(),
};
let mut vote_state = VoteStateV3::new(&vote_init, &clock);
vote_state.process_next_vote_slot(0, 0, 1);
let vote_state = VoteStateV4::new(&vote_pubkey, &vote_init, &clock);
let account = AccountSharedData::new_data(
rng.gen(), // lamports
&VoteStateVersions::new_v3(vote_state.clone()),
&VoteStateVersions::new_v4(vote_state.clone()),
&solana_sdk_ids::vote::id(), // owner
)
.unwrap();
Expand All @@ -43,8 +43,14 @@ fn bench_vote_account_try_from(b: &mut Bencher) {
let vote_account = VoteAccount::try_from(account.clone()).unwrap();
let vote_state_view = vote_account.vote_state_view();
assert_eq!(&vote_state.node_pubkey, vote_state_view.node_pubkey());
assert_eq!(vote_state.commission, vote_state_view.commission());
assert_eq!(vote_state.credits(), vote_state_view.credits());
assert_eq!(
vote_state.inflation_rewards_commission_bps,
vote_state_view.inflation_rewards_commission()
);
assert_eq!(
vote_state.epoch_credits.len(),
vote_state_view.num_epoch_credits()
);
assert_eq!(vote_state.last_timestamp, vote_state_view.last_timestamp());
assert_eq!(vote_state.root_slot, vote_state_view.root_slot());
});
Expand Down
14 changes: 8 additions & 6 deletions vote/src/vote_account.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,11 @@ impl VoteAccount {
use {
rand::Rng as _,
solana_clock::Clock,
solana_vote_interface::state::{VoteInit, VoteStateV3, VoteStateVersions},
solana_vote_interface::state::{VoteInit, VoteStateV4, VoteStateVersions},
};

let mut rng = rand::thread_rng();
let vote_pubkey = Pubkey::new_unique();

let vote_init = VoteInit {
node_pubkey: Pubkey::new_unique(),
Expand All @@ -115,10 +116,10 @@ impl VoteAccount {
leader_schedule_epoch: rng.gen(),
unix_timestamp: rng.gen(),
};
let vote_state = VoteStateV3::new(&vote_init, &clock);
let vote_state = VoteStateV4::new(&vote_pubkey, &vote_init, &clock);
let account = AccountSharedData::new_data(
rng.gen(), // lamports
&VoteStateVersions::new_v3(vote_state.clone()),
&VoteStateVersions::new_v4(vote_state.clone()),
&solana_sdk_ids::vote::id(), // owner
)
.unwrap();
Expand Down Expand Up @@ -454,14 +455,15 @@ mod tests {
solana_account::WritableAccount,
solana_clock::Clock,
solana_pubkey::Pubkey,
solana_vote_interface::state::{VoteInit, VoteStateV3, VoteStateVersions},
solana_vote_interface::state::{VoteInit, VoteStateV4, VoteStateVersions},
std::iter::repeat_with,
};

fn new_rand_vote_account<R: Rng>(
rng: &mut R,
node_pubkey: Option<Pubkey>,
) -> AccountSharedData {
let vote_pubkey = Pubkey::new_unique();
let vote_init = VoteInit {
node_pubkey: node_pubkey.unwrap_or_else(Pubkey::new_unique),
authorized_voter: Pubkey::new_unique(),
Expand All @@ -475,10 +477,10 @@ mod tests {
leader_schedule_epoch: rng.gen(),
unix_timestamp: rng.gen(),
};
let vote_state = VoteStateV3::new(&vote_init, &clock);
let vote_state = VoteStateV4::new(&vote_pubkey, &vote_init, &clock);
AccountSharedData::new_data(
rng.gen(), // lamports
&VoteStateVersions::new_v3(vote_state.clone()),
&VoteStateVersions::new_v4(vote_state.clone()),
&solana_sdk_ids::vote::id(), // owner
)
.unwrap()
Expand Down
Loading