diff --git a/Cargo.lock b/Cargo.lock index 694d238ba4966a..e17601eb3bdf0f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6430,7 +6430,9 @@ dependencies = [ "solana-measure", "solana-metrics", "solana-net-utils", - "solana-sdk", + "solana-signer", + "solana-time-utils", + "solana-transaction-error", "thiserror", "tokio", ] diff --git a/connection-cache/Cargo.toml b/connection-cache/Cargo.toml index 28577bac0c066e..b42d0f2b23af1f 100644 --- a/connection-cache/Cargo.toml +++ b/connection-cache/Cargo.toml @@ -21,7 +21,9 @@ rand = { workspace = true } rayon = { workspace = true } solana-measure = { workspace = true } solana-metrics = { workspace = true } -solana-sdk = { workspace = true } +solana-signer = { workspace = true, features = ["keypair"] } +solana-time-utils = { workspace = true } +solana-transaction-error = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true, features = ["full"] } diff --git a/connection-cache/src/client_connection.rs b/connection-cache/src/client_connection.rs index 6579157b79df9c..1469910633e703 100644 --- a/connection-cache/src/client_connection.rs +++ b/connection-cache/src/client_connection.rs @@ -1,6 +1,6 @@ use { solana_metrics::MovingStat, - solana_sdk::transport::Result as TransportResult, + solana_transaction_error::TransportResult, std::{net::SocketAddr, sync::atomic::AtomicU64}, }; diff --git a/connection-cache/src/connection_cache.rs b/connection-cache/src/connection_cache.rs index 5e44b98d4c911d..330b4d84d3d34a 100644 --- a/connection-cache/src/connection_cache.rs +++ b/connection-cache/src/connection_cache.rs @@ -9,7 +9,8 @@ use { log::*, rand::{thread_rng, Rng}, solana_measure::measure::Measure, - solana_sdk::{signature::Keypair, timing::AtomicInterval}, + solana_signer::keypair::Keypair, + solana_time_utils::AtomicInterval, std::{ net::SocketAddr, sync::{atomic::Ordering, Arc, RwLock}, @@ -513,7 +514,7 @@ mod tests { async_trait::async_trait, rand::{Rng, SeedableRng}, rand_chacha::ChaChaRng, - solana_sdk::transport::Result as TransportResult, + solana_transaction_error::TransportResult, std::{ net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket}, sync::Arc, diff --git a/connection-cache/src/nonblocking/client_connection.rs b/connection-cache/src/nonblocking/client_connection.rs index ef79674057088f..8213a38d51ea84 100644 --- a/connection-cache/src/nonblocking/client_connection.rs +++ b/connection-cache/src/nonblocking/client_connection.rs @@ -1,9 +1,6 @@ //! Trait defining async send functions, to be used for UDP or QUIC sending -use { - async_trait::async_trait, solana_sdk::transport::Result as TransportResult, - std::net::SocketAddr, -}; +use {async_trait::async_trait, solana_transaction_error::TransportResult, std::net::SocketAddr}; #[async_trait] pub trait ClientConnection { diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index abc97f019a7188..60c92f32c14aa3 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -5142,7 +5142,9 @@ dependencies = [ "rayon", "solana-measure", "solana-metrics", - "solana-sdk", + "solana-signer", + "solana-time-utils", + "solana-transaction-error", "thiserror", "tokio", ]