deps: Update Solana v2.3.4 and rust toolchain (#76)

* deps: Update Solana v2.3.4 and rust toolchain

#### Problem

The v2.3 Solana crates are out, and the toolchain on this repo is a bit old.

#### Summary of changes

Bump the Solana version, crates, and rust toolchain.

* Use local solana-stake-interface

Author: joncinque

Cargo.lock

@@ -14,7 +14,7 @@ license = "Apache-2.0"
 edition = "2021"
 
 [workspace.metadata.cli]
-solana = "2.2.0"
+solana = "2.3.4"
 
 [workspace.lints.rust.unexpected_cfgs]
 level = "warn"
@@ -24,7 +24,10 @@ check-cfg = [
 ]
 
 [workspace.metadata.toolchains]
-build = "1.84.1"
-format = "nightly-2024-11-22"
-lint = "nightly-2024-11-22"
-test = "nightly-2024-11-22"
+build = "1.86.0"
+format = "nightly-2025-02-16"
+lint = "nightly-2025-02-16"
+test = "nightly-2025-02-16"
+
+[patch.crates-io]
+solana-stake-interface = { path = "interface" }

Cargo.toml

@@ -12,15 +12,14 @@ test-sbf = []
 serde = ["dep:serde", "dep:serde_with"]
 
 [dependencies]
-borsh = "^0.10"
-num-derive = "^0.3"
-num-traits = "^0.2"
-serde = { version = "^1.0", features = ["derive"], optional = true }
-serde_with = { version = "^3.0", optional = true }
+borsh = "0.10"
+num-derive = "0.3"
+num-traits = "0.2"
+serde = { version = "1.0", features = ["derive"], optional = true }
+serde_with = { version = "3.0", optional = true }
 solana-program = "2.2.1"
-thiserror = "^1.0"
+thiserror = "1.0"
 
 [dev-dependencies]
 assert_matches = "1.5.0"
-solana-program-test = "2.2.0"
 solana-sdk = "2.2.1"

clients/rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-stake-interface"
-version = "1.2.0"
+version = "1.2.1"
 description = "Instructions and constructors for the Stake program"
 readme = "README.md"
 authors = { workspace = true }
@@ -29,7 +29,7 @@ solana-frozen-abi-macro = { version = "2.2.1", features = ["frozen-abi"], option
 solana-instruction = "2.2.1"
 solana-program-error = "2.2.1"
 solana-pubkey = { version = "2.2.1", default-features = false }
-solana-system-interface = "^1.0"
+solana-system-interface = "1.0.0"
 solana-sysvar-id = "2.2.1"
 
 [dev-dependencies]

interface/Cargo.toml

@@ -24,16 +24,20 @@ thiserror = "1.0.63"
 [dev-dependencies]
 assert_matches = "1.5.0"
 arbitrary = { version = "1.4.1", features = ["derive"] }
-mollusk-svm = { version = "0.1.0", features = ["all-builtins"] }
+mollusk-svm = { version = "0.4.0", features = ["all-builtins"] }
 proptest = "1.6.0"
 solana-account = { version = "2.2.1", features = ["bincode"] }
+solana-config-interface = { version = "1", features = ["serde"] }
+solana-feature-set = "2.2.1"
 solana-logger = "2.2.1"
-solana-program-test = "2.2.0"
+solana-program-test = "2.3.4"
 solana-program-runtime = "2.2.0"
-solana-config-program = "2.2.0"
+solana-stake-interface = { path = "../interface", features = ["bincode"] }
+solana-system-interface = { version = "1", features = ["bincode"] }
 solana-vote-program = "2.2.0"
 solana-sdk = "2.2.1"
-solana-feature-set = "2.2.1"
+solana-sdk-ids = "2.2.1"
+solana-sysvar = { version = "2.2.1", features = ["bincode"] }
 rand = "0.8.5"
 test-case = "3.3.1"
 

program/Cargo.toml

@@ -17,7 +17,6 @@ use {
             },
         },
         stake_history::StakeHistoryEntry,
-        system_program,
         sysvar::{
             clock::Clock, epoch_rewards::EpochRewards, epoch_schedule::EpochSchedule, rent::Rent,
             stake_history::StakeHistory, SysvarId,
@@ -27,6 +26,7 @@ use {
             state::{VoteState, VoteStateVersions},
         },
     },
+    solana_sdk_ids::system_program,
     solana_stake_program::{get_minimum_delegation, id},
     std::{
         collections::{HashMap, HashSet},

program/tests/interface.rs

@@ -10,20 +10,22 @@ use {
         pubkey::Pubkey,
         signature::{Keypair, Signer},
         signers::Signers,
-        stake::{
-            self,
-            instruction::{self as ixn, LockupArgs, StakeError},
-            state::{Authorized, Delegation, Lockup, Meta, Stake, StakeAuthorize, StakeStateV2},
-        },
-        system_instruction, system_program,
-        sysvar::{clock::Clock, stake_history::StakeHistory},
         transaction::{Transaction, TransactionError},
         vote::{
             instruction as vote_instruction,
             state::{VoteInit, VoteState, VoteStateVersions},
         },
     },
-    solana_stake_program::id,
+    solana_sdk_ids::system_program,
+    solana_stake_interface::{
+        error::StakeError,
+        instruction::{self as ixn, LockupArgs},
+        program::id,
+        stake_history::StakeHistory,
+        state::{Authorized, Delegation, Lockup, Meta, Stake, StakeAuthorize, StakeStateV2},
+    },
+    solana_system_interface::instruction as system_instruction,
+    solana_sysvar::clock::Clock,
     test_case::{test_case, test_matrix},
 };
 
@@ -186,7 +188,7 @@ pub async fn get_stake_account(
 
 pub async fn get_stake_account_rent(banks_client: &mut BanksClient) -> u64 {
     let rent = banks_client.get_rent().await.unwrap();
-    rent.minimum_balance(std::mem::size_of::<stake::state::StakeStateV2>())
+    rent.minimum_balance(std::mem::size_of::<StakeStateV2>())
 }
 
 pub async fn get_effective_stake(banks_client: &mut BanksClient, pubkey: &Pubkey) -> u64 {
@@ -206,7 +208,7 @@ pub async fn get_effective_stake(banks_client: &mut BanksClient, pubkey: &Pubkey
 
 async fn get_minimum_delegation(context: &mut ProgramTestContext) -> u64 {
     let transaction = Transaction::new_signed_with_payer(
-        &[stake::instruction::get_minimum_delegation()],
+        &[ixn::get_minimum_delegation()],
         Some(&context.payer.pubkey()),
         &[&context.payer],
         context.last_blockhash,
@@ -254,10 +256,10 @@ pub async fn create_independent_stake_account_with_lockup(
             &context.payer.pubkey(),
             &stake.pubkey(),
             lamports,
-            std::mem::size_of::<stake::state::StakeStateV2>() as u64,
+            std::mem::size_of::<StakeStateV2>() as u64,
             &id(),
         ),
-        stake::instruction::initialize(&stake.pubkey(), authorized, lockup),
+        ixn::initialize(&stake.pubkey(), authorized, lockup),
     ];
 
     let transaction = Transaction::new_signed_with_payer(

program/tests/program_test.rs

@@ -28,7 +28,6 @@ use {
             MINIMUM_DELINQUENT_EPOCHS_FOR_DEACTIVATION,
         },
         stake_history::{Epoch, StakeHistoryEntry},
-        system_program,
         sysvar::{
             clock::{self, Clock},
             epoch_rewards::{self, EpochRewards},
@@ -38,6 +37,7 @@ use {
             stake_history::{self, StakeHistory},
         },
     },
+    solana_sdk_ids::system_program,
     solana_stake_program::{get_minimum_delegation, id},
     solana_vote_program::{
         self,
@@ -308,13 +308,21 @@ fn create_stake_history_from_delegations(
 mod config {
     #[allow(deprecated)]
     use {
-        solana_config_program::create_config_account,
-        solana_sdk::{account::AccountSharedData, stake::config::Config},
+        solana_account::{Account, AccountSharedData},
+        solana_config_interface::state::ConfigKeys,
+        solana_sdk::stake::config::Config,
     };
 
     #[allow(deprecated)]
     pub fn create_account(lamports: u64, config: &Config) -> AccountSharedData {
-        create_config_account(vec![], config, lamports)
+        let mut data = bincode::serialize(&ConfigKeys { keys: vec![] }).unwrap();
+        data.extend_from_slice(&bincode::serialize(config).unwrap());
+        AccountSharedData::from(Account {
+            lamports,
+            data,
+            owner: solana_config_interface::id(),
+            ..Account::default()
+        })
     }
 }
 

program/tests/stake_instruction.rs

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.84.1"
+channel = "1.86.0"