solana-program · lorisleiva · Oct 3, 2025 · Oct 3, 2025 · Oct 3, 2025 · Oct 3, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ resolver = "2"
 members = ["clients/rust", "program"]
 
 [workspace.metadata.cli]
-solana = "2.0.2"
+solana = "2.2.1"
 
 [workspace.metadata.toolchains]
 format = "nightly-2024-05-02"

diff --git a/clients/rust/Cargo.toml b/clients/rust/Cargo.toml
@@ -15,10 +15,5 @@ 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.0"
+solana-program = "^2.2.1"
 thiserror = "^1.0"
-
-[dev-dependencies]
-assert_matches = "1.5.0"
-solana-program-test = "~2.0"
-solana-sdk = "~2.0"
diff --git a/program/Cargo.toml b/program/Cargo.toml
@@ -19,12 +19,12 @@ num-derive = "^0.3"
 num-traits = "^0.2"
 serde = { version = "1.0.193", features = ["derive"] }
 shank = "^0.4.2"
-solana-program = "~2.0"
+solana-program = "^2.2.1"
 thiserror = "^1.0"
 
 [dev-dependencies]
-mollusk-svm = { version = "0.0.10-solana-2.0", features = ["fuzz-fd"] }
-solana-sdk = "~2.0"
+mollusk-svm = { version = "^0.4", features = ["fuzz-fd"] }
+solana-sdk = "^2.2.1"
 
 [features]
 bpf-entrypoint = []

diff --git a/program/idl.json b/program/idl.json
@@ -374,7 +374,7 @@
   "metadata": {
     "origin": "shank",
     "address": "CoreBPFLoaderUpgradeab1e1111111111111111111",
-    "binaryVersion": "0.4.2",
+    "binaryVersion": "0.4.5",
     "libVersion": "^0.4.2"
   }
 }
diff --git a/program/src/processor.rs b/program/src/processor.rs
@@ -1,5 +1,7 @@
 //! Program processor.
 
+#[allow(deprecated)]
+use solana_program::system_instruction::{self, MAX_PERMITTED_DATA_LENGTH};
 use {
     crate::{
         instruction::LoaderV3Instruction,
@@ -15,7 +17,6 @@ use {
         program_error::ProgramError,
         pubkey::Pubkey,
         rent::Rent,
-        system_instruction::{self, MAX_PERMITTED_DATA_LENGTH},
         sysvar::Sysvar,
     },
 };
@@ -283,6 +284,7 @@ fn process_deploy_with_max_data_len(
         }
 
         // Clear the buffer.
+        #[allow(deprecated)]
         buffer_info.realloc(UpgradeableLoaderState::size_of_buffer(0), false)?;
     }
 
@@ -464,6 +466,7 @@ fn process_upgrade(program_id: &Pubkey, accounts: &[AccountInfo]) -> ProgramResu
             .fill(0);
 
         // Clear the buffer.
+        #[allow(deprecated)]
         buffer_info.realloc(UpgradeableLoaderState::size_of_buffer(0), false)?;
     }
 
@@ -713,6 +716,7 @@ fn process_close(program_id: &Pubkey, accounts: &[AccountInfo]) -> ProgramResult
         **destination_info.try_borrow_mut_lamports()? = new_destination_lamports;
     }
 
+    #[allow(deprecated)]
     buffer_or_programdata_info.realloc(UpgradeableLoaderState::size_of_uninitialized(), true)?;
 
     let mut buffer_or_programdata_data = buffer_or_programdata_info.try_borrow_mut_data()?;
