remove solana-sdk from rpc-client-nonce-utils (#3440)

* remove solana-sdk from rpc-client-nonce-utils

* sort deps

* fix doc tests

* use solana-sdk-ids and remove solana-program from dev deps

* minimise solana-sdk usage in doc examples

* remove solana-sdk from dev deps

* finish removing solana-sdk

rpc-client-nonce-utils/Cargo.toml

@@ -11,17 +11,29 @@ edition = { workspace = true }
 
 [dependencies]
 clap = { version = "2.33.0", optional = true }
+solana-account = { workspace = true }
 solana-clap-utils = { workspace = true, optional = true }
+solana-commitment-config = { workspace = true }
+solana-hash = { workspace = true }
+solana-message = { workspace = true }
+solana-nonce = { workspace = true }
+solana-pubkey = { workspace = true }
 solana-rpc-client = { workspace = true }
-solana-sdk = { workspace = true }
+solana-sdk-ids = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
 anyhow = { workspace = true }
 futures = { workspace = true }
 serde_json = { workspace = true }
 solana-account-decoder = { workspace = true }
+solana-fee-calculator = { workspace = true }
+solana-keypair = { workspace = true }
 solana-rpc-client-api = { workspace = true }
+solana-sha256-hasher = { workspace = true }
+solana-signer = { workspace = true }
+solana-system-interface = { workspace = true }
+solana-transaction = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 
 [features]

rpc-client-nonce-utils/src/blockhash_query.rs

@@ -8,8 +8,8 @@ use {
     },
 };
 use {
+    solana_commitment_config::CommitmentConfig, solana_hash::Hash, solana_pubkey::Pubkey,
     solana_rpc_client::rpc_client::RpcClient,
-    solana_sdk::{commitment_config::CommitmentConfig, hash::Hash, pubkey::Pubkey},
 };
 
 #[derive(Debug, PartialEq, Eq)]
@@ -114,18 +114,15 @@ mod tests {
         super::*,
         crate::blockhash_query,
         serde_json::{self, json},
+        solana_account::Account,
         solana_account_decoder::{encode_ui_account, UiAccountEncoding},
+        solana_fee_calculator::FeeCalculator,
+        solana_nonce::{self as nonce, state::DurableNonce},
         solana_rpc_client_api::{
             request::RpcRequest,
             response::{Response, RpcBlockhash, RpcResponseContext},
         },
-        solana_sdk::{
-            account::Account,
-            fee_calculator::FeeCalculator,
-            hash::hash,
-            nonce::{self, state::DurableNonce},
-            system_program,
-        },
+        solana_sha256_hasher::hash,
         std::collections::HashMap,
     };
 
@@ -354,9 +351,9 @@ mod tests {
         };
         let nonce_account = Account::new_data_with_space(
             42,
-            &nonce::state::Versions::new(nonce::State::Initialized(data)),
-            nonce::State::size(),
-            &system_program::id(),
+            &nonce::versions::Versions::new(nonce::state::State::Initialized(data)),
+            nonce::state::State::size(),
+            &solana_sdk_ids::system_program::id(),
         )
         .unwrap();
         let nonce_pubkey = Pubkey::from([4u8; 32]);

rpc-client-nonce-utils/src/lib.rs

@@ -7,8 +7,8 @@ pub use crate::nonblocking::{
     account_identity_ok, data_from_account, data_from_state, state_from_account, Error,
 };
 use {
+    solana_account::Account, solana_commitment_config::CommitmentConfig, solana_pubkey::Pubkey,
     solana_rpc_client::rpc_client::RpcClient,
-    solana_sdk::{account::Account, commitment_config::CommitmentConfig, pubkey::Pubkey},
 };
 
 /// Get a nonce account from the network.

rpc-client-nonce-utils/src/nonblocking/blockhash_query.rs

