chore: remove apis deprecated in solana v2.3

Cargo.toml

@@ -21,10 +21,12 @@ default = ["solana-security-txt"]
 unit_test_config = []
 
 [dependencies]
-borsh = { version = "1.5.3", features = [ "derive" ] }
+borsh = { version = "1.5.3", features = ["derive"] }
 paste = "^1.0"
 solana-program = "2.2"
-bytemuck = { version = "1.21", features = [ "derive" ] }
+solana-sdk-ids = "2.2"
+solana-system-interface = "1.0.0"
+bytemuck = { version = "1.21", features = ["derive"] }
 num_enum = "^0.7.2"
 thiserror = "^1.0.57"
 solana-security-txt = { version = "1.1.1", optional = true }
@@ -38,4 +40,3 @@ solana-program-test = "2.2"
 solana-sdk = "2.2"
 tokio = { version = "1.0", features = ["full"] }
 magicblock-delegation-program = { path = ".", features = ["unit_test_config"] }
-

src/instruction_builder/close_ephemeral_balance.rs

@@ -1,5 +1,6 @@
 use solana_program::instruction::Instruction;
-use solana_program::{instruction::AccountMeta, pubkey::Pubkey, system_program};
+use solana_program::{instruction::AccountMeta, pubkey::Pubkey};
+use solana_sdk_ids::system_program;
 
 use crate::discriminator::DlpDiscriminator;
 use crate::pda::ephemeral_balance_pda_from_payer;

src/instruction_builder/close_validator_fees_vault.rs

@@ -1,5 +1,6 @@
 use solana_program::instruction::Instruction;
-use solana_program::{bpf_loader_upgradeable, instruction::AccountMeta, pubkey::Pubkey};
+use solana_program::{instruction::AccountMeta, pubkey::Pubkey};
+use solana_sdk_ids::bpf_loader_upgradeable;
 
 use crate::discriminator::DlpDiscriminator;
 use crate::pda::validator_fees_vault_pda_from_validator;

src/instruction_builder/commit_state.rs

@@ -1,7 +1,7 @@
 use borsh::to_vec;
 use solana_program::instruction::Instruction;
-use solana_program::system_program;
 use solana_program::{instruction::AccountMeta, pubkey::Pubkey};
+use solana_sdk_ids::system_program;
 
 use crate::args::CommitStateArgs;
 use crate::discriminator::DlpDiscriminator;

src/instruction_builder/commit_state_from_buffer.rs

@@ -1,7 +1,7 @@
 use borsh::to_vec;
 use solana_program::instruction::Instruction;
-use solana_program::system_program;
 use solana_program::{instruction::AccountMeta, pubkey::Pubkey};
+use solana_sdk_ids::system_program;
 
 use crate::args::CommitStateFromBufferArgs;
 use crate::discriminator::DlpDiscriminator;

src/instruction_builder/delegate.rs

@@ -1,7 +1,7 @@
 use borsh::to_vec;
 use solana_program::instruction::Instruction;
-use solana_program::system_program;
 use solana_program::{instruction::AccountMeta, pubkey::Pubkey};
+use solana_sdk_ids::system_program;
 
 use crate::args::DelegateArgs;
 use crate::discriminator::DlpDiscriminator;

src/instruction_builder/delegate_ephemeral_balance.rs

@@ -1,7 +1,7 @@
 use borsh::to_vec;
 use solana_program::instruction::Instruction;
-use solana_program::system_program;
 use solana_program::{instruction::AccountMeta, pubkey::Pubkey};
+use solana_sdk_ids::system_program;
 
 use crate::args::DelegateEphemeralBalanceArgs;
 use crate::discriminator::DlpDiscriminator;

src/instruction_builder/finalize.rs

@@ -1,6 +1,6 @@
 use solana_program::instruction::Instruction;
-use solana_program::system_program;
 use solana_program::{instruction::AccountMeta, pubkey::Pubkey};
