Patch: Solana v3.0

assertions/Cargo.toml

@@ -8,7 +8,7 @@ authors.workspace = true
 documentation.workspace = true
 
 [dependencies]
-pinocchio = { version = "0.9" }
+pinocchio = { version = "0.9.2" }
 pinocchio-system = { version = "0.3" }
 pinocchio-pubkey = { version = "0.3" }
 

cli/Cargo.toml

@@ -25,14 +25,15 @@ bs58 = "0.5.1"
 hex = "0.4.3"
 swig-sdk = { path = "../rust-sdk" }
 openssl = { version = "0.10", features = ["vendored"] }
-solana-sdk = "2.0"
-solana-secp256r1-program = "2.0"
+solana-sdk = "3.0"
+solana-secp256r1-program = "3.0"
+solana-system-interface = {version = "3.0.0", features = ["bincode"]}
 
 alloy-primitives = { version = "1.0.0", features = ["k256"] }
-alloy-signer = { version = "0.14.0" }
-alloy-signer-local = { version = "0.14.0" }
-spl-token = "8.0.0"
-spl-associated-token-account = "7.0.0"
+alloy-signer = { version = "1.1.1" }
+alloy-signer-local = { version = "1.1.1" }
+spl-token = "9.0.0"
+spl-associated-token-account = "8.0.0"
 
 [lints]
 workspace = true

cli/src/commands.rs

@@ -16,9 +16,9 @@ use serde_json::Value;
 use solana_sdk::{
     pubkey::Pubkey,
     signature::{Keypair, Signer},
-    system_instruction,
 };
 use solana_secp256r1_program;
