remove solana-sdk from solana-client (#3844)

* remove solana-sdk from solana-client

* remove solana-program

client/Cargo.toml

@@ -20,17 +20,31 @@ indicatif = { workspace = true }
 log = { workspace = true }
 quinn = { workspace = true }
 rayon = { workspace = true }
+solana-account = { workspace = true }
+solana-client-traits = { 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-measure = { workspace = true }
+solana-message = { workspace = true }
+solana-pubkey = { workspace = true }
 solana-pubsub-client = { workspace = true }
 solana-quic-client = { workspace = true }
+solana-quic-definitions = { workspace = true }
 solana-rpc-client = { workspace = true, features = ["default"] }
 solana-rpc-client-api = { workspace = true }
 solana-rpc-client-nonce-utils = { workspace = true }
-solana-sdk = { workspace = true, features = ["openssl-vendored"] }
+solana-signature = { workspace = true }
+solana-signer = { workspace = true }
 solana-streamer = { workspace = true }
 solana-thin-client = { workspace = true }
+solana-time-utils = { workspace = true }
 solana-tpu-client = { workspace = true, features = ["default"] }
+solana-transaction = { workspace = true }
+solana-transaction-error = { workspace = true }
 solana-udp-client = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"] }

client/src/connection_cache.rs

@@ -8,12 +8,12 @@ use {
             NewConnectionConfig,
         },
     },
+    solana_keypair::Keypair,
+    solana_pubkey::Pubkey,
     solana_quic_client::{QuicConfig, QuicConnectionManager, QuicPool},
-    solana_sdk::{
-        pubkey::Pubkey, quic::NotifyKeyUpdate, signature::Keypair,
-        transport::Result as TransportResult,
-    },
+    solana_quic_definitions::NotifyKeyUpdate,
     solana_streamer::streamer::StakedNodes,
+    solana_transaction_error::TransportResult,
     solana_udp_client::{UdpConfig, UdpConnectionManager, UdpPool},
     std::{
         net::{IpAddr, Ipv4Addr, SocketAddr},
@@ -201,8 +201,8 @@ mod tests {
         super::*,
         crate::connection_cache::ConnectionCache,
         crossbeam_channel::unbounded,
+        solana_keypair::Keypair,
         solana_net_utils::bind_to_localhost,
-        solana_sdk::signature::Keypair,
         solana_streamer::{
             quic::{QuicServerParams, SpawnServerResult},
             streamer::StakedNodes,

client/src/nonblocking/tpu_client.rs

@@ -5,15 +5,13 @@ use {
         ConnectionCache as BackendConnectionCache, ConnectionManager, ConnectionPool,
         NewConnectionConfig,
     },
+    solana_message::Message,
     solana_quic_client::{QuicConfig, QuicConnectionManager, QuicPool},
     solana_rpc_client::nonblocking::rpc_client::RpcClient,
-    solana_sdk::{
-        message::Message,
-        signers::Signers,
-        transaction::{Transaction, TransactionError},
-        transport::Result as TransportResult,
-    },
+    solana_signer::signers::Signers,
     solana_tpu_client::nonblocking::tpu_client::{Result, TpuClient as BackendTpuClient},
+    solana_transaction::Transaction,
+    solana_transaction_error::{TransactionError, TransportResult},
     std::sync::Arc,
 };
 

client/src/send_and_confirm_transactions_in_parallel.rs

@@ -6,6 +6,8 @@ use {
     bincode::serialize,
     dashmap::DashMap,
     futures_util::future::join_all,
+    solana_hash::Hash,
+    solana_message::Message,
     solana_quic_client::{QuicConfig, QuicConnectionManager, QuicPool},
     solana_rpc_client::spinner::{self, SendTransactionProgress},
     solana_rpc_client_api::{
@@ -14,14 +16,11 @@ use {
         request::{RpcError, RpcResponseErrorData, MAX_GET_SIGNATURE_STATUSES_QUERY_ITEMS},
         response::RpcSimulateTransactionResult,
     },
-    solana_sdk::{
-        hash::Hash,
-        message::Message,
-        signature::{Signature, SignerError},
-        signers::Signers,
-        transaction::{Transaction, TransactionError},
-    },
+    solana_signature::Signature,
+    solana_signer::{signers::Signers, SignerError},
     solana_tpu_client::tpu_client::{Result, TpuSenderError},
+    solana_transaction::Transaction,
+    solana_transaction_error::TransactionError,
     std::{
         sync::{
             atomic::{AtomicU64, AtomicUsize, Ordering},

client/src/thin_client.rs

@@ -5,24 +5,23 @@
 #[allow(deprecated)]
 use {
     crate::connection_cache::{dispatch, ConnectionCache},
+    solana_account::Account,
+    solana_client_traits::{AsyncClient, Client, SyncClient},
+    solana_commitment_config::CommitmentConfig,
+    solana_epoch_info::EpochInfo,
+    solana_hash::Hash,
+    solana_instruction::Instruction,
+    solana_keypair::Keypair,
+    solana_message::Message,
+    solana_pubkey::Pubkey,
     solana_quic_client::{QuicConfig, QuicConnectionManager, QuicPool},
     solana_rpc_client::rpc_client::RpcClient,
     solana_rpc_client_api::config::RpcProgramAccountsConfig,
-    solana_sdk::{
-        account::Account,
-        client::{AsyncClient, Client, SyncClient},
-        commitment_config::CommitmentConfig,
-        epoch_info::EpochInfo,
-        hash::Hash,
-        instruction::Instruction,
-        message::Message,
-        pubkey::Pubkey,
-        signature::{Keypair, Signature},
-        signers::Signers,
-        transaction::{self, Transaction, VersionedTransaction},
-        transport::Result as TransportResult,
-    },
+    solana_signature::Signature,
+    solana_signer::signers::Signers,
     solana_thin_client::thin_client::ThinClient as BackendThinClient,
+    solana_transaction::{versioned::VersionedTransaction, Transaction},
+    solana_transaction_error::{TransactionResult, TransportResult},
     solana_udp_client::{UdpConfig, UdpConnectionManager, UdpPool},
     std::{net::SocketAddr, sync::Arc, time::Duration},
 };
@@ -214,13 +213,13 @@ impl SyncClient for ThinClient {
     dispatch!(fn get_signature_status(
         &self,
         signature: &Signature
-    ) -> TransportResult<Option<transaction::Result<()>>>);
+    ) -> TransportResult<Option<TransactionResult<()>>>);
 
     dispatch!(fn get_signature_status_with_commitment(
         &self,
         signature: &Signature,
         commitment_config: CommitmentConfig
-    ) -> TransportResult<Option<transaction::Result<()>>>);
+    ) -> TransportResult<Option<TransactionResult<()>>>);
 
     dispatch!(fn get_slot(&self) -> TransportResult<u64>);
 

client/src/tpu_client.rs

@@ -4,15 +4,13 @@ use {
         ConnectionCache as BackendConnectionCache, ConnectionManager, ConnectionPool,
         NewConnectionConfig,
     },
+    solana_message::Message,
     solana_quic_client::{QuicConfig, QuicConnectionManager, QuicPool},
     solana_rpc_client::rpc_client::RpcClient,
-    solana_sdk::{
-        message::Message,
-        signers::Signers,
-        transaction::{Transaction, TransactionError},
-        transport::Result as TransportResult,
-    },
+    solana_signer::signers::Signers,
     solana_tpu_client::tpu_client::{Result, TpuClient as BackendTpuClient},
+    solana_transaction::Transaction,
+    solana_transaction_error::{TransactionError, TransportResult},
     solana_udp_client::{UdpConfig, UdpConnectionManager, UdpPool},
     std::sync::Arc,
 };

client/src/transaction_executor.rs

@@ -1,12 +1,12 @@
 #![allow(clippy::arithmetic_side_effects)]
 use {
     log::*,
+    solana_commitment_config::CommitmentConfig,
     solana_measure::measure::Measure,
     solana_rpc_client::rpc_client::RpcClient,
-    solana_sdk::{
-        commitment_config::CommitmentConfig, signature::Signature, timing::timestamp,
-        transaction::Transaction,
-    },
+    solana_signature::Signature,
+    solana_time_utils::timestamp,
+    solana_transaction::Transaction,
     std::{
         net::SocketAddr,
         sync::{