remove solana-program

anza-xyz · Dec 5, 2024 · 10b5ee6 · 10b5ee6
1 parent bed6efd
commit 10b5ee6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock
diff --git a/thin-client/Cargo.toml b/thin-client/Cargo.toml
@@ -22,12 +22,13 @@ solana-epoch-info = { workspace = true }
 solana-hash = { workspace = true }
 solana-instruction = { workspace = true }
 solana-keypair = { workspace = true }
-solana-program = { workspace = true, default-features = false }
+solana-message = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-rpc-client = { workspace = true }
 solana-rpc-client-api = { workspace = true }
 solana-signature = { workspace = true }
 solana-signer = { workspace = true }
+solana-system-interface = { workspace = true, features = ["bincode"] }
 solana-transaction = { workspace = true }
 solana-transaction-error = { workspace = true }
 

diff --git a/thin-client/src/thin_client.rs b/thin-client/src/thin_client.rs
@@ -20,12 +20,13 @@ use {
     solana_hash::Hash,
     solana_instruction::Instruction,
     solana_keypair::Keypair,
-    solana_program::{message::Message, system_instruction},
+    solana_message::Message,
     solana_pubkey::Pubkey,
     solana_rpc_client::rpc_client::RpcClient,
     solana_rpc_client_api::config::RpcProgramAccountsConfig,
     solana_signature::Signature,
     solana_signer::{signers::Signers, Signer},
+    solana_system_interface::instruction::transfer,
     solana_transaction::{versioned::VersionedTransaction, Transaction},
     solana_transaction_error::{TransactionResult, TransportResult},
     std::{
@@ -366,8 +367,7 @@ where
         keypair: &Keypair,
         pubkey: &Pubkey,
     ) -> TransportResult<Signature> {
-        let transfer_instruction =
-            system_instruction::transfer(&keypair.pubkey(), pubkey, lamports);
+        let transfer_instruction = transfer(&keypair.pubkey(), pubkey, lamports);
         self.send_and_confirm_instruction(keypair, transfer_instruction)
     }