From a8484fbc6765ace71600a360b537de3a44a8de9a Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Thu, 5 Dec 2024 22:21:27 +0400 Subject: [PATCH] remove solana-sdk from thin-client (#3841) * remove solana-sdk from thin-client * remove solana-program --- Cargo.lock | 16 +++++++++++++- programs/sbf/Cargo.lock | 16 +++++++++++++- svm/examples/Cargo.lock | 16 +++++++++++++- thin-client/Cargo.toml | 16 +++++++++++++- thin-client/src/thin_client.rs | 38 ++++++++++++++++------------------ 5 files changed, 78 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a5f0cd9923c57e..df475474990d0c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9206,11 +9206,25 @@ dependencies = [ "bincode", "log", "rayon", + "solana-account", + "solana-client-traits", + "solana-clock", + "solana-commitment-config", "solana-connection-cache", + "solana-epoch-info", + "solana-hash", + "solana-instruction", + "solana-keypair", "solana-logger", + "solana-message", + "solana-pubkey", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk", + "solana-signature", + "solana-signer", + "solana-system-interface", + "solana-transaction", + "solana-transaction-error", ] [[package]] diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index 0ec4b3279d953b..4acab478a9c0d8 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -7767,10 +7767,24 @@ dependencies = [ "bincode", "log", "rayon", + "solana-account", + "solana-client-traits", + "solana-clock", + "solana-commitment-config", "solana-connection-cache", + "solana-epoch-info", + "solana-hash", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-pubkey", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk", + "solana-signature", + "solana-signer", + "solana-system-interface", + "solana-transaction", + "solana-transaction-error", ] [[package]] diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock index 68c0c757ed4896..a98c17c157aa64 100644 --- a/svm/examples/Cargo.lock +++ b/svm/examples/Cargo.lock @@ -7112,10 +7112,24 @@ dependencies = [ "bincode", "log", "rayon", + "solana-account", + "solana-client-traits", + "solana-clock", + "solana-commitment-config", "solana-connection-cache", + "solana-epoch-info", + "solana-hash", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-pubkey", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk", + "solana-signature", + "solana-signer", + "solana-system-interface", + "solana-transaction", + "solana-transaction-error", ] [[package]] diff --git a/thin-client/Cargo.toml b/thin-client/Cargo.toml index 75bdaf1bc196ee..ef982440b26e0f 100644 --- a/thin-client/Cargo.toml +++ b/thin-client/Cargo.toml @@ -13,10 +13,24 @@ edition = { workspace = true } bincode = { workspace = true } log = { workspace = true } rayon = { workspace = true } +solana-account = { workspace = true } +solana-client-traits = { workspace = true } +solana-clock = { workspace = true } +solana-commitment-config = { workspace = true } solana-connection-cache = { workspace = true } +solana-epoch-info = { workspace = true } +solana-hash = { workspace = true } +solana-instruction = { workspace = true } +solana-keypair = { workspace = true } +solana-message = { workspace = true } +solana-pubkey = { workspace = true } solana-rpc-client = { workspace = true } solana-rpc-client-api = { workspace = true } -solana-sdk = { 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 } [dev-dependencies] solana-logger = { workspace = true } diff --git a/thin-client/src/thin_client.rs b/thin-client/src/thin_client.rs index fc994ee9b5e094..13bbfc77b12140 100644 --- a/thin-client/src/thin_client.rs +++ b/thin-client/src/thin_client.rs @@ -6,30 +6,29 @@ use { log::*, rayon::iter::{IntoParallelIterator, ParallelIterator}, + solana_account::Account, + solana_client_traits::{AsyncClient, Client, SyncClient}, + solana_clock::MAX_PROCESSING_AGE, + solana_commitment_config::CommitmentConfig, solana_connection_cache::{ client_connection::ClientConnection, connection_cache::{ ConnectionCache, ConnectionManager, ConnectionPool, NewConnectionConfig, }, }, + solana_epoch_info::EpochInfo, + solana_hash::Hash, + solana_instruction::Instruction, + solana_keypair::Keypair, + solana_message::Message, + solana_pubkey::Pubkey, solana_rpc_client::rpc_client::RpcClient, solana_rpc_client_api::config::RpcProgramAccountsConfig, - solana_sdk::{ - account::Account, - client::{AsyncClient, Client, SyncClient}, - clock::MAX_PROCESSING_AGE, - commitment_config::CommitmentConfig, - epoch_info::EpochInfo, - hash::Hash, - instruction::Instruction, - message::Message, - pubkey::Pubkey, - signature::{Keypair, Signature, Signer}, - signers::Signers, - system_instruction, - transaction::{self, Transaction, VersionedTransaction}, - transport::Result as TransportResult, - }, + solana_signature::Signature, + solana_signer::{signers::Signers, Signer}, + solana_system_interface::instruction::transfer, + solana_transaction::{versioned::VersionedTransaction, Transaction}, + solana_transaction_error::{TransactionResult, TransportResult}, std::{ io, net::SocketAddr, @@ -368,8 +367,7 @@ where keypair: &Keypair, pubkey: &Pubkey, ) -> TransportResult { - 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) } @@ -420,7 +418,7 @@ where fn get_signature_status( &self, signature: &Signature, - ) -> TransportResult>> { + ) -> TransportResult>> { let status = self .rpc_client() .get_signature_status(signature) @@ -437,7 +435,7 @@ where &self, signature: &Signature, commitment_config: CommitmentConfig, - ) -> TransportResult>> { + ) -> TransportResult>> { let status = self .rpc_client() .get_signature_status_with_commitment(signature, commitment_config)