Răsfoiți Sursa

remove solana-sdk from zk-keygen (#4002)

Kevin Heavey 11 luni în urmă
părinte
comite
a6148bd3e1
3 a modificat fișierele cu 9 adăugiri și 4 ștergeri
  1. 3 1
      Cargo.lock
  2. 3 1
      zk-keygen/Cargo.toml
  3. 3 2
      zk-keygen/src/main.rs

+ 3 - 1
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",

+ 3 - 1
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]]

+ 3 - 2
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},
     };