diff --git a/Cargo.lock b/Cargo.lock index 0d391046a3330f..aa80c17d032679 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7890,14 +7890,19 @@ dependencies = [ "quinn-proto", "rustls 0.23.16", "solana-connection-cache", + "solana-keypair", "solana-logger", "solana-measure", "solana-metrics", "solana-net-utils", "solana-perf", + "solana-pubkey", + "solana-quic-definitions", "solana-rpc-client-api", "solana-sdk", + "solana-signer", "solana-streamer", + "solana-transaction-error", "thiserror", "tokio", ] diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index bace687a7029af..5c60855dab2a84 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -6222,12 +6222,16 @@ dependencies = [ "quinn-proto", "rustls 0.23.16", "solana-connection-cache", + "solana-keypair", "solana-measure", "solana-metrics", "solana-net-utils", + "solana-pubkey", + "solana-quic-definitions", "solana-rpc-client-api", - "solana-sdk", + "solana-signer", "solana-streamer", + "solana-transaction-error", "thiserror", "tokio", ] diff --git a/quic-client/Cargo.toml b/quic-client/Cargo.toml index 428b03cb0a6892..b34c96476acd23 100644 --- a/quic-client/Cargo.toml +++ b/quic-client/Cargo.toml @@ -20,11 +20,15 @@ quinn = { workspace = true } quinn-proto = { workspace = true } rustls = { workspace = true } solana-connection-cache = { workspace = true } +solana-keypair = { workspace = true } solana-measure = { workspace = true } solana-metrics = { workspace = true } solana-net-utils = { workspace = true } solana-rpc-client-api = { workspace = true } -solana-sdk = { workspace = true } +solana-pubkey = { workspace = true, default-features = false } +solana-signer = { workspace = true } +solana-quic-definitions = { workspace = true } +solana-transaction-error = { workspace = true } solana-streamer = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true, features = ["full"] } @@ -33,3 +37,4 @@ tokio = { workspace = true, features = ["full"] } crossbeam-channel = { workspace = true } solana-logger = { workspace = true } solana-perf = { workspace = true } +solana-sdk = { workspace = true } diff --git a/quic-client/src/lib.rs b/quic-client/src/lib.rs index e9741777ccb6ac..1d6c7b02d1dfb1 100644 --- a/quic-client/src/lib.rs +++ b/quic-client/src/lib.rs @@ -22,10 +22,9 @@ use { }, connection_cache_stats::ConnectionCacheStats, }, - solana_sdk::{ - pubkey::Pubkey, - signature::{Keypair, Signer}, - }, + solana_keypair::Keypair, + solana_pubkey::Pubkey, + solana_signer::Signer, solana_streamer::{streamer::StakedNodes, tls_certificates::new_dummy_x509_certificate}, std::{ net::{IpAddr, SocketAddr}, diff --git a/quic-client/src/nonblocking/quic_client.rs b/quic-client/src/nonblocking/quic_client.rs index 0d6bede4149f69..1fae67c6e69ce0 100644 --- a/quic-client/src/nonblocking/quic_client.rs +++ b/quic-client/src/nonblocking/quic_client.rs @@ -15,17 +15,17 @@ use { client_connection::ClientStats, connection_cache_stats::ConnectionCacheStats, nonblocking::client_connection::ClientConnection, }, + solana_keypair::Keypair, solana_measure::measure::Measure, solana_net_utils::VALIDATOR_PORT_RANGE, - solana_rpc_client_api::client_error::ErrorKind as ClientErrorKind, - solana_sdk::{ - quic::{QUIC_CONNECTION_HANDSHAKE_TIMEOUT, QUIC_KEEP_ALIVE, QUIC_MAX_TIMEOUT}, - signature::Keypair, - transport::Result as TransportResult, + solana_quic_definitions::{ + QUIC_CONNECTION_HANDSHAKE_TIMEOUT, QUIC_KEEP_ALIVE, QUIC_MAX_TIMEOUT, }, + solana_rpc_client_api::client_error::ErrorKind as ClientErrorKind, solana_streamer::{ nonblocking::quic::ALPN_TPU_PROTOCOL_ID, tls_certificates::new_dummy_x509_certificate, }, + solana_transaction_error::TransportResult, std::{ net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket}, sync::{atomic::Ordering, Arc}, diff --git a/quic-client/src/quic_client.rs b/quic-client/src/quic_client.rs index 8c8e8e5338993f..8da4ddce7a5d06 100644 --- a/quic-client/src/quic_client.rs +++ b/quic-client/src/quic_client.rs @@ -12,7 +12,7 @@ use { connection_cache_stats::ConnectionCacheStats, nonblocking::client_connection::ClientConnection as NonblockingClientConnection, }, - solana_sdk::transport::{Result as TransportResult, TransportError}, + solana_transaction_error::{TransportError, TransportResult}, std::{ net::SocketAddr, sync::{atomic::Ordering, Arc, Condvar, Mutex, MutexGuard},