@@ -842,6 +846,7 @@ fn process_extend_program(
 
     // [CORE BPF]: BPF programs can only reallocate a maximum of 10_240 bytes.
     // See https://github.com/anza-xyz/agave/blob/ed51e70c2e6528f602ad4f8fde718f60d7da2d0c/sdk/account-info/src/lib.rs#L16-L17
+    #[allow(deprecated)]
     programdata_info.realloc(new_len, true)?;
 
     // [CORE BPF]: We'll see what happens with on-chain verification...

diff --git a/program/tests/close.rs b/program/tests/close.rs
@@ -10,7 +10,7 @@ use {
         state::{get_program_data_address, UpgradeableLoaderState},
     },
     solana_sdk::{
-        account::{AccountSharedData, WritableAccount},
+        account::{Account, WritableAccount},
         program_error::ProgramError,
         pubkey::Pubkey,
     },
@@ -24,10 +24,7 @@ fn fail_recipient_same_as_close_account() {
 
     mollusk.process_and_validate_instruction(
         &close(&target, &target, None, None),
-        &[
-            (target, AccountSharedData::default()),
-            (target, AccountSharedData::default()),
-        ],
+        &[(target, Account::default()), (target, Account::default())],
         &[Check::err(ProgramError::InvalidArgument)],
     );
 }
@@ -53,7 +50,7 @@ fn fail_invalid_account_state() {
                     true,
                 ),
             ),
-            (destination, AccountSharedData::default()),
+            (destination, Account::default()),
         ],
         &[Check::err(ProgramError::InvalidArgument)],
     );
@@ -78,7 +75,7 @@ fn uninitialized_success() {
                 target,
                 upgradeable_state_account(&UpgradeableLoaderState::Uninitialized, &[], false),
             ),
-            (destination, AccountSharedData::default()),
+            (destination, Account::default()),
         ],
         &[
             Check::success(),
@@ -116,8 +113,8 @@ fn buffer_fail_buffer_immutable() {
                     false,
                 ),
             ),
-            (destination, AccountSharedData::default()),
-            (authority, AccountSharedData::default()),
+            (destination, Account::default()),
+            (authority, Account::default()),
         ],
         &[Check::err(ProgramError::Immutable)],
     );
@@ -144,8 +141,8 @@ fn buffer_fail_incorrect_authority() {
                     false,
                 ),
             ),
-            (destination, AccountSharedData::default()),
-            (authority, AccountSharedData::default()),
+            (destination, Account::default()),
+            (authority, Account::default()),
         ],
         &[Check::err(ProgramError::IncorrectAuthority)],
     );
@@ -175,8 +172,8 @@ fn buffer_fail_authority_not_signer() {
                     false,
                 ),
             ),
-            (destination, AccountSharedData::default()),
-            (authority, AccountSharedData::default()),
+            (destination, Account::default()),
+            (authority, Account::default()),
         ],
         &[Check::err(ProgramError::MissingRequiredSignature)],
     );
@@ -208,12 +205,12 @@ fn buffer_success() {
                     false,
                 ),
             ),
-            (destination, AccountSharedData::default()),
-            (authority, AccountSharedData::default()),
+            (destination, Account::default()),
+            (authority, Account::default()),
         ],
         &[
             Check::success(),
-            Check::compute_units(12_792),
+            Check::compute_units(3_628),
             // Closed, but still owned by the loader.
             Check::account(&buffer)
                 .data(&[0, 0, 0, 0]) // Size of Uninitialized.
@@ -254,8 +251,8 @@ fn programdata_fail_program_not_writable() {
                     false,
                 ),
             ),
-            (destination, AccountSharedData::default()),
-            (authority, AccountSharedData::default()),
+            (destination, Account::default()),
+            (authority, Account::default()),
             (
                 program,
                 upgradeable_state_account(
@@ -304,8 +301,8 @@ fn programdata_fail_program_not_owned_by_loader() {
                     false,
                 ),
             ),
-            (destination, AccountSharedData::default()),
-            (authority, AccountSharedData::default()),
+            (destination, Account::default()),
+            (authority, Account::default()),
             (program, program_account),
         ],
         &[Check::err(ProgramError::IncorrectProgramId)],
