diff --git a/Cargo.lock b/Cargo.lock index 9c98a8e445104e..56919530c26252 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7981,9 +7981,12 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "solana-account-decoder", + "solana-account-decoder-client-types", + "solana-clock", + "solana-commitment-config", + "solana-pubkey", "solana-rpc-client-api", - "solana-sdk", + "solana-signature", "thiserror 2.0.3", "tokio", "tokio-stream", diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index 0f2f2fa0e4ce16..ab98c6647a3e41 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -6293,9 +6293,11 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "solana-account-decoder", + "solana-account-decoder-client-types", + "solana-clock", + "solana-pubkey", "solana-rpc-client-api", - "solana-sdk", + "solana-signature", "thiserror 2.0.3", "tokio", "tokio-stream", diff --git a/pubsub-client/Cargo.toml b/pubsub-client/Cargo.toml index e16d36695752d4..307f1861b264d2 100644 --- a/pubsub-client/Cargo.toml +++ b/pubsub-client/Cargo.toml @@ -18,9 +18,11 @@ semver = { workspace = true } serde = { workspace = true } serde_derive = { workspace = true } serde_json = { workspace = true } -solana-account-decoder = { workspace = true } +solana-account-decoder-client-types = { workspace = true } +solana-clock = { workspace = true } +solana-pubkey = { workspace = true } solana-rpc-client-api = { workspace = true } -solana-sdk = { workspace = true } +solana-signature = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true, features = ["full"] } tokio-stream = { workspace = true } @@ -30,6 +32,8 @@ url = { workspace = true } [dev-dependencies] anyhow = { workspace = true } +solana-commitment-config = { workspace = true } +solana-pubkey = { workspace = true, features = ["rand"] } [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/pubsub-client/src/nonblocking/pubsub_client.rs b/pubsub-client/src/nonblocking/pubsub_client.rs index 44663b3372cb2c..476cf935f93b3c 100644 --- a/pubsub-client/src/nonblocking/pubsub_client.rs +++ b/pubsub-client/src/nonblocking/pubsub_client.rs @@ -175,7 +175,9 @@ use { log::*, serde::de::DeserializeOwned, serde_json::{json, Map, Value}, - solana_account_decoder::UiAccount, + solana_account_decoder_client_types::UiAccount, + solana_clock::Slot, + solana_pubkey::Pubkey, solana_rpc_client_api::{ config::{ RpcAccountInfoConfig, RpcBlockSubscribeConfig, RpcBlockSubscribeFilter, @@ -188,7 +190,7 @@ use { RpcSignatureResult, RpcVote, SlotInfo, SlotUpdate, }, }, - solana_sdk::{clock::Slot, pubkey::Pubkey, signature::Signature}, + solana_signature::Signature, std::collections::BTreeMap, thiserror::Error, tokio::{ diff --git a/pubsub-client/src/pubsub_client.rs b/pubsub-client/src/pubsub_client.rs index 5247bdb8b9e263..77e1b12f6bf84b 100644 --- a/pubsub-client/src/pubsub_client.rs +++ b/pubsub-client/src/pubsub_client.rs @@ -46,10 +46,10 @@ //! //! ``` //! use anyhow::Result; -//! use solana_sdk::commitment_config::CommitmentConfig; +//! use solana_commitment_config::CommitmentConfig; +//! use solana_pubkey::Pubkey; //! use solana_pubsub_client::pubsub_client::PubsubClient; //! use solana_rpc_client_api::config::RpcAccountInfoConfig; -//! use solana_sdk::pubkey::Pubkey; //! use std::thread; //! //! fn get_account_updates(account_pubkey: Pubkey) -> Result<()> { @@ -82,7 +82,7 @@ //! Ok(()) //! } //! # -//! # get_account_updates(solana_sdk::pubkey::new_rand()); +//! # get_account_updates(solana_pubkey::new_rand()); //! # Ok::<(), anyhow::Error>(()) //! ``` @@ -96,7 +96,9 @@ use { value::Value::{Number, Object}, Map, Value, }, - solana_account_decoder::UiAccount, + solana_account_decoder_client_types::UiAccount, + solana_clock::Slot, + solana_pubkey::Pubkey, solana_rpc_client_api::{ config::{ RpcAccountInfoConfig, RpcBlockSubscribeConfig, RpcBlockSubscribeFilter, @@ -108,7 +110,7 @@ use { RpcSignatureResult, RpcVote, SlotInfo, SlotUpdate, }, }, - solana_sdk::{clock::Slot, pubkey::Pubkey, signature::Signature}, + solana_signature::Signature, std::{ marker::PhantomData, net::TcpStream, diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock index 0e1e93903493a5..0f1ad06541fb77 100644 --- a/svm/examples/Cargo.lock +++ b/svm/examples/Cargo.lock @@ -6114,9 +6114,11 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "solana-account-decoder", + "solana-account-decoder-client-types", + "solana-clock", + "solana-pubkey", "solana-rpc-client-api", - "solana-sdk", + "solana-signature", "thiserror 2.0.3", "tokio", "tokio-stream",