+use solana_sdk_ids::system_program;
 
 use crate::discriminator::DlpDiscriminator;
 use crate::pda::{

src/instruction_builder/init_protocol_fees_vault.rs

@@ -1,6 +1,6 @@
 use solana_program::instruction::Instruction;
-use solana_program::system_program;
 use solana_program::{instruction::AccountMeta, pubkey::Pubkey};
+use solana_sdk_ids::system_program;
 
 use crate::discriminator::DlpDiscriminator;
 use crate::pda::fees_vault_pda;

src/instruction_builder/init_validator_fees_vault.rs

@@ -1,6 +1,7 @@
 use solana_program::instruction::Instruction;
-use solana_program::{bpf_loader_upgradeable, system_program};
 use solana_program::{instruction::AccountMeta, pubkey::Pubkey};
+use solana_sdk_ids::bpf_loader_upgradeable;
+use solana_sdk_ids::system_program;
 
 use crate::discriminator::DlpDiscriminator;
 use crate::pda::validator_fees_vault_pda_from_validator;

src/instruction_builder/protocol_claim_fees.rs

@@ -1,5 +1,6 @@
 use solana_program::instruction::Instruction;
-use solana_program::{bpf_loader_upgradeable, instruction::AccountMeta, pubkey::Pubkey};
+use solana_program::{instruction::AccountMeta, pubkey::Pubkey};
+use solana_sdk_ids::bpf_loader_upgradeable;
 
 use crate::discriminator::DlpDiscriminator;
 use crate::pda::fees_vault_pda;

src/instruction_builder/top_up_ephemeral_balance.rs

@@ -1,7 +1,7 @@
 use borsh::to_vec;
 use solana_program::instruction::Instruction;
-use solana_program::system_program;
 use solana_program::{instruction::AccountMeta, pubkey::Pubkey};
+use solana_sdk_ids::system_program;
 
 use crate::args::TopUpEphemeralBalanceArgs;
 use crate::discriminator::DlpDiscriminator;

src/instruction_builder/undelegate.rs

@@ -1,6 +1,6 @@
 use solana_program::instruction::Instruction;
-use solana_program::system_program;
 use solana_program::{instruction::AccountMeta, pubkey::Pubkey};
+use solana_sdk_ids::system_program;
 
 use crate::discriminator::DlpDiscriminator;
 use crate::pda::{

src/instruction_builder/whitelist_validator_for_program.rs

@@ -1,8 +1,8 @@
 use borsh::to_vec;
-use solana_program::bpf_loader_upgradeable;
 use solana_program::instruction::Instruction;
-use solana_program::system_program;
 use solana_program::{instruction::AccountMeta, pubkey::Pubkey};
+use solana_sdk_ids::bpf_loader_upgradeable;
+use solana_sdk_ids::system_program;
 
 use crate::args::WhitelistValidatorForProgramArgs;
 use crate::discriminator::DlpDiscriminator;

src/processor/close_ephemeral_balance.rs

@@ -3,10 +3,9 @@ use crate::processor::utils::loaders::{load_pda, load_signer};
 use solana_program::msg;
 use solana_program::program::invoke_signed;
 use solana_program::program_error::ProgramError;
-use solana_program::system_instruction::transfer;
-use solana_program::{
-    account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey, system_program,
-};
+use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey};
+use solana_sdk_ids::system_program;
+use solana_system_interface::instruction::transfer;
 
 /// Process the closing of an ephemeral balance account
 ///

src/processor/commit_state.rs

@@ -11,11 +11,12 @@ use crate::{
     commit_record_seeds_from_delegated_account, commit_state_seeds_from_delegated_account,
 };
 use borsh::BorshDeserialize;
+use solana_program::msg;
 use solana_program::program::invoke;
 use solana_program::program_error::ProgramError;
-use solana_program::system_instruction::transfer;
 use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey};
-use solana_program::{msg, system_program};
+use solana_sdk_ids::system_program;
+use solana_system_interface::instruction::transfer;
 
 /// Commit a new state of a delegated PDA
 ///

src/processor/delegate.rs

@@ -2,9 +2,8 @@ use borsh::BorshDeserialize;
 use solana_program::msg;
 use solana_program::program_error::ProgramError;
 use solana_program::sysvar::Sysvar;
-use solana_program::{
-    account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey, system_program,
-};
+use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey};
+use solana_sdk_ids::system_program;
 
 use crate::args::DelegateArgs;
 use crate::processor::utils::curve::is_on_curve;

src/processor/delegate_ephemeral_balance.rs

@@ -4,10 +4,9 @@ use crate::processor::utils::loaders::{load_program, load_signer};
 use borsh::BorshDeserialize;
 use solana_program::program::invoke_signed;
 use solana_program::program_error::ProgramError;