@@ -337,8 +334,8 @@ fn programdata_fail_program_deployed_in_slot() {
                     false,
                 ),
             ),
-            (destination, AccountSharedData::default()),
-            (authority, AccountSharedData::default()),
+            (destination, Account::default()),
+            (authority, Account::default()),
             (
                 program,
                 upgradeable_state_account(
@@ -379,8 +376,8 @@ fn programdata_fail_not_upgradeable() {
                     false,
                 ),
             ),
-            (destination, AccountSharedData::default()),
-            (authority, AccountSharedData::default()),
+            (destination, Account::default()),
+            (authority, Account::default()),
             (
                 program,
                 upgradeable_state_account(
@@ -421,8 +418,8 @@ fn programdata_fail_incorrect_authority() {
                     false,
                 ),
             ),
-            (destination, AccountSharedData::default()),
-            (authority, AccountSharedData::default()),
+            (destination, Account::default()),
+            (authority, Account::default()),
             (
                 program,
                 upgradeable_state_account(
@@ -466,8 +463,8 @@ fn programdata_fail_authority_not_signer() {
                     false,
                 ),
             ),
-            (destination, AccountSharedData::default()),
-            (authority, AccountSharedData::default()),
+            (destination, Account::default()),
+            (authority, Account::default()),
             (
                 program,
                 upgradeable_state_account(
@@ -513,8 +510,8 @@ fn programdata_success() {
                     false,
                 ),
             ),
-            (destination, AccountSharedData::default()),
-            (authority, AccountSharedData::default()),
+            (destination, Account::default()),
+            (authority, Account::default()),
             (
                 program,
                 upgradeable_state_account(
@@ -528,7 +525,7 @@ fn programdata_success() {
         ],
         &[
             Check::success(),
-            Check::compute_units(14_431),
+            Check::compute_units(4_995),
             // Closed, but still owned by the loader.
             Check::account(&programdata)
                 .data(&[0, 0, 0, 0]) // Size of Uninitialized.

diff --git a/program/tests/common.rs b/program/tests/common.rs
@@ -1,29 +1,27 @@
 #![allow(dead_code)]
 #![cfg(feature = "test-sbf")]
 
+#[allow(deprecated)]
+use solana_sdk::system_program;
 use {
     mollusk_svm::Mollusk,
     solana_loader_v3_program::state::UpgradeableLoaderState,
-    solana_sdk::{
-        account::{AccountSharedData, WritableAccount},
-        rent::Rent,
-        system_program,
-    },
+    solana_sdk::{account::Account, rent::Rent},
 };
 
 pub fn setup() -> Mollusk {
     Mollusk::new(&solana_loader_v3_program::id(), "solana_loader_v3_program")
 }
 
-pub fn system_account_with_lamports(lamports: u64) -> AccountSharedData {
-    AccountSharedData::new(lamports, 0, &system_program::id())
+pub fn system_account_with_lamports(lamports: u64) -> Account {
+    Account::new(lamports, 0, &system_program::id())
 }
 
 pub fn upgradeable_state_account(
     state: &UpgradeableLoaderState,
     additional_bytes: &[u8],
     executable: bool,
-) -> AccountSharedData {
+) -> Account {
     // Annoying, but necessary because of the program's layout expectations.
     let data_size = match state {
         UpgradeableLoaderState::Uninitialized => UpgradeableLoaderState::size_of_uninitialized(),
@@ -41,10 +39,11 @@ pub fn upgradeable_state_account(
     let space = data.len();
     let lamports = Rent::default().minimum_balance(space);
 
-    let mut account = AccountSharedData::new(lamports, space, &solana_loader_v3_program::id());
-    account.set_data_from_slice(&data);
-
-    account.set_executable(executable);
-
-    account
+    Account {
+        lamports,
+        owner: solana_loader_v3_program::id(),
+        data,
+        executable,
+        ..Account::default()
+    }
 }