update program and cli to sdk 3.0

Makefile

@@ -1,5 +1,5 @@
-RUST_TOOLCHAIN_NIGHTLY = nightly-2025-02-16
-SOLANA_CLI_VERSION = 2.3.4
+RUST_TOOLCHAIN_NIGHTLY = nightly-2025-05-09
+SOLANA_CLI_VERSION = 3.0.6
 
 nightly = +${RUST_TOOLCHAIN_NIGHTLY}
 

clients/cli/Cargo.toml

@@ -8,55 +8,55 @@ license = "Apache-2.0"
 edition = "2021"
 
 [dependencies]
-agave-feature-set = "2.2"
+agave-feature-set = "3.0"
 bincode = "1.3.1"
 borsh = "1.5.7"
 clap = { version = "3.2.23", features = ["derive"] }
-console = "0.16.0"
-serde = "1.0.219"
-serde_derive = "1.0.103"
-serde_json = "1.0.142"
-serde_with = "3.13.0"
-solana-account = "2.2"
-solana-account-decoder = "2.3.4"
+console = "0.16.1"
+serde = "1.0.228"
+serde_derive = "1.0.228"
+serde_json = "1.0.145"
+serde_with = "3.15.1"
+solana-account = "3.2"
+solana-account-decoder = "3.0.10"
 solana-borsh = "3.0"
-solana-clap-v3-utils = "2.3.4"
-solana-cli-config = "2.3.4"
-solana-cli-output = "2.3.4"
-solana-client = "2.3.4"
-solana-clock = "2.2"
-solana-commitment-config = "2.2"
-solana-epoch-schedule = "2.2"
-solana-instruction = "2.2"
-solana-keypair = "2.2"
+solana-clap-v3-utils = "3.0.10"
+solana-cli-config = "3.0.10"
+solana-cli-output = "3.0.10"
+solana-client = "3.0.10"
+solana-clock = "3.0"
+solana-commitment-config = "3.0"
+solana-epoch-schedule = "3.0"
+solana-instruction = "3.0"
+solana-keypair = "3.0"
 solana-logger = "3.0"
 solana-native-token = "3.0"
-solana-pubkey = "2.2"
-solana-remote-wallet = "2.3.4"
-solana-rent = "2.2"
-solana-sdk-ids = "2.2"
-solana-signature = "2.3"
-solana-signer = "2.2"
-solana-system-interface = "1.0"
-solana-sysvar = "2.2"
-solana-stake-interface = "1.2.0"
+solana-pubkey = "3.0"
+solana-remote-wallet = "3.0.10"
+solana-rent = "3.0"
+solana-sdk-ids = "3.0"
+solana-signature = "3.1"
+solana-signer = "3.0"
+solana-system-interface = "2.0"
+solana-sysvar = "3.0"
+solana-stake-interface = "2.0.1"
 solana-stake-program = "3.0"
-solana-transaction = "2.2"
-solana-transaction-status = "2.3.4"
-solana-vote-program = "2.2"
-spl-associated-token-account-interface = "1.0.0"
-spl-token = { version = "8.0", features = ["no-entrypoint"] }
-spl-token-client = { version = "0.16.1" }
+solana-transaction = "3.0"
+solana-transaction-status = "3.0.10"
+solana-vote-program = "3.0"
+spl-associated-token-account-interface = "2.0.0"
+spl-token = { version = "9.0", features = ["no-entrypoint"] }
+spl-token-client = { version = "0.18.0" }
 spl-single-pool = { version = "3.0.0", path = "../../program", features = [
   "no-entrypoint",
 ] }
-tokio = "1.47"
+tokio = "1.48"
 
 [dev-dependencies]
-solana-test-validator = "2.3.4"
+solana-test-validator = "3.0.10"
 serial_test = "3.2.0"
 test-case = "3.3"
-tempfile = "3.20.0"
+tempfile = "3.23.0"
 
 [[bin]]
 name = "spl-single-pool"

clients/cli/src/main.rs

@@ -1,4 +1,5 @@
 #![allow(clippy::arithmetic_side_effects)]
