deps: Update Solana v2.3.4 and rust toolchain

Cargo.toml

@@ -3,10 +3,10 @@ resolver = "2"
 members = ["clients/rust", "program"]
 
 [workspace.metadata.cli]
-solana = "2.0.2"
+solana = "2.3.4"
 
 # Specify Rust toolchains for rustfmt, clippy, and build.
 # Any unprovided toolchains default to stable.
 [workspace.metadata.toolchains]
-format = "nightly-2024-05-02"
-lint = "nightly-2024-05-02"
+format = "nightly-2025-02-16"
+lint = "nightly-2025-02-16"

clients/rust/src/lib.rs

@@ -1,3 +1,4 @@
+#[allow(deprecated)] // needed until Codama stops implementing deprecated traits
 mod generated;
 
 pub use generated::{programs::SOLANA_FEATURE_GATE_ID as ID, *};

program/Cargo.toml

@@ -20,12 +20,21 @@ num_enum = "0.7.2"
 num-derive = "0.4"
 num-traits = "0.2"
 shank = "0.4.2"
-solana-program = "2.0.1"
+solana-account-info = "2.2.1"
+solana-cpi = "2.2.1"
+solana-feature-gate-interface = { version = "2.2.1", features = ["bincode"] }
+solana-instruction = "2.2.1"
+solana-msg = "2.2.1"
+solana-program-entrypoint = "2.2.1"
+solana-program-error = "2.2.1"
+solana-pubkey = "2.2.1"
+solana-sdk-ids = "2.2.1"
+solana-system-interface = "1"
 thiserror = "2.0.9"
 
 [dev-dependencies]
-mollusk-svm = { version = "0.0.10-solana-2.0", features = ["fuzz-fd"] }
-mollusk-svm-bencher = "0.0.10-solana-2.0"
+mollusk-svm = { version = "0.4.0" }
+mollusk-svm-bencher = "0.4.0"
 solana-sdk = "2.0.1"
 
 [lib]

program/benches/compute_units.md

@@ -1,3 +1,11 @@
+#### 2025-07-14 17:25:20.447985939 UTC
+
+Solana CLI Version: solana-cli 2.3.4 (src:bbf10bfb; feat:3640012085, client:Agave)
+
+| Name | CUs | Delta |
+|------|------|-------|
+| revoke_pending_activation | 2724 | - new - |
+
 #### Compute Units: 2024-10-22 17:38:11.836151 UTC
 
 | Name | CUs | Delta |

program/benches/compute_units.rs