+use solana_system_interface::instruction as system_instruction;
 use swig_sdk::{
     authority::AuthorityType, client_role::Secp256r1ClientRole, types::UpdateAuthorityData,
     ClientRole, Ed25519ClientRole, Permission, RecurringConfig, Secp256k1ClientRole, SwigError,

cli/src/interactive.rs

@@ -11,13 +11,9 @@ use openssl::{
     ec::{EcGroup, EcKey, EcPoint, PointConversionForm},
     nid::Nid,
 };
-use solana_sdk::{
-    pubkey::Pubkey,
-    signature::Keypair,
-    signer::Signer,
-    system_instruction::{self, transfer},
-};
+use solana_sdk::{pubkey::Pubkey, signature::Keypair, signer::Signer};
 use solana_secp256r1_program;
+use solana_system_interface::instruction::{self as system_instruction, transfer};
 use swig_sdk::{
     authority::{
         ed25519::CreateEd25519SessionAuthority, secp256k1::CreateSecp256k1SessionAuthority,

cli/src/main.rs

@@ -21,8 +21,8 @@ use rand::Rng;
 use solana_sdk::{
     pubkey::Pubkey,
     signature::{read_keypair_file, Keypair, Signer},
-    system_instruction::transfer,
 };
+use solana_system_interface::instruction::transfer;
 use swig_sdk::{
     authority::{ed25519::CreateEd25519SessionAuthority, AuthorityType},
     swig::SwigWithRoles,

instructions/Cargo.toml

@@ -11,9 +11,9 @@ documentation.workspace = true
 client = ["solana-program"]
 
 [dependencies]
-pinocchio = { version = "0.9" }
+pinocchio = { version = "0.9.2" }
 pinocchio-system = { version = "0.3" }
-solana-program = { version = "2.0.13", optional = true }
+solana-program = { version = "3.0", optional = true }
 bs58 = "*"
 
 [lints]

interface/Cargo.toml

@@ -10,7 +10,7 @@ documentation.workspace = true
 
 [dependencies]
 bytemuck = { version = "1.19.0", features = ["derive"] }
-solana-sdk = { version = "2" }
+solana-sdk = { version = "3.0.0" }
 swig = { path = "../program", default-features = false, features = [
     "no-entrypoint",
 ] }
@@ -19,4 +19,5 @@ swig-compact-instructions = { path = "../instructions", default-features = false
 ] }
 swig-state = { path = "../state" }
 anyhow = "1.0.75"
-solana-secp256r1-program = "2.2.1"
+solana-secp256r1-program = "3.0.0"
+solana-sdk-ids = "3.0.0"

interface/src/lib.rs

@@ -3,8 +3,8 @@ use solana_sdk::{
     instruction::{AccountMeta, Instruction},
     keccak,
     pubkey::Pubkey,
-    system_program,
 };
+use solana_sdk_ids::system_program;
 use solana_secp256r1_program::new_secp256r1_instruction_with_signature;
 pub use swig;
 use swig::actions::{

program/Cargo.toml

@@ -13,7 +13,7 @@ workspace = true
 
 [dependencies]
 pinocchio-pubkey = { version = "0.3" }
-pinocchio = { version = "0.9", features = ["std"] }
+pinocchio = { version = "0.9.2", features = ["std"] }
 pinocchio-system = { version = "0.3" }
 pinocchio-token = { version = "0.3" }
 shank = { version = "0.4.2", git = "https://github.com/anagrambuild/shank.git" }
@@ -29,27 +29,35 @@ solana-security-txt = "=1.1.1"
 default-env = "=0.1.1"
 
 [dev-dependencies]
-solana-sdk = "2"
+solana-address = {version="2.0.0", features = ["serde"]}
+solana-compute-budget-interface = "3.0.0"
+solana-system-interface = {version = "3.0.0", features = ["bincode"]}
+solana-vote-interface = {version = "3.0.0", features = ["serde"]}
+solana-address-lookup-table-interface = {version="3.0.0", features = ["serde"]}
+solana-commitment-config = {version="3.0.0", features=["serde"]}
+solana-sdk = "3.0.0"
+solana-sdk-ids = "3.0.0"
 rand = "0.9.0"
 swig-interface = { path = "../interface" }
-litesvm-token = { version = "0.6.1" }
-litesvm = { version = "0.6.1" }
+litesvm-token = { version = "=0.8.1" }
+litesvm = { version = "=0.8.1" }
 test-log = "0.2.16"
 anyhow = "1.0.71"
 ecdsa = "0.16.9"
 alloy-primitives = { version = "1.0.0", features = ["k256"] }
-alloy-signer = { version = "0.14.0" }
-alloy-signer-local = { version = "0.14.0" }
-solana-stake-interface = "=1.2.1"
-solana-clock = "=2.2.1"
+alloy-signer = { version = "1.1.1" }
+alloy-signer-local = { version = "1.1.1" }
+solana-stake-interface = {version = "2.0.1", features = ["bincode"]}
+solana-clock = "=3.0.0"
 bincode = "=1.3.3"
-solana-client = "=2.2.4"
-solana-program = "=2.2.1"
+solana-client = "=3.0.10"
+solana-program = "=3.0.0"
 once_cell = "1.21.3"
 spl-memo = "=6.0.0"
-solana-secp256r1-program = "2.2.1"
+solana-secp256r1-program = "3.0.0"
 openssl = { version = "0.10.72", features = ["vendored"] }
 hex = "0.4.3"
+serde = "1"
 
 [features]
 test-bpf = []

program/build.rs

@@ -1,10 +1,9 @@
 //! Shank IDL build script.
 
-use {
-    anyhow::anyhow,
-    shank_idl::{extract_idl, manifest::Manifest, ParseIdlOpts},
-    std::{env, fs, path::Path},
-};
+use std::{env, fs, path::Path};
+
+use anyhow::anyhow;
+use shank_idl::{extract_idl, manifest::Manifest, ParseIdlOpts};
 
 fn main() {
     println!("cargo:rerun-if-changed=src/");

program/tests/action_tests.rs

@@ -6,21 +6,21 @@
 mod common;
 
 use common::*;
+use solana_address_lookup_table_interface::state::AddressLookupTable;
+use solana_commitment_config::CommitmentConfig;
+use solana_compute_budget_interface::ComputeBudgetInstruction;
 use solana_sdk::{
     account::ReadableAccount,
-    address_lookup_table::{state::AddressLookupTable, AddressLookupTableAccount},
-    commitment_config::CommitmentConfig,
-    compute_budget::ComputeBudgetInstruction,
     instruction::{AccountMeta, Instruction},
     keccak::hash,
-    message::{v0, VersionedMessage},
+    message::{v0, AddressLookupTableAccount, VersionedMessage},
     pubkey::Pubkey,
     rent::Rent,
     signature::{read_keypair_file, Keypair, Signature},
     signer::{Signer, SignerError},
-    system_instruction,
     transaction::VersionedTransaction,
 };
+use solana_system_interface::instruction as system_instruction;
 use swig_interface::{AuthorityConfig, ClientAction, RemoveAuthorityInstruction};
 use swig_state::{
     action::{
@@ -131,7 +131,7 @@ fn test_multiple_actions_with_transfer_and_manage_authority() {
             }),
             ClientAction::ManageAuthority(ManageAuthority {}),
             ClientAction::Program(Program {
-                program_id: solana_sdk::system_program::ID.to_bytes(),
+                program_id: solana_sdk_ids::system_program::ID.to_bytes(),
             }),
         ],
     )

program/tests/action_v2_test.rs

@@ -6,21 +6,21 @@
 mod common;
 
 use common::*;
+use solana_address_lookup_table_interface::state::AddressLookupTable;
+use solana_commitment_config::CommitmentConfig;
+use solana_compute_budget_interface::ComputeBudgetInstruction;
 use solana_sdk::{
     account::ReadableAccount,
-    address_lookup_table::{state::AddressLookupTable, AddressLookupTableAccount},
-    commitment_config::CommitmentConfig,
-    compute_budget::ComputeBudgetInstruction,
     instruction::{AccountMeta, Instruction},
     keccak::hash,
-    message::{v0, VersionedMessage},
+    message::{v0, AddressLookupTableAccount, VersionedMessage},
     pubkey::Pubkey,
     rent::Rent,
     signature::{read_keypair_file, Keypair, Signature},
     signer::{Signer, SignerError},
-    system_instruction,
     transaction::VersionedTransaction,
 };
+use solana_system_interface::instruction as system_instruction;
 use swig_interface::{
     AuthorityConfig, ClientAction, RemoveAuthorityInstruction, SignV2Instruction,
 };
@@ -134,7 +134,7 @@ fn test_multiple_actions_with_transfer_and_manage_authority() {
             }),
             ClientAction::ManageAuthority(ManageAuthority {}),
             ClientAction::Program(Program {
-                program_id: solana_sdk::system_program::ID.to_bytes(),
+                program_id: solana_sdk_ids::system_program::ID.to_bytes(),
             }),
         ],
     )

program/tests/all_but_manage_authority_test.rs

@@ -18,10 +18,10 @@ use solana_sdk::{
     pubkey::Pubkey,
     signature::Keypair,
     signer::Signer,
-    system_instruction,
     sysvar::clock::Clock,
     transaction::{TransactionError, VersionedTransaction},
 };
+use solana_system_interface::instruction as system_instruction;
 use swig::actions::sign_v1::SignV1Args;
 use swig_interface::{
     compact_instructions, AuthorityConfig, ClientAction, CreateSubAccountInstruction,
@@ -904,7 +904,7 @@ fn test_all_but_manage_authority_cannot_withdraw_from_sub_account() {
 
     // Verify the sub-account still exists and is intact
     let sub_account_data = context.svm.get_account(&sub_account).unwrap();
-    assert_eq!(sub_account_data.owner, solana_sdk::system_program::ID);
+    assert_eq!(sub_account_data.owner, solana_sdk_ids::system_program::ID);
 
     // Verify the restricted authority still has AllButManageAuthority permission
     let swig_account_after = context.svm.get_account(&swig).unwrap();

program/tests/all_but_manage_authority_v2_test.rs

@@ -22,10 +22,10 @@ use solana_sdk::{
     pubkey::Pubkey,
     signature::Keypair,
     signer::Signer,
-    system_instruction,
     sysvar::clock::Clock,
     transaction::{TransactionError, VersionedTransaction},
 };
+use solana_system_interface::instruction as system_instruction;
 use swig_interface::{
     AuthorityConfig, ClientAction, CreateSubAccountInstruction, RemoveAuthorityInstruction,
     SignV2Instruction, SubAccountSignInstruction, ToggleSubAccountInstruction, UpdateAuthorityData,

program/tests/common/mod.rs

@@ -2,8 +2,8 @@ use alloy_signer_local::{LocalSigner, PrivateKeySigner};
 use anyhow::Result;
 use litesvm::{types::TransactionMetadata, LiteSVM};
 use litesvm_token::{spl_token, CreateAssociatedTokenAccount, CreateMint, MintTo};
+use solana_compute_budget_interface::ComputeBudgetInstruction;
 use solana_sdk::{
-    compute_budget::ComputeBudgetInstruction,
     instruction::Instruction,
     message::{v0, VersionedMessage},
     pubkey::Pubkey,
@@ -210,6 +210,7 @@ pub fn create_swig_ed25519(
         &[context.default_payer.insecure_clone()],
     )
     .unwrap();
+    // let bench = TransactionMetadata::default();
     let bench = context
         .svm
         .send_transaction(tx)

program/tests/cpi_program_permission_test.rs

@@ -9,9 +9,9 @@ use solana_sdk::{
     pubkey::Pubkey,
     signature::Keypair,
     signer::Signer,
-    system_instruction,
     transaction::{TransactionError, VersionedTransaction},
 };
+use solana_system_interface::instruction as system_instruction;
 use swig_interface::{AuthorityConfig, ClientAction};
 use swig_state::{
     action::program::Program,
@@ -52,7 +52,7 @@ fn test_cpi_signing_requires_program_permission() {
 
     // Create Program action for system program and SolLimit for transfers
     let system_program_action = Program {
-        program_id: solana_sdk::system_program::ID.to_bytes(),
+        program_id: solana_sdk_ids::system_program::ID.to_bytes(),
     };
 
     let _txn = add_authority_with_ed25519_root(

program/tests/cpi_program_permission_v2_test.rs

@@ -9,9 +9,9 @@ use solana_sdk::{
     pubkey::Pubkey,
     signature::Keypair,
     signer::Signer,
-    system_instruction,
     transaction::{TransactionError, VersionedTransaction},
 };
+use solana_system_interface::instruction as system_instruction;
 use swig_interface::{AuthorityConfig, ClientAction};
 use swig_state::{
     action::program::Program,
@@ -52,7 +52,7 @@ fn test_cpi_signing_requires_program_permission_v2() {
 
     // Create Program action for system program and SolLimit for transfers
     let system_program_action = Program {
-        program_id: solana_sdk::system_program::ID.to_bytes(),
+        program_id: solana_sdk_ids::system_program::ID.to_bytes(),
     };
 
     let _txn = add_authority_with_ed25519_root(

program/tests/create_session_test.rs

@@ -14,10 +14,10 @@ use solana_sdk::{
     message::{v0, VersionedMessage},
     signature::Keypair,
     signer::Signer,
-    system_instruction,
     sysvar::rent::Rent,
     transaction::VersionedTransaction,
 };
+use solana_system_interface::instruction as system_instruction;
 use swig_interface::{CreateSessionInstruction, SignInstruction};
 use swig_state::{
     authority::{

program/tests/create_session_v2_test.rs

@@ -15,10 +15,10 @@ use solana_sdk::{
     pubkey::Pubkey,
     signature::Keypair,
     signer::Signer,
-    system_instruction,
     sysvar::rent::Rent,
     transaction::VersionedTransaction,
 };
+use solana_system_interface::instruction as system_instruction;
 use swig_interface::{CreateSessionInstruction, SignV2Instruction};
 use swig_state::{
     authority::{

program/tests/create_test.rs

@@ -17,10 +17,10 @@ use solana_sdk::{
     pubkey::Pubkey,
     signature::Keypair,
     signer::Signer,
-    system_instruction,
     sysvar::rent::Rent,
     transaction::VersionedTransaction,
 };
+use solana_system_interface::instruction as system_instruction;
 use swig_state::{
     authority::{secp256k1::Secp256k1Authority, AuthorityType},
     swig::{swig_account_seeds, SwigWithRoles},

program/tests/create_v2_test.rs

@@ -17,10 +17,10 @@ use solana_sdk::{
     pubkey::Pubkey,
     signature::Keypair,
     signer::Signer,
-    system_instruction,
     sysvar::{clock::Clock, rent::Rent},
     transaction::VersionedTransaction,
 };
+use solana_system_interface::instruction as system_instruction;
 use swig_interface::SignV2Instruction;
 use swig_state::{
     authority::{secp256k1::Secp256k1Authority, AuthorityType},