-use solana_program::system_program;
-use solana_program::{
-    account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey, system_instruction,
-};
+use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey};
+use solana_sdk_ids::system_program;
+use solana_system_interface::instruction as system_instruction;
 
 /// Delegates an account to transfer lamports which are used to fund it inside
 /// the ephemeral.

src/processor/finalize.rs

@@ -7,9 +7,8 @@ use crate::processor::utils::loaders::{
 use crate::processor::utils::pda::close_pda;
 use crate::state::{CommitRecord, DelegationMetadata, DelegationRecord};
 use solana_program::program_error::ProgramError;
-use solana_program::{
-    account_info::AccountInfo, entrypoint::ProgramResult, msg, pubkey::Pubkey, system_program,
-};
+use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, msg, pubkey::Pubkey};
+use solana_sdk_ids::system_program;
 
 /// Finalize a committed state, after validation, to a delegated account
 ///
@@ -121,7 +120,7 @@ pub fn process_finalize(
     let commit_state_data = commit_state_account.try_borrow_data()?;
 
     // Copying the new commit state to the delegated account
-    delegated_account.realloc(commit_state_data.len(), false)?;
+    delegated_account.resize(commit_state_data.len())?;
     let mut delegated_account_data = delegated_account.try_borrow_mut_data()?;
     (*delegated_account_data).copy_from_slice(&commit_state_data);
 

src/processor/init_protocol_fees_vault.rs

@@ -1,7 +1,6 @@
 use solana_program::program_error::ProgramError;
-use solana_program::{
-    account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey, system_program,
-};
+use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey};
+use solana_sdk_ids::system_program;
 
 use crate::fees_vault_seeds;
 use crate::processor::utils::loaders::{load_program, load_signer, load_uninitialized_pda};

src/processor/init_validator_fees_vault.rs

@@ -1,8 +1,7 @@
 use solana_program::msg;
 use solana_program::program_error::ProgramError;
-use solana_program::{
-    account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey, system_program,
-};
+use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey};
+use solana_sdk_ids::system_program;
 
 use crate::error::DlpError::Unauthorized;
 use crate::processor::utils::loaders::{

src/processor/top_up_ephemeral_balance.rs

@@ -5,10 +5,9 @@ use crate::processor::utils::pda::create_pda;
 use borsh::BorshDeserialize;
 use solana_program::program::invoke;
 use solana_program::program_error::ProgramError;
-use solana_program::system_instruction::transfer;
-use solana_program::{
-    account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey, system_program,
-};
+use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey};
+use solana_sdk_ids::system_program;
+use solana_system_interface::instruction::transfer;
 
 /// Tops up the ephemeral balance account.
 ///

src/processor/undelegate.rs

@@ -17,10 +17,9 @@ use solana_program::msg;
 use solana_program::program::{invoke, invoke_signed};
 use solana_program::program_error::ProgramError;
 use solana_program::rent::Rent;
-use solana_program::system_instruction::transfer;
-use solana_program::{
-    account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey, system_program,
-};
+use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey};
+use solana_sdk_ids::system_program;
+use solana_system_interface::instruction::transfer;
 
 /// Undelegate a delegated account
 ///

src/processor/utils/loaders.rs

@@ -8,9 +8,10 @@ use crate::{
 };
 use solana_program::bpf_loader_upgradeable::UpgradeableLoaderState;
 use solana_program::{
-    account_info::AccountInfo, bpf_loader_upgradeable, msg, program_error::ProgramError,
-    pubkey::Pubkey, system_program, sysvar,
+    account_info::AccountInfo, msg, program_error::ProgramError, pubkey::Pubkey, sysvar,
 };
+use solana_sdk_ids::bpf_loader_upgradeable;
+use solana_sdk_ids::system_program;
 
 /// Errors if:
 /// - Account is not owned by expected program.
