From 77ae3b1ab5e680696dc3e7a089a4594416640c36 Mon Sep 17 00:00:00 2001 From: acheron Date: Fri, 30 Jan 2026 18:10:11 +0100 Subject: [PATCH 01/10] client: Export `solana_signer::Signer` and `solana_signer::SignerError` --- client/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/lib.rs b/client/src/lib.rs index ebcf72e4ff..db18222420 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -90,7 +90,6 @@ use solana_rpc_client_api::{ response::{Response as RpcResponse, RpcLogsResponse}, }; use solana_signature::Signature; -use solana_signer::{Signer, SignerError}; use solana_transaction::Transaction; use std::iter::Map; use std::marker::PhantomData; @@ -113,6 +112,7 @@ pub use cluster::Cluster; #[cfg(feature = "async")] pub use nonblocking::ThreadSafeSigner; pub use solana_account_decoder; +pub use solana_signer::{Signer, SignerError}; mod cluster; From ab028139a367856acec8d297c5ccaae903d6efe4 Mon Sep 17 00:00:00 2001 From: acheron Date: Fri, 30 Jan 2026 18:14:30 +0100 Subject: [PATCH 02/10] client: Export `solana_pubsub_client::nonblocking::pubsub_client::PubsubClient` --- client/src/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/lib.rs b/client/src/lib.rs index db18222420..97a4a7f79b 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -78,7 +78,7 @@ use solana_account_decoder::{UiAccount, UiAccountEncoding}; use solana_commitment_config::CommitmentConfig; use solana_instruction::{AccountMeta, Instruction}; use solana_program::hash::Hash; -use solana_pubsub_client::nonblocking::pubsub_client::{PubsubClient, PubsubClientError}; +use solana_pubsub_client::nonblocking::pubsub_client::PubsubClient; use solana_rpc_client::nonblocking::rpc_client::RpcClient as AsyncRpcClient; use solana_rpc_client_api::{ client_error::Error as SolanaClientError, @@ -112,6 +112,7 @@ pub use cluster::Cluster; #[cfg(feature = "async")] pub use nonblocking::ThreadSafeSigner; pub use solana_account_decoder; +pub use solana_pubsub_client::nonblocking::pubsub_client::PubsubClientError; pub use solana_signer::{Signer, SignerError}; mod cluster; From 297f9b6335f42321abf3171ebc45448b4c0c4301 Mon Sep 17 00:00:00 2001 From: acheron Date: Fri, 30 Jan 2026 18:16:16 +0100 Subject: [PATCH 03/10] client: Export `solana_program::hash::Hash` --- client/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/lib.rs b/client/src/lib.rs index 97a4a7f79b..0cccfe88fc 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -77,7 +77,6 @@ use regex::Regex; use solana_account_decoder::{UiAccount, UiAccountEncoding}; use solana_commitment_config::CommitmentConfig; use solana_instruction::{AccountMeta, Instruction}; -use solana_program::hash::Hash; use solana_pubsub_client::nonblocking::pubsub_client::PubsubClient; use solana_rpc_client::nonblocking::rpc_client::RpcClient as AsyncRpcClient; use solana_rpc_client_api::{ @@ -112,6 +111,7 @@ pub use cluster::Cluster; #[cfg(feature = "async")] pub use nonblocking::ThreadSafeSigner; pub use solana_account_decoder; +pub use solana_program::hash::Hash; pub use solana_pubsub_client::nonblocking::pubsub_client::PubsubClientError; pub use solana_signer::{Signer, SignerError}; From 273aeb4252c02a71f00d6d0a64678d73a55b05c6 Mon Sep 17 00:00:00 2001 From: acheron Date: Fri, 30 Jan 2026 18:18:30 +0100 Subject: [PATCH 04/10] client: Export `solana_instruction::Instruction` --- client/src/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/lib.rs b/client/src/lib.rs index 0cccfe88fc..cb3d8e0211 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -76,7 +76,7 @@ use futures::{Future, StreamExt}; use regex::Regex; use solana_account_decoder::{UiAccount, UiAccountEncoding}; use solana_commitment_config::CommitmentConfig; -use solana_instruction::{AccountMeta, Instruction}; +use solana_instruction::AccountMeta; use solana_pubsub_client::nonblocking::pubsub_client::PubsubClient; use solana_rpc_client::nonblocking::rpc_client::RpcClient as AsyncRpcClient; use solana_rpc_client_api::{ @@ -111,6 +111,7 @@ pub use cluster::Cluster; #[cfg(feature = "async")] pub use nonblocking::ThreadSafeSigner; pub use solana_account_decoder; +pub use solana_instruction::Instruction; pub use solana_program::hash::Hash; pub use solana_pubsub_client::nonblocking::pubsub_client::PubsubClientError; pub use solana_signer::{Signer, SignerError}; From 2a38b9f8e24d81a6ca0b1b0d7db3d81799abf2e1 Mon Sep 17 00:00:00 2001 From: acheron Date: Fri, 30 Jan 2026 18:20:12 +0100 Subject: [PATCH 05/10] client: Export `solana_commitment_config::CommitmentConfig` --- client/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/lib.rs b/client/src/lib.rs index cb3d8e0211..f52fc8bc58 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -75,7 +75,6 @@ use anchor_lang::{AccountDeserialize, Discriminator, InstructionData, ToAccountM use futures::{Future, StreamExt}; use regex::Regex; use solana_account_decoder::{UiAccount, UiAccountEncoding}; -use solana_commitment_config::CommitmentConfig; use solana_instruction::AccountMeta; use solana_pubsub_client::nonblocking::pubsub_client::PubsubClient; use solana_rpc_client::nonblocking::rpc_client::RpcClient as AsyncRpcClient; @@ -111,6 +110,7 @@ pub use cluster::Cluster; #[cfg(feature = "async")] pub use nonblocking::ThreadSafeSigner; pub use solana_account_decoder; +pub use solana_commitment_config::CommitmentConfig; pub use solana_instruction::Instruction; pub use solana_program::hash::Hash; pub use solana_pubsub_client::nonblocking::pubsub_client::PubsubClientError; From bd9e16747f861c03544fbd9db4dbe97ade082c9b Mon Sep 17 00:00:00 2001 From: acheron Date: Fri, 30 Jan 2026 18:26:57 +0100 Subject: [PATCH 06/10] client: Export `solana_transaction::Transaction` --- client/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/lib.rs b/client/src/lib.rs index f52fc8bc58..cdbf0d2531 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -88,7 +88,6 @@ use solana_rpc_client_api::{ response::{Response as RpcResponse, RpcLogsResponse}, }; use solana_signature::Signature; -use solana_transaction::Transaction; use std::iter::Map; use std::marker::PhantomData; use std::ops::Deref; @@ -115,6 +114,7 @@ pub use solana_instruction::Instruction; pub use solana_program::hash::Hash; pub use solana_pubsub_client::nonblocking::pubsub_client::PubsubClientError; pub use solana_signer::{Signer, SignerError}; +pub use solana_transaction::Transaction; mod cluster; From f3037ccfabc306987692177c445a5920ba161d61 Mon Sep 17 00:00:00 2001 From: acheron Date: Fri, 30 Jan 2026 18:38:02 +0100 Subject: [PATCH 07/10] client: Export `solana_rpc_client_api` types * Export `solana_rpc_client_api::client_error::Error as SolanaClientError` * Export `solana_rpc_client_api::config::RpcSendTransactionConfig` * Export `solana_rpc_client_api::filter::RpcFilterType` --- client/src/lib.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/client/src/lib.rs b/client/src/lib.rs index cdbf0d2531..2d29f481e2 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -79,12 +79,11 @@ use solana_instruction::AccountMeta; use solana_pubsub_client::nonblocking::pubsub_client::PubsubClient; use solana_rpc_client::nonblocking::rpc_client::RpcClient as AsyncRpcClient; use solana_rpc_client_api::{ - client_error::Error as SolanaClientError, config::{ - RpcAccountInfoConfig, RpcProgramAccountsConfig, RpcSendTransactionConfig, - RpcTransactionLogsConfig, RpcTransactionLogsFilter, + RpcAccountInfoConfig, RpcProgramAccountsConfig, RpcTransactionLogsConfig, + RpcTransactionLogsFilter, }, - filter::{Memcmp, RpcFilterType}, + filter::Memcmp, response::{Response as RpcResponse, RpcLogsResponse}, }; use solana_signature::Signature; @@ -113,6 +112,10 @@ pub use solana_commitment_config::CommitmentConfig; pub use solana_instruction::Instruction; pub use solana_program::hash::Hash; pub use solana_pubsub_client::nonblocking::pubsub_client::PubsubClientError; +pub use solana_rpc_client_api::{ + client_error::Error as SolanaClientError, config::RpcSendTransactionConfig, + filter::RpcFilterType, +}; pub use solana_signer::{Signer, SignerError}; pub use solana_transaction::Transaction; From 12be0a47b767658feb6561618c483c3d0638ba40 Mon Sep 17 00:00:00 2001 From: acheron Date: Fri, 30 Jan 2026 18:39:52 +0100 Subject: [PATCH 08/10] client/example: Remove the redundant dependencies --- client/example/Cargo.toml | 2 -- client/example/src/blocking.rs | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/client/example/Cargo.toml b/client/example/Cargo.toml index d4e0436b76..92cba05c22 100644 --- a/client/example/Cargo.toml +++ b/client/example/Cargo.toml @@ -19,8 +19,6 @@ events = { path = "../../tests/events/programs/events", features = ["no-entrypoi anyhow = "1.0.32" clap = { version = "4.2.4", features = ["derive"] } shellexpand = "2.1.0" -solana-commitment-config = "3.0.0" solana-sdk = "3.0.0" -solana-signer = "3.0.0" solana-system-interface = "2.0.0" tokio = { version = "1", features = ["full"] } diff --git a/client/example/src/blocking.rs b/client/example/src/blocking.rs index de77d90d57..ddd9355344 100644 --- a/client/example/src/blocking.rs +++ b/client/example/src/blocking.rs @@ -1,7 +1,6 @@ -use anchor_client::{Client, Cluster}; +use anchor_client::{Client, Cluster, CommitmentConfig}; use anyhow::Result; use clap::Parser; -use solana_commitment_config::CommitmentConfig; use solana_sdk::pubkey::Pubkey; use solana_sdk::signature::read_keypair_file; use solana_sdk::signature::{Keypair, Signer}; From 9605dfd5e8bfafc5e591808c3ba818a008400941 Mon Sep 17 00:00:00 2001 From: acheron Date: Fri, 30 Jan 2026 19:12:48 +0100 Subject: [PATCH 09/10] client/example: Import `anchor_client::CommitmentConfig` --- client/example/src/nonblocking.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/example/src/nonblocking.rs b/client/example/src/nonblocking.rs index 535146e18e..9026afd110 100644 --- a/client/example/src/nonblocking.rs +++ b/client/example/src/nonblocking.rs @@ -1,7 +1,6 @@ -use anchor_client::{Client, Cluster}; +use anchor_client::{Client, Cluster, CommitmentConfig}; use anyhow::Result; use clap::Parser; -use solana_commitment_config::CommitmentConfig; use solana_sdk::pubkey::Pubkey; use solana_sdk::signature::read_keypair_file; use solana_sdk::signature::{Keypair, Signer}; From 72d448e65f7e443d02647fcf868eb11d9a8e98f9 Mon Sep 17 00:00:00 2001 From: acheron Date: Fri, 13 Feb 2026 22:12:05 +0100 Subject: [PATCH 10/10] client: Update the imports of the crate documentation example --- client/src/lib.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/client/src/lib.rs b/client/src/lib.rs index 2d29f481e2..c953eee448 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -9,15 +9,10 @@ //! ```ignore //! use std::rc::Rc; //! -//! use anchor_client::{ -//! solana_sdk::{ -//! signature::{read_keypair_file, Keypair}, -//! signer::Signer, -//! system_program, -//! }, -//! Client, Cluster, -//! }; +//! use anchor_client::{Client, Cluster, Signer}; //! use my_program::{accounts, instruction, MyAccount}; +//! use solana_keypair::{read_keypair_file, Keypair}; +//! use solana_system_interface::program as system_program; //! //! fn main() -> Result<(), Box> { //! // Create client