@@ -3,8 +3,9 @@
 use {
     mollusk_svm::{program::keyed_account_for_system_program, Mollusk},
     mollusk_svm_bencher::{Bench, MolluskComputeUnitBencher},
+    solana_feature_gate_interface::Feature,
     solana_feature_gate_program::instruction::revoke_pending_activation,
-    solana_sdk::{account::AccountSharedData, feature::Feature, incinerator, pubkey::Pubkey},
+    solana_sdk::{account::Account, incinerator, pubkey::Pubkey},
 };
 
 fn main() {
@@ -19,14 +20,15 @@ fn main() {
         &[
             (
                 feature,
-                AccountSharedData::new_data(
+                Account::new_data_with_space(
                     42,
                     &Feature { activated_at: None },
+                    9,
                     &solana_sdk::feature::id(),
                 )
                 .unwrap(),
             ),
-            (incinerator::id(), AccountSharedData::default()),
+            (incinerator::id(), Account::default()),
             keyed_account_for_system_program(),
         ],
     );

program/src/entrypoint.rs

@@ -2,20 +2,20 @@
 
 use {
     crate::{error::FeatureGateError, processor},
-    solana_program::{
-        account_info::AccountInfo, entrypoint::ProgramResult, program_error::PrintProgramError,
-        pubkey::Pubkey,
-    },
+    solana_account_info::AccountInfo,
+    solana_msg::msg,
+    solana_program_error::{ProgramResult, ToStr},
+    solana_pubkey::Pubkey,
 };
 
-solana_program::entrypoint!(process_instruction);
+solana_program_entrypoint::entrypoint!(process_instruction);
 fn process_instruction(
     program_id: &Pubkey,
     accounts: &[AccountInfo],
     instruction_data: &[u8],
 ) -> ProgramResult {
     if let Err(error) = processor::process(program_id, accounts, instruction_data) {
-        error.print::<FeatureGateError>();
+        msg!(error.to_str::<FeatureGateError>());
         return Err(error);
     }
     Ok(())

program/src/error.rs

@@ -2,26 +2,26 @@
 
 use {
     num_derive::FromPrimitive,
-    solana_program::{
-        decode_error::DecodeError,
-        msg,
-        program_error::{PrintProgramError, ProgramError},
-    },
+    num_enum::TryFromPrimitive,
+    solana_program_error::{ProgramError, ToStr},
     thiserror::Error,
 };
 
 /// Program error types.
 // Note: Shank does not export the type when we use `spl_program_error`.
-#[derive(Error, Clone, Debug, Eq, PartialEq, FromPrimitive)]
+#[derive(Error, Clone, Debug, Eq, PartialEq, FromPrimitive, TryFromPrimitive)]
+#[repr(u32)]
 pub enum FeatureGateError {
     /// Feature already activated
     #[error("Feature already activated")]
     FeatureAlreadyActivated,
 }
 
-impl PrintProgramError for FeatureGateError {
-    fn print<E>(&self) {
-        msg!(&self.to_string());
+impl ToStr for FeatureGateError {
+    fn to_str<E>(&self) -> &'static str {
+        match self {
+            FeatureGateError::FeatureAlreadyActivated => "Feature already activated",
+        }
     }
 }
 
@@ -30,9 +30,3 @@ impl From<FeatureGateError> for ProgramError {
         ProgramError::Custom(e as u32)
     }
 }
-
-impl<T> DecodeError<T> for FeatureGateError {
-    fn type_of() -> &'static str {
-        "FeatureGateError"
-    }
-}

program/src/instruction.rs

@@ -3,13 +3,11 @@
 use {
     num_enum::{IntoPrimitive, TryFromPrimitive},
     shank::ShankInstruction,
-    solana_program::{
-        incinerator,
-        instruction::{AccountMeta, Instruction},
-        program_error::ProgramError,
-        pubkey::Pubkey,
-        system_program,
-    },
+    solana_instruction::{AccountMeta, Instruction},
+    solana_program_error::ProgramError,
+    solana_pubkey::Pubkey,
+    solana_sdk_ids::incinerator,
+    solana_system_interface::program as system_program,
 };
 
 /// Feature Gate program instructions

program/src/lib.rs

@@ -9,4 +9,4 @@ pub mod error;
 pub mod instruction;
 pub mod processor;
 
-solana_program::declare_id!("Feature111111111111111111111111111111111111");
+solana_pubkey::declare_id!("Feature111111111111111111111111111111111111");

program/src/processor.rs

@@ -2,16 +2,14 @@
 
 use {
     crate::{error::FeatureGateError, instruction::FeatureGateInstruction},
-    solana_program::{
-        account_info::{next_account_info, AccountInfo},
-        entrypoint::ProgramResult,
-        feature::Feature,
-        incinerator, msg,
-        program::invoke,
-        program_error::ProgramError,
-        pubkey::Pubkey,
-        system_instruction, system_program,
-    },
+    solana_account_info::{next_account_info, AccountInfo},
+    solana_cpi::invoke,
+    solana_feature_gate_interface::Feature,
+    solana_msg::msg,
+    solana_program_error::{ProgramError, ProgramResult},
+    solana_pubkey::Pubkey,
+    solana_sdk_ids::incinerator,
+    solana_system_interface::{instruction as system_instruction, program as system_program},
 };
 
 /// Processes a [RevokePendingActivation](enum.FeatureGateInstruction.html)
@@ -39,7 +37,7 @@ pub fn process_revoke_pending_activation(
     }
 
     // Clear data and reassign.
-    feature_info.realloc(0, true)?;
+    feature_info.resize(0)?;
     feature_info.assign(&system_program::id());
 
     // Burn the lamports.

program/tests/revoke_pending_activation.rs

@@ -9,7 +9,7 @@ use {
         error::FeatureGateError, instruction::revoke_pending_activation,
     },
     solana_sdk::{
-        account::{AccountSharedData, WritableAccount},
+        account::{Account, WritableAccount},
         incinerator,
         program_error::ProgramError,
         pubkey::Pubkey,
@@ -28,7 +28,7 @@ fn fail_feature_not_signer() {
         &instruction,
         &[
             (feature, pending_feature_account()),
-            (incinerator::id(), AccountSharedData::default()),
+            (incinerator::id(), Account::default()),
             keyed_account_for_system_program(),
         ],
         &[Check::err(ProgramError::MissingRequiredSignature)],
@@ -48,7 +48,7 @@ fn fail_feature_incorrect_owner() {
         &revoke_pending_activation(&feature),
         &[
             (feature, feature_account),
-            (incinerator::id(), AccountSharedData::default()),
+            (incinerator::id(), Account::default()),
             keyed_account_for_system_program(),
         ],
         &[Check::err(ProgramError::InvalidAccountOwner)],
@@ -62,13 +62,13 @@ fn fail_feature_invalid_data() {
 
     // Set up a feature account with invalid data.
     let mut feature_account = pending_feature_account();
-    feature_account.set_data_from_slice(&[2; 8]);
+    feature_account.data = vec![2; 8];
 
     mollusk.process_and_validate_instruction(
         &revoke_pending_activation(&feature),
         &[
             (feature, feature_account),
-            (incinerator::id(), AccountSharedData::default()),
+            (incinerator::id(), Account::default()),
             keyed_account_for_system_program(),
         ],
         &[Check::err(ProgramError::InvalidAccountData)],
@@ -84,7 +84,7 @@ fn fail_feature_already_activated() {
         &revoke_pending_activation(&feature),
         &[
             (feature, active_feature_account()),
-            (incinerator::id(), AccountSharedData::default()),
+            (incinerator::id(), Account::default()),
             keyed_account_for_system_program(),
         ],
         &[Check::err(ProgramError::Custom(
@@ -102,12 +102,12 @@ fn success() {
         &revoke_pending_activation(&feature),
         &[
             (feature, pending_feature_account()),
-            (incinerator::id(), AccountSharedData::default()),
+            (incinerator::id(), Account::default()),
             keyed_account_for_system_program(),
         ],
         &[
             Check::success(),
-            Check::compute_units(2_781),
+            Check::compute_units(2_724),
             // Confirm feature account was closed.
             Check::account(&feature).closed().build(),
         ],

program/tests/setup.rs

@@ -3,11 +3,7 @@
 
 use {
     mollusk_svm::Mollusk,
-    solana_sdk::{
-        account::{Account, AccountSharedData},
-        feature::Feature,
-        rent::Rent,
-    },
+    solana_sdk::{account::Account, feature::Feature, rent::Rent},
 };
 
 pub fn setup() -> Mollusk {
@@ -21,26 +17,26 @@ fn feature_rent() -> u64 {
     Rent::default().minimum_balance(Feature::size_of())
 }
 
-pub fn pending_feature_account() -> AccountSharedData {
-    AccountSharedData::from(Account {
+pub fn pending_feature_account() -> Account {
+    Account {
         lamports: feature_rent(),
         data: vec![
             0, // `None`
             0, 0, 0, 0, 0, 0, 0, 0,
         ],
         owner: solana_feature_gate_program::id(),
         ..Account::default()
-    })
+    }
 }
 
-pub fn active_feature_account() -> AccountSharedData {
-    AccountSharedData::from(Account {
+pub fn active_feature_account() -> Account {
+    Account {
         lamports: feature_rent(),
         data: vec![
             1, // `Some`
             45, 0, 0, 0, 0, 0, 0, 0, // Random slot `u64`
         ],
         owner: solana_feature_gate_program::id(),
         ..Account::default()
-    })
+    }
 }

rust-toolchain.toml

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