@@ -1,7 +1,6 @@
 use {
-    crate::nonblocking,
-    solana_rpc_client::nonblocking::rpc_client::RpcClient,
-    solana_sdk::{commitment_config::CommitmentConfig, hash::Hash, pubkey::Pubkey},
+    crate::nonblocking, solana_commitment_config::CommitmentConfig, solana_hash::Hash,
+    solana_pubkey::Pubkey, solana_rpc_client::nonblocking::rpc_client::RpcClient,
 };
 #[cfg(feature = "clap")]
 use {
@@ -122,18 +121,15 @@ mod tests {
         super::*,
         crate::nonblocking::blockhash_query,
         serde_json::{self, json},
+        solana_account::Account,
         solana_account_decoder::{encode_ui_account, UiAccountEncoding},
+        solana_fee_calculator::FeeCalculator,
+        solana_nonce::{self as nonce, state::DurableNonce},
         solana_rpc_client_api::{
             request::RpcRequest,
             response::{Response, RpcBlockhash, RpcResponseContext},
         },
-        solana_sdk::{
-            account::Account,
-            fee_calculator::FeeCalculator,
-            hash::hash,
-            nonce::{self, state::DurableNonce},
-            system_program,
-        },
+        solana_sha256_hasher::hash,
         std::collections::HashMap,
     };
 
@@ -375,9 +371,9 @@ mod tests {
         };
         let nonce_account = Account::new_data_with_space(
             42,
-            &nonce::state::Versions::new(nonce::State::Initialized(data)),
-            nonce::State::size(),
-            &system_program::id(),
+            &nonce::versions::Versions::new(nonce::state::State::Initialized(data)),
+            nonce::state::State::size(),
+            &solana_sdk_ids::system_program::id(),
         )
         .unwrap();
         let nonce_pubkey = Pubkey::from([4u8; 32]);

rpc-client-nonce-utils/src/nonblocking/mod.rs

@@ -3,19 +3,15 @@
 pub mod blockhash_query;
 
 use {
-    solana_rpc_client::nonblocking::rpc_client::RpcClient,
-    solana_sdk::{
-        account::{Account, ReadableAccount},
-        account_utils::StateMut,
-        commitment_config::CommitmentConfig,
-        hash::Hash,
-        nonce::{
-            state::{Data, Versions},
-            State,
-        },
-        pubkey::Pubkey,
-        system_program,
+    solana_account::{state_traits::StateMut, Account, ReadableAccount},
+    solana_commitment_config::CommitmentConfig,
+    solana_hash::Hash,
+    solana_nonce::{
+        state::{Data, State},
+        versions::Versions,
     },
+    solana_pubkey::Pubkey,
+    solana_rpc_client::nonblocking::rpc_client::RpcClient,
 };
 
 #[derive(Debug, thiserror::Error, PartialEq, Eq)]
@@ -78,7 +74,7 @@ pub async fn get_account_with_commitment(
 /// system program. Returns [`Error::UnexpectedDataSize`] if the account
 /// contains no data.
 pub fn account_identity_ok<T: ReadableAccount>(account: &T) -> Result<(), Error> {
-    if account.owner() != &system_program::id() {
+    if account.owner() != &solana_sdk_ids::system_program::ID {
         Err(Error::InvalidAccountOwner)
     } else if account.data().is_empty() {
         Err(Error::UnexpectedDataSize)
@@ -101,10 +97,8 @@ pub fn account_identity_ok<T: ReadableAccount>(account: &T) -> Result<(), Error>
 /// ```no_run
 /// use solana_rpc_client_nonce_utils::nonblocking;
 /// use solana_rpc_client::nonblocking::rpc_client::RpcClient;
-/// use solana_sdk::{
-///     nonce::State,
-///     pubkey::Pubkey,
-/// };
+/// use solana_nonce::state::State;
+/// use solana_pubkey::Pubkey;
 /// use anyhow::Result;
 ///
 /// futures::executor::block_on(async {
@@ -151,13 +145,12 @@ pub fn state_from_account<T: ReadableAccount + StateMut<Versions>>(
 /// ```no_run
 /// use solana_rpc_client_nonce_utils::nonblocking;
 /// use solana_rpc_client::nonblocking::rpc_client::RpcClient;
-/// use solana_sdk::{
-///     message::Message,
-///     pubkey::Pubkey,
-///     signature::{Keypair, Signer},
-///     system_instruction,
-///     transaction::Transaction,
-/// };
+/// use solana_keypair::Keypair;
+/// use solana_message::Message;
+/// use solana_system_interface::instruction as system_instruction;
+/// use solana_pubkey::Pubkey;
+/// use solana_signer::Signer;
+/// use solana_transaction::Transaction;
 /// use std::path::Path;
 /// use anyhow::Result;
 /// # use anyhow::anyhow;