From a6148bd3e1f7816d7b6a2911465e09aff34f994a Mon Sep 17 00:00:00 2001
From: Kevin Heavey <heaveykevin2@gmail.com>
Date: Mon, 9 Dec 2024 21:14:03 +0400
Subject: [PATCH] remove solana-sdk from zk-keygen (#4002)

---
 Cargo.lock            | 4 +++-
 zk-keygen/Cargo.toml  | 4 +++-
 zk-keygen/src/main.rs | 5 +++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 805927c1579f52..9dd4dcb7689234 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9852,8 +9852,10 @@ dependencies = [
  "clap 3.2.23",
  "dirs-next",
  "solana-clap-v3-utils",
+ "solana-pubkey",
  "solana-remote-wallet",
- "solana-sdk",
+ "solana-seed-derivable",
+ "solana-signer",
  "solana-version",
  "solana-zk-token-sdk",
  "tempfile",
diff --git a/zk-keygen/Cargo.toml b/zk-keygen/Cargo.toml
index cdda986d0c0153..fac3785608e31f 100644
--- a/zk-keygen/Cargo.toml
+++ b/zk-keygen/Cargo.toml
@@ -21,13 +21,15 @@ clap = { version = "3.1.5", features = ["cargo", "derive"] }
 dirs-next = { workspace = true }
 solana-clap-v3-utils = { workspace = true }
 solana-remote-wallet = { workspace = true, features = ["default"] }
-solana-sdk = { workspace = true }
+solana-seed-derivable = { workspace = true }
+solana-signer = { workspace = true }
 solana-version = { workspace = true }
 solana-zk-token-sdk = { workspace = true }
 thiserror = { workspace = true }
 tiny-bip39 = { workspace = true }
 
 [dev-dependencies]
+solana-pubkey = { workspace = true, features = ["rand"] }
 tempfile = { workspace = true }
 
 [[bin]]
diff --git a/zk-keygen/src/main.rs b/zk-keygen/src/main.rs
index 5ae1f72242e992..e63522038b98b8 100644
--- a/zk-keygen/src/main.rs
+++ b/zk-keygen/src/main.rs
@@ -14,7 +14,8 @@ use {
         },
         DisplayError,
     },
-    solana_sdk::signer::{EncodableKey, SeedDerivable},
+    solana_seed_derivable::SeedDerivable,
+    solana_signer::EncodableKey,
     solana_zk_token_sdk::encryption::{auth_encryption::AeKey, elgamal::ElGamalKeypair},
     std::{error, str::FromStr},
     thiserror::Error,
@@ -337,7 +338,7 @@ impl FromStr for KeyType {
 mod tests {
     use {
         super::*,
-        solana_sdk::pubkey::Pubkey,
+        solana_pubkey::Pubkey,
         tempfile::{tempdir, TempDir},
     };