@@ -373,7 +374,8 @@ pub fn load_initialized_commit_record(
 
 #[cfg(test)]
 mod tests {
-    use solana_program::{account_info::AccountInfo, pubkey::Pubkey, system_program};
+    use solana_program::{account_info::AccountInfo, pubkey::Pubkey};
+    use solana_sdk_ids::system_program;
 
     use crate::processor::utils::loaders::{
         load_account, load_signer, load_sysvar, load_uninitialized_account,

src/processor/utils/pda.rs

@@ -2,8 +2,10 @@ use solana_program::program::invoke;
 use solana_program::program_error::ProgramError;
 use solana_program::{
     account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey, rent::Rent,
-    system_instruction, sysvar::Sysvar,
+    sysvar::Sysvar,
 };
+use solana_sdk_ids::system_program;
+use solana_system_interface::instruction as system_instruction;
 
 /// Creates a new pda
 #[inline(always)]
@@ -24,7 +26,7 @@ pub(crate) fn create_pda<'a, 'info>(
     if target_account.lamports().eq(&0) {
         // If balance is zero, create account
         solana_program::program::invoke_signed(
-            &solana_program::system_instruction::create_account(
+            &system_instruction::create_account(
                 payer.key,
                 target_account.key,
                 rent.minimum_balance(space),
@@ -46,11 +48,7 @@ pub(crate) fn create_pda<'a, 'info>(
             .saturating_sub(target_account.lamports());
         if rent_exempt_balance.gt(&0) {
             solana_program::program::invoke(
-                &solana_program::system_instruction::transfer(
-                    payer.key,
-                    target_account.key,
-                    rent_exempt_balance,
-                ),
+                &system_instruction::transfer(payer.key, target_account.key, rent_exempt_balance),
                 &[
                     payer.as_ref().clone(),
                     target_account.as_ref().clone(),
@@ -60,7 +58,7 @@ pub(crate) fn create_pda<'a, 'info>(
         }
         // 2) allocate space for the account
         solana_program::program::invoke_signed(
-            &solana_program::system_instruction::allocate(target_account.key, space as u64),
+            &system_instruction::allocate(target_account.key, space as u64),
             &[
                 target_account.as_ref().clone(),
                 system_program.as_ref().clone(),
@@ -69,7 +67,7 @@ pub(crate) fn create_pda<'a, 'info>(
         )?;
         // 3) assign our program as the owner
         solana_program::program::invoke_signed(
-            &solana_program::system_instruction::assign(target_account.key, owner),
+            &system_instruction::assign(target_account.key, owner),
             &[
                 target_account.as_ref().clone(),
                 system_program.as_ref().clone(),
@@ -95,7 +93,7 @@ pub(crate) fn resize_pda<'a, 'info>(
         &[payer.clone(), pda.clone(), system_program.clone()],
     )?;
 
-    pda.realloc(new_size, false)?;
+    pda.resize(new_size)?;
     Ok(())
 }
 
@@ -112,8 +110,8 @@ pub(crate) fn close_pda<'a, 'info>(
         .unwrap();
     **target_account.lamports.borrow_mut() = 0;
 
-    target_account.assign(&solana_program::system_program::ID);
-    target_account.realloc(0, false).map_err(Into::into)
+    target_account.assign(&system_program::ID);
+    target_account.resize(0).map_err(Into::into)
 }
 
 /// Close PDA with fees, distributing the fees to the specified addresses in sequence
@@ -164,6 +162,6 @@ pub(crate) fn close_pda_with_fees<'a, 'info>(
         .ok_or(ProgramError::InsufficientFunds)?;
 
     **target_account.lamports.borrow_mut() = 0;
-    target_account.assign(&solana_program::system_program::ID);
-    target_account.realloc(0, false).map_err(Into::into)
+    target_account.assign(&system_program::ID);
+    target_account.resize(0).map_err(Into::into)
 }

src/processor/whitelist_validator_for_program.rs

@@ -9,9 +9,8 @@ use crate::state::ProgramConfig;
 use borsh::BorshDeserialize;
 use solana_program::msg;
 use solana_program::program_error::ProgramError;
-use solana_program::{
-    account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey, system_program,
-};
+use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey};
+use solana_sdk_ids::system_program;
 
 /// Whitelist a validator for a program
 ///

tests/fixtures/accounts.rs

@@ -2,8 +2,8 @@ use dlp::state::{CommitRecord, DelegationMetadata, DelegationRecord, ProgramConf
 use solana_program::native_token::LAMPORTS_PER_SOL;
 use solana_program::pubkey::Pubkey;
 use solana_program::rent::Rent;
-use solana_program::system_program;
 use solana_sdk::pubkey;
+use solana_sdk_ids::system_program;
 
 // Constants for default values
 const DEFAULT_DELEGATION_SLOT: u64 = 0;