drift-labs · jordy25519 · Mar 5, 2025 · Mar 5, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,7 +37,8 @@ regex = "1.10"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 solana-account-decoder = "2"
-solana-client = "2"
+solana-rpc-client = "2"
+solana-rpc-client-api = "2"
 solana-sdk = "2"
 solana-transaction-status = "2"
 thiserror = "1"

diff --git a/crates/src/blockhash_subscriber.rs b/crates/src/blockhash_subscriber.rs
@@ -5,7 +5,7 @@ use std::{
 };
 
 use log::warn;
-use solana_client::nonblocking::rpc_client::RpcClient;
+use solana_rpc_client::nonblocking::rpc_client::RpcClient;
 use solana_sdk::hash::Hash;
 use tokio::sync::oneshot;
 
@@ -105,7 +105,8 @@ impl BlockhashSubscriber {
 #[cfg(test)]
 mod tests {
     use serde_json::json;
-    use solana_client::{rpc_client::Mocks, rpc_request::RpcRequest};
+    use solana_rpc_client::rpc_client::Mocks;
+    use solana_rpc_client_api::request::RpcRequest;
 
     use super::*;
 

diff --git a/crates/src/event_subscriber.rs b/crates/src/event_subscriber.rs
@@ -13,10 +13,11 @@ pub use drift_pubsub_client::PubsubClient;
 use futures_util::{future::BoxFuture, stream::FuturesOrdered, FutureExt, Stream, StreamExt};
 use log::{debug, info, warn};
 use regex::Regex;
-pub use solana_client::nonblocking::rpc_client::RpcClient;
-use solana_client::{
-    rpc_client::GetConfirmedSignaturesForAddress2Config, rpc_config::RpcTransactionLogsConfig,
-    rpc_response::RpcLogsResponse,
+pub use solana_rpc_client::nonblocking::rpc_client::RpcClient;
+use solana_rpc_client::rpc_client::GetConfirmedSignaturesForAddress2Config;
+use solana_rpc_client_api::{
+    config::{RpcTransactionConfig, RpcTransactionLogsConfig, RpcTransactionLogsFilter},
+    response::RpcLogsResponse,
 };
 pub use solana_sdk::commitment_config::CommitmentConfig;
 use solana_sdk::{pubkey::Pubkey, signature::Signature, transaction::VersionedTransaction};
@@ -52,7 +53,7 @@ impl EventRpcProvider for RpcClient {
             let result = self
                 .get_transaction_with_config(
                     &signature,
-                    solana_client::rpc_config::RpcTransactionConfig {
+                    RpcTransactionConfig {
                         encoding: Some(UiTransactionEncoding::Base64),
                         max_supported_transaction_version: Some(0),
                         ..Default::default()
@@ -144,9 +145,7 @@ impl LogEventStream {
         let subscribe_result = self
             .provider
             .logs_subscribe(
-                solana_client::rpc_config::RpcTransactionLogsFilter::Mentions(vec![self
-                    .sub_account
-                    .to_string()]),
+                RpcTransactionLogsFilter::Mentions(vec![self.sub_account.to_string()]),
                 RpcTransactionLogsConfig {
                     commitment: Some(self.commitment),
                 },

diff --git a/crates/src/jit_client.rs b/crates/src/jit_client.rs
@@ -7,7 +7,7 @@ use anchor_lang::{
     prelude::borsh::{self, BorshDeserialize, BorshSerialize},
     AnchorDeserialize, AnchorSerialize, InstructionData,
 };
-use solana_client::rpc_config::RpcSendTransactionConfig;
+use solana_rpc_client_api::config::RpcSendTransactionConfig;
 use solana_sdk::{
     compute_budget::ComputeBudgetInstruction,
     instruction::{AccountMeta, Instruction},

diff --git a/crates/src/lib.rs b/crates/src/lib.rs
@@ -8,8 +8,8 @@ use drift_pubsub_client::PubsubClient;
 use fastlane_order_subscriber::{FastlaneOrderStream, SignedOrderInfo};
 use futures_util::TryFutureExt;
 use log::debug;
-pub use solana_client::nonblocking::rpc_client::RpcClient;
-use solana_client::rpc_response::Response;
+pub use solana_rpc_client::nonblocking::rpc_client::RpcClient;
+use solana_rpc_client_api::response::Response;
 use solana_sdk::{
     account::Account,
     clock::Slot,
@@ -1956,10 +1956,10 @@ mod tests {
 
     use serde_json::json;
     use solana_account_decoder::{UiAccount, UiAccountData, UiAccountEncoding};
-    use solana_client::{
-        rpc_client::Mocks,
-        rpc_request::RpcRequest,
-        rpc_response::{Response, RpcResponseContext},
+    use solana_rpc_client::rpc_client::Mocks;
+    use solana_rpc_client_api::{
+        request::RpcRequest,
+        response::{Response, RpcResponseContext},
     };
     use types::accounts::PerpMarket;
 

diff --git a/crates/src/marketmap.rs b/crates/src/marketmap.rs
@@ -12,11 +12,11 @@ use drift_pubsub_client::PubsubClient;
 use futures_util::{stream::FuturesUnordered, StreamExt};
 use serde_json::json;
 use solana_account_decoder::UiAccountEncoding;
-use solana_client::{
-    nonblocking::rpc_client::RpcClient,
-    rpc_config::{RpcAccountInfoConfig, RpcProgramAccountsConfig},
-    rpc_request::RpcRequest,
-    rpc_response::{OptionalContext, RpcKeyedAccount},
+use solana_rpc_client::nonblocking::rpc_client::RpcClient;
+use solana_rpc_client_api::{
+    config::{RpcAccountInfoConfig, RpcProgramAccountsConfig},
+    request::RpcRequest,
+    response::{OptionalContext, RpcKeyedAccount},
 };
 use solana_sdk::{clock::Slot, commitment_config::CommitmentConfig, pubkey::Pubkey};
 
@@ -354,7 +354,7 @@ mod tests {
     use std::sync::Arc;
 
     use drift_pubsub_client::PubsubClient;
-    use solana_client::nonblocking::rpc_client::RpcClient;
+    use solana_rpc_client::nonblocking::rpc_client::RpcClient;
     use solana_sdk::commitment_config::CommitmentConfig;
 
     use super::{get_market_accounts_with_fallback, MarketMap};

diff --git a/crates/src/memcmp.rs b/crates/src/memcmp.rs
@@ -1,5 +1,5 @@
 use anchor_lang::Discriminator;
-use solana_client::rpc_filter::{Memcmp, RpcFilterType};
+use solana_rpc_client_api::filter::{Memcmp, RpcFilterType};
 
 use crate::types::{
     accounts::{PerpMarket, SpotMarket, User},

diff --git a/crates/src/oraclemap.rs b/crates/src/oraclemap.rs
@@ -8,7 +8,7 @@ use dashmap::{DashMap, ReadOnlyView};
 use drift_pubsub_client::PubsubClient;
 use futures_util::{stream::FuturesUnordered, StreamExt};
 use log::warn;
-use solana_client::nonblocking::rpc_client::RpcClient;
+use solana_rpc_client::nonblocking::rpc_client::RpcClient;
 use solana_sdk::{
     account::Account, clock::Slot, commitment_config::CommitmentConfig, pubkey::Pubkey,
 };

diff --git a/crates/src/polled_account_subscriber.rs b/crates/src/polled_account_subscriber.rs
@@ -4,7 +4,7 @@ use std::{
 };
 
 use log::error;
-use solana_client::nonblocking::rpc_client::RpcClient;
+use solana_rpc_client::nonblocking::rpc_client::RpcClient;
 use solana_sdk::{account::Account, pubkey::Pubkey};
 use tokio::sync::oneshot;
 
@@ -120,7 +120,8 @@ mod tests {
     use anchor_lang::AccountSerialize;
     use serde_json::json;
     use solana_account_decoder::{UiAccount, UiAccountEncoding};
-    use solana_client::{rpc_client::Mocks, rpc_request::RpcRequest};
+    use solana_rpc_client::rpc_client::Mocks;
+    use solana_rpc_client_api::request::RpcRequest;
 
     use super::*;
     use crate::{accounts::User, SpotPosition};

diff --git a/crates/src/priority_fee_subscriber.rs b/crates/src/priority_fee_subscriber.rs
@@ -4,7 +4,7 @@ use std::{
 };
 
 use log::warn;
-use solana_client::nonblocking::rpc_client::RpcClient;
+use solana_rpc_client::nonblocking::rpc_client::RpcClient;
 use solana_sdk::{clock::Slot, pubkey::Pubkey};
 use tokio::sync::oneshot;
 
@@ -157,9 +157,8 @@ impl PriorityFeeSubscriber {
 #[cfg(test)]
 mod tests {
     use serde_json::json;
-    use solana_client::{
-        rpc_client::Mocks, rpc_request::RpcRequest, rpc_response::RpcPrioritizationFee,
-    };
+    use solana_rpc_client::rpc_client::Mocks;
+    use solana_rpc_client_api::{request::RpcRequest, response::RpcPrioritizationFee};
 
     use super::*;
 

diff --git a/crates/src/types.rs b/crates/src/types.rs
@@ -4,7 +4,7 @@ use std::{
     str::FromStr,
 };
 
-pub use solana_client::rpc_config::RpcSendTransactionConfig;
+pub use solana_rpc_client_api::config::RpcSendTransactionConfig;
 pub use solana_sdk::{
     commitment_config::CommitmentConfig, message::VersionedMessage,
     transaction::VersionedTransaction,
@@ -270,7 +270,7 @@ impl NewOrder {
 #[derive(Debug, Error)]
 pub enum SdkError {
     #[error("{0}")]
-    Rpc(#[from] solana_client::client_error::ClientError),
+    Rpc(#[from] solana_rpc_client_api::client_error::Error),
     #[error("{0}")]
     Ws(#[from] drift_pubsub_client::PubsubClientError),
     #[error("{0}")]
@@ -537,10 +537,10 @@ impl FromStr for MarketType {
 mod tests {
     use std::str::FromStr;
 
-    use solana_client::{
-        client_error::{ClientError, ClientErrorKind},
-        rpc_request::{RpcError, RpcRequest},
-        rpc_response::RpcSimulateTransactionResult,
+    use solana_rpc_client_api::{
+        client_error::{Error as ClientError, ErrorKind as ClientErrorKind},
+        request::{RpcError, RpcRequest, RpcResponseErrorData},
+        response::RpcSimulateTransactionResult,
     };
     use solana_sdk::{
         instruction::InstructionError, pubkey::Pubkey, transaction::TransactionError,
@@ -566,7 +566,7 @@ mod tests {
                     RpcError::RpcResponseError {
                         code: -32002,
                         message: "Transaction simulation failed: Error processing Instruction 0: custom program error: 0x17b7".to_string(),
-                        data: solana_client::rpc_request::RpcResponseErrorData::SendTransactionPreflightFailure(
+                        data: RpcResponseErrorData::SendTransactionPreflightFailure(
                             RpcSimulateTransactionResult {
                                 err: Some(TransactionError::InstructionError(0, InstructionError::Custom(6071))),
                                 logs: None,

diff --git a/crates/src/usermap.rs b/crates/src/usermap.rs
@@ -10,12 +10,12 @@ use anchor_lang::{AccountDeserialize, AnchorDeserialize};
 use dashmap::DashMap;
 use serde_json::json;
 use solana_account_decoder::UiAccountEncoding;
-use solana_client::{
-    nonblocking::rpc_client::RpcClient,
-    rpc_config::{RpcAccountInfoConfig, RpcProgramAccountsConfig},
-    rpc_filter::RpcFilterType,
-    rpc_request::RpcRequest,
-    rpc_response::{OptionalContext, RpcKeyedAccount},
+use solana_rpc_client::nonblocking::rpc_client::RpcClient;
+use solana_rpc_client_api::{
+    config::{RpcAccountInfoConfig, RpcProgramAccountsConfig},
+    filter::RpcFilterType,
+    request::RpcRequest,
+    response::{OptionalContext, RpcKeyedAccount},
 };
 use solana_sdk::{commitment_config::CommitmentConfig, pubkey::Pubkey};
 

diff --git a/crates/src/websocket_account_subscriber.rs b/crates/src/websocket_account_subscriber.rs
@@ -4,7 +4,8 @@ use drift_pubsub_client::PubsubClient;
 use futures_util::StreamExt;
 use log::warn;
 use solana_account_decoder::UiAccountEncoding;
-use solana_client::{nonblocking::rpc_client::RpcClient, rpc_config::RpcAccountInfoConfig};
+use solana_rpc_client::nonblocking::rpc_client::RpcClient;
+use solana_rpc_client_api::config::RpcAccountInfoConfig;
 use solana_sdk::{commitment_config::CommitmentConfig, pubkey::Pubkey};
 use tokio::sync::oneshot;
 

diff --git a/crates/src/websocket_program_account_subscriber.rs b/crates/src/websocket_program_account_subscriber.rs
@@ -5,9 +5,9 @@ use drift_pubsub_client::PubsubClient;
 use futures_util::StreamExt;
 use log::warn;
 use solana_account_decoder::UiAccountEncoding;
-use solana_client::{
-    rpc_config::{RpcAccountInfoConfig, RpcProgramAccountsConfig},
-    rpc_filter::RpcFilterType,
+use solana_rpc_client_api::{
+    config::{RpcAccountInfoConfig, RpcProgramAccountsConfig},
+    filter::RpcFilterType,
 };
 use solana_sdk::commitment_config::CommitmentConfig;
 use tokio::sync::oneshot;