+#![allow(clippy::uninlined_format_args)]
 
 use {
     clap::{ArgMatches, CommandFactory, Parser},
@@ -16,7 +17,7 @@ use {
     solana_signer::Signer,
     solana_stake_interface as stake,
     solana_transaction::Transaction,
-    solana_vote_program::{self as vote_program, vote_state::VoteState},
+    solana_vote_program::{self as vote_program, vote_state::VoteStateV3},
     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,
@@ -117,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()
-                && VoteState::deserialize(&vote_account.data).is_ok() => {}
+                && VoteStateV3::deserialize(&vote_account.data).is_ok() => {}
         _ => return Err(format!("{} is not a valid vote account", vote_account_address).into()),
     }
 
@@ -645,7 +646,7 @@ async fn command_update_metadata(
         .get_account(vote_account_address)
         .await?
     {
-        let vote_account = VoteState::deserialize(&vote_account_data.data)?;
+        let vote_account = VoteStateV3::deserialize(&vote_account_data.data)?;
 
         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, VoteState},
+        vote_state::{VoteInit, VoteStateV3},
     },
     spl_single_pool::{
         id,
@@ -126,7 +126,7 @@ async fn start_validator(raise_minimum_delegation: bool) -> (TestValidator, Keyp
 
 async fn wait_for_next_epoch(rpc_client: &RpcClient) -> Epoch {
     let current_epoch = rpc_client.get_epoch_info().await.unwrap().epoch;
-    println!("current epoch {}, advancing to next...", current_epoch);
+    println!("current epoch {current_epoch}, advancing to next...");
     loop {
         let epoch_info = rpc_client.get_epoch_info().await.unwrap();
         if epoch_info.epoch > current_epoch && epoch_info.slot_index > 0 {
@@ -152,7 +152,7 @@ async fn create_vote_account(
         .unwrap();
 
     let vote_rent = rpc_client
-        .get_minimum_balance_for_rent_exemption(VoteState::size_of() * 2)
+        .get_minimum_balance_for_rent_exemption(VoteStateV3::size_of() * 2)
         .await
         .unwrap();
 
@@ -176,7 +176,7 @@ async fn create_vote_account(
         },
         vote_rent,
         CreateVoteAccountConfig {
-            space: VoteState::size_of() as u64,
+            space: VoteStateV3::size_of() as u64,
             ..Default::default()
         },
     ));

program/Cargo.toml

@@ -9,41 +9,42 @@ edition = "2021"
 
 [features]
 no-entrypoint = []
+custom-heap = []
+custom-panic = []
 
 [dependencies]
 arrayref = "0.3.9"
 borsh = "1.5.7"
 num-derive = "0.4"
 num-traits = "0.2"
-num_enum = "0.7.4"
-solana-account-info = "2.3"
+num_enum = "0.7.5"
+solana-account-info = "3.0"
 solana-borsh = "3.0"
-solana-clock  = "2.2"
-solana-cpi = "2.2"
-solana-instruction = "2.2"
+solana-clock = "3.0"
+solana-cpi = "3.0"
+solana-instruction = "3.0"
 solana-msg = "3.0"
 solana-native-token = "3.0"
-solana-program-entrypoint = "2.3"
-solana-program-error = "2.2"
-solana-program-pack = "2.2"
-solana-pubkey = { version = "2.2", features = ["borsh", "curve25519"] }
-solana-rent = "2.2"
-solana-stake-interface  = { version = "1.2.1", features = ["borsh"] }
-solana-system-interface  = "1.0.0"
-solana-sysvar  = "2.2"
-solana-vote-interface  = "2.2.6"
+solana-program-entrypoint = "3.1"
+solana-program-error = "3.0"
+solana-program-pack = "3.0"
+solana-pubkey = { version = "3.0", features = ["borsh", "curve25519"] }
+solana-rent = "3.0"
+solana-stake-interface = { version = "2.0.1", features = ["bincode", "borsh", "sysvar"] }
+solana-system-interface = "2.0.0"
+solana-sysvar = "3.0"
+solana-vote-interface = { version = "4.0.4", features = ["bincode"] }
 solana-security-txt = "1.1.1"
-spl-token = { version = "8.0", features = ["no-entrypoint"] }
+spl-token-interface = "2.0.0"
 thiserror = "2.0"
 
 [dev-dependencies]
-agave-feature-set = "2.2"
-solana-program-test = "2.3.4"
-solana-sdk = "2.2"
-spl-associated-token-account = { version = "7.0.0", features = ["no-entrypoint"] }
-spl-associated-token-account-client = { version = "2.0.0" }
+agave-feature-set = "3.0"
+solana-program-test = "3.0.10"
+solana-sdk = "3.0"
+spl-associated-token-account-interface = "2.0.0"
 test-case = "3.3"
-bincode = "1.3.1"
+bincode = "1.3.3"
 rand = "0.9.2"
 approx = "0.5.1"
 

program/src/entrypoint.rs

@@ -7,7 +7,6 @@ use {
     solana_account_info::AccountInfo,
     solana_msg::msg,
     solana_program_entrypoint::{entrypoint, ProgramResult},
-    solana_program_error::ToStr,
     solana_pubkey::Pubkey,
     solana_security_txt::security_txt,
 };

program/src/error.rs

@@ -108,7 +108,7 @@ impl From<SinglePoolError> for ProgramError {
     }
 }
 impl ToStr for SinglePoolError {
-    fn to_str<E>(&self) -> &'static str {
+    fn to_str(&self) -> &'static str {
         match self {
             SinglePoolError::InvalidPoolAccount =>
                 "Error: Provided pool account has the wrong address for its vote account, is uninitialized, \

program/src/instruction.rs

@@ -15,9 +15,9 @@ use {
     solana_program_pack::Pack,
     solana_pubkey::Pubkey,
     solana_rent::Rent,
-    solana_stake_interface as stake,
+    solana_stake_interface::{self as stake, sysvar::stake_history},
     solana_system_interface::{instruction as system_instruction, program as system_program},
-    solana_sysvar as sysvar,
+    solana_sysvar as sysvar, spl_token_interface as spl_token,
 };
 
 /// Instructions supported by the `SinglePool` program.
@@ -223,7 +223,7 @@ pub fn initialize_pool(program_id: &Pubkey, vote_account_address: &Pubkey) -> In
         ),
         AccountMeta::new_readonly(sysvar::rent::id(), false),
         AccountMeta::new_readonly(sysvar::clock::id(), false),
-        AccountMeta::new_readonly(sysvar::stake_history::id(), false),
+        AccountMeta::new_readonly(stake_history::id(), false),
         #[allow(deprecated)]
         AccountMeta::new_readonly(stake::config::id(), false),
         AccountMeta::new_readonly(system_program::id(), false),
@@ -253,7 +253,7 @@ pub fn replenish_pool(program_id: &Pubkey, vote_account_address: &Pubkey) -> Ins
             false,
         ),
         AccountMeta::new_readonly(sysvar::clock::id(), false),
-        AccountMeta::new_readonly(sysvar::stake_history::id(), false),
+        AccountMeta::new_readonly(stake_history::id(), false),
         #[allow(deprecated)]
         AccountMeta::new_readonly(stake::config::id(), false),
         AccountMeta::new_readonly(stake::program::id(), false),
@@ -328,7 +328,7 @@ pub fn deposit_stake(
         AccountMeta::new(*user_token_account, false),
         AccountMeta::new(*user_lamport_account, false),
         AccountMeta::new_readonly(sysvar::clock::id(), false),
-        AccountMeta::new_readonly(sysvar::stake_history::id(), false),
+        AccountMeta::new_readonly(stake_history::id(), false),
         AccountMeta::new_readonly(spl_token::id(), false),
         AccountMeta::new_readonly(stake::program::id(), false),
     ];

program/src/processor.rs

@@ -19,7 +19,7 @@ use {
     borsh::BorshDeserialize,
     solana_account_info::{next_account_info, AccountInfo},
     solana_borsh::v1::{get_packed_len, try_from_slice_unchecked},
-    solana_clock::Epoch,
+    solana_clock::{Clock, Epoch},
     solana_cpi::invoke_signed,
     solana_msg::msg,
     solana_native_token::LAMPORTS_PER_SOL,
@@ -31,11 +31,12 @@ use {
     solana_stake_interface::{
         self as stake,
         state::{Meta, Stake, StakeActivationStatus, StakeStateV2},
+        sysvar::stake_history::StakeHistorySysvar,
     },
     solana_system_interface::{instruction as system_instruction, program as system_program},
-    solana_sysvar::{clock::Clock, stake_history::StakeHistorySysvar, Sysvar},
+    solana_sysvar::SysvarSerialize,
     solana_vote_interface::program as vote_program,
-    spl_token::state::Mint,
+    spl_token_interface::{self as spl_token, state::Mint},
 };
 
 /// Calculate pool tokens to mint, given outstanding token supply, pool active
@@ -1635,8 +1636,7 @@ mod tests {
     #[test_case(rand::random(), true, true; "no_minimum")]
     fn random_deposit_withdraw(seed: u64, with_rewards: bool, no_minimum: bool) {
         println!(
-            "TEST SEED: {}. edit the test case to pass this value if needed to debug failures",
-            seed
+            "TEST SEED: {seed}. edit the test case to pass this value if needed to debug failures",
         );
         let mut prng = rand::rngs::StdRng::seed_from_u64(seed);
 

program/tests/accounts.rs

@@ -19,6 +19,7 @@ use {
         find_pool_onramp_address, id,
         instruction::{self, SinglePoolInstruction},
     },
+    spl_token_interface as spl_token,
     test_case::test_case,
 };
 

program/tests/create_pool_token_metadata.rs

@@ -6,9 +6,9 @@ use {
     helpers::*,
     solana_program_test::*,
     solana_sdk::{
-        instruction::InstructionError, pubkey::Pubkey, signature::Signer,
-        system_instruction::SystemError, transaction::Transaction,
+        instruction::InstructionError, pubkey::Pubkey, signature::Signer, transaction::Transaction,
     },
+    solana_system_interface::error::SystemError,
     spl_single_pool::{id, instruction},
 };
 

program/tests/deposit.rs

@@ -8,7 +8,7 @@ use {
     solana_sdk::{signature::Signer, signer::keypair::Keypair, transaction::Transaction},
     solana_stake_interface::state::{Authorized, Lockup},
     solana_system_interface::instruction as system_instruction,
-    spl_associated_token_account_client::address as atoken,
+    spl_associated_token_account_interface::address::get_associated_token_address,
     spl_single_pool::{error::SinglePoolError, id, instruction},
     test_case::test_case,
 };
@@ -320,8 +320,7 @@ async fn fail_uninitialized(activate: bool) {
     )
     .await;
 
-    let token_account =
-        atoken::get_associated_token_address(&context.payer.pubkey(), &accounts.mint);
+    let token_account = get_associated_token_address(&context.payer.pubkey(), &accounts.mint);
 
     create_independent_stake_account(
         &mut context.banks_client,