remove solana-sdk from solana-zk-token-sdk (solana-labs#3422)

* remove solana-sdk from solana-zk-token-sdk

* post-rebase fix

Author: kevinheavey

Cargo.lock

@@ -17,11 +17,12 @@ num-derive = { workspace = true }
 num-traits = { workspace = true }
 solana-curve25519 = { workspace = true }
 solana-instruction = { workspace = true, features = ["std"] }
-solana-pubkey = { workspace = true }
+solana-pubkey = { workspace = true, features = ["bytemuck"] }
 solana-sdk-ids = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
+solana-keypair = { workspace = true }
 tiny-bip39 = { workspace = true }
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]
@@ -38,7 +39,10 @@ serde_derive = { workspace = true }
 serde_json = { workspace = true }
 sha3 = { workspace = true }
 solana-derivation-path = { workspace = true }
-solana-sdk = { workspace = true }
+solana-seed-derivable = { workspace = true }
+solana-seed-phrase = { workspace = true }
+solana-signature = { workspace = true }
+solana-signer = { workspace = true }
 subtle = { workspace = true }
 zeroize = { workspace = true, features = ["zeroize_derive"] }
 

programs/sbf/Cargo.lock

@@ -7,13 +7,10 @@ use {
     base64::{prelude::BASE64_STANDARD, Engine},
     sha3::{Digest, Sha3_512},
     solana_derivation_path::DerivationPath,
-    solana_sdk::{
-        signature::Signature,
-        signer::{
-            keypair::generate_seed_from_seed_phrase_and_passphrase, EncodableKey, SeedDerivable,
-            Signer, SignerError,
-        },
-    },
+    solana_seed_derivable::SeedDerivable,
+    solana_seed_phrase::generate_seed_from_seed_phrase_and_passphrase,
+    solana_signature::Signature,
+    solana_signer::{EncodableKey, Signer, SignerError},
     std::{
         convert::TryInto,
         error, fmt,
@@ -267,8 +264,8 @@ impl fmt::Display for AeCiphertext {
 #[cfg(test)]
 mod tests {
     use {
-        super::*,
-        solana_sdk::{pubkey::Pubkey, signature::Keypair, signer::null_signer::NullSigner},
+        super::*, solana_keypair::Keypair, solana_pubkey::Pubkey,
+        solana_signer::null_signer::NullSigner,
     };
 
     #[test]

zk-token-sdk/Cargo.toml

@@ -34,13 +34,10 @@ use {
     },
     serde::{Deserialize, Serialize},
     solana_derivation_path::DerivationPath,
-    solana_sdk::{
-        signature::Signature,
-        signer::{
-            keypair::generate_seed_from_seed_phrase_and_passphrase, EncodableKey, EncodableKeypair,
-            SeedDerivable, Signer, SignerError,
-        },
-    },
+    solana_seed_derivable::SeedDerivable,
+    solana_seed_phrase::generate_seed_from_seed_phrase_and_passphrase,
+    solana_signature::Signature,
+    solana_signer::{EncodableKey, EncodableKeypair, Signer, SignerError},
     std::convert::TryInto,
     subtle::{Choice, ConstantTimeEq},
     zeroize::Zeroize,
@@ -870,7 +867,9 @@ mod tests {
         super::*,
         crate::encryption::pedersen::Pedersen,
         bip39::{Language, Mnemonic, MnemonicType, Seed},
-        solana_sdk::{pubkey::Pubkey, signature::Keypair, signer::null_signer::NullSigner},
+        solana_keypair::Keypair,
+        solana_pubkey::Pubkey,
+        solana_signer::null_signer::NullSigner,
         std::fs::{self, File},
     };
 

zk-token-sdk/src/encryption/auth_encryption.rs

@@ -138,10 +138,7 @@ impl PubkeyValidityProof {
 
 #[cfg(test)]
 mod test {
-    use {
-        super::*,
-        solana_sdk::{pubkey::Pubkey, signature::Keypair},
-    };
+    use {super::*, solana_keypair::Keypair, solana_pubkey::Pubkey};
 
     #[test]
     fn test_pubkey_proof_correctness() {