may as well use v4 everywhere now

Author: 2501babe

clients/cli/src/main.rs

@@ -17,7 +17,7 @@ use {
     solana_signer::Signer,
     solana_stake_interface as stake,
     solana_transaction::Transaction,
-    solana_vote_program::{self as vote_program, vote_state::VoteStateV3},
+    solana_vote_program::{self as vote_program, vote_state::VoteStateV4},
     spl_associated_token_account_interface::instruction::create_associated_token_account,
     spl_single_pool::{
         self, find_pool_address, find_pool_mint_address, find_pool_onramp_address,
@@ -118,7 +118,7 @@ async fn command_initialize(config: &Config, command_config: InitializeCli) -> C
     match get_initialized_account(config, vote_account_address).await? {
         Some(vote_account)
             if vote_account.owner == vote_program::id()
-                && VoteStateV3::deserialize(&vote_account.data).is_ok() => {}
+                && VoteStateV4::deserialize(&vote_account.data, &vote_account_address).is_ok() => {}
         _ => return Err(format!("{} is not a valid vote account", vote_account_address).into()),
     }
 
@@ -646,7 +646,8 @@ async fn command_update_metadata(
         .get_account(vote_account_address)
         .await?
     {
-        let vote_account = VoteStateV3::deserialize(&vote_account_data.data)?;
+        let vote_account =
+            VoteStateV4::deserialize(&vote_account_data.data, &vote_account_address)?;
 
         if authorized_withdrawer.pubkey() != vote_account.authorized_withdrawer {
             return Err(format!(

clients/cli/tests/test.rs

@@ -21,7 +21,7 @@ use {
     solana_transaction::Transaction,
     solana_vote_program::{
         vote_instruction::{self, CreateVoteAccountConfig},
-        vote_state::{VoteInit, VoteStateV3},
+        vote_state::{VoteInit, VoteStateV4},
     },
     spl_single_pool::{
         id,
@@ -152,7 +152,7 @@ async fn create_vote_account(
         .unwrap();
 
     let vote_rent = rpc_client
-        .get_minimum_balance_for_rent_exemption(VoteStateV3::size_of() * 2)
+        .get_minimum_balance_for_rent_exemption(VoteStateV4::size_of() * 2)
         .await
         .unwrap();
 
@@ -176,7 +176,7 @@ async fn create_vote_account(
         },
         vote_rent,
         CreateVoteAccountConfig {
-            space: VoteStateV3::size_of() as u64,
+            space: VoteStateV4::size_of() as u64,
             ..Default::default()
         },
     ));

program/tests/helpers/mod.rs

@@ -19,7 +19,7 @@ use {
     solana_system_interface::{instruction as system_instruction, program as system_program},
     solana_vote_interface::{
         instruction as vote_instruction,
-        state::{VoteInit, VoteStateV3},
+        state::{VoteInit, VoteStateV4},
     },
     spl_associated_token_account_interface::address::get_associated_token_address,
     spl_single_pool::{
@@ -367,7 +367,7 @@ pub async fn create_vote(
     vote_account: &Keypair,
 ) {
     let rent = banks_client.get_rent().await.unwrap();
-    let rent_voter = rent.minimum_balance(VoteStateV3::size_of());
+    let rent_voter = rent.minimum_balance(VoteStateV4::size_of());
 
     let mut instructions = vec![system_instruction::create_account(
         &payer.pubkey(),
@@ -387,7 +387,7 @@ pub async fn create_vote(
         },
         rent_voter,
         vote_instruction::CreateVoteAccountConfig {
-            space: VoteStateV3::size_of() as u64,
+            space: VoteStateV4::size_of() as u64,
             ..Default::default()
         },
     ));