remove solana-sdk from solana-zk-sdk

anza-xyz · Nov 1, 2024 · 84fe667 · 84fe667
1 parent a820526
commit 84fe667
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 20 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/zk-sdk/Cargo.toml b/zk-sdk/Cargo.toml
@@ -35,10 +35,16 @@ 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"] }
 
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+solana-pubkey = { workspace = true, features = ["bytemuck"] }
+
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 js-sys = { workspace = true }
 wasm-bindgen = { workspace = true }

diff --git a/zk-sdk/src/encryption/auth_encryption.rs b/zk-sdk/src/encryption/auth_encryption.rs
@@ -25,13 +25,10 @@ use {
     sha3::Digest,
     sha3::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::{
         error,
         io::{Read, Write},
@@ -282,7 +279,8 @@ impl fmt::Display for AeCiphertext {
 mod tests {
     use {
         super::*,
-        solana_sdk::{pubkey::Pubkey, signature::Keypair, signer::null_signer::NullSigner},
+        solana_pubkey::Pubkey,
+        solana_signer::{keypair::Keypair, null_signer::NullSigner},
     };
 
     #[test]

diff --git a/zk-sdk/src/encryption/elgamal.rs b/zk-sdk/src/encryption/elgamal.rs
@@ -25,13 +25,10 @@ use {
     crate::encryption::discrete_log::DiscreteLog,
     sha3::Digest,
     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::{
         error,
         io::{Read, Write},
@@ -838,7 +835,8 @@ mod tests {
         super::*,
         crate::encryption::pedersen::Pedersen,
         bip39::{Language, Mnemonic, MnemonicType, Seed},
-        solana_sdk::{pubkey::Pubkey, signature::Keypair, signer::null_signer::NullSigner},
+        solana_pubkey::Pubkey,
+        solana_signer::{keypair::Keypair, null_signer::NullSigner},
         std::fs::{self, File},
     };
 

diff --git a/zk-sdk/src/sigma_proofs/pubkey_validity.rs b/zk-sdk/src/sigma_proofs/pubkey_validity.rs
@@ -143,7 +143,8 @@ mod test {
         crate::{
             encryption::pod::elgamal::PodElGamalPubkey, sigma_proofs::pod::PodPubkeyValidityProof,
         },
-        solana_sdk::{pubkey::Pubkey, signature::Keypair},
+        solana_pubkey::Pubkey,
+        solana_signer::keypair::Keypair,
         std::str::FromStr,
     };