Extract derivation-path crate (#2056)

* extract derivation-path crate * remove now unused dep * update derivation_path dependents * remove now-unused derivation-path dep
anza-xyz · Sep 5, 2024 · 1ab8e07 · 1ab8e07
1 parent 4afd4bb
commit 1ab8e07
Show file tree

Hide file tree

Showing 26 changed files with 79 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -105,6 +105,7 @@ members = [
     "sdk/cargo-test-sbf",
     "sdk/clock",
     "sdk/decode-error",
+    "sdk/derivation-path",
     "sdk/gen-headers",
     "sdk/hash",
     "sdk/macro",
@@ -380,6 +381,7 @@ solana-cost-model = { path = "cost-model", version = "=2.1.0" }
 solana-curve25519 = { path = "curves/curve25519", version = "=2.1.0" }
 solana-decode-error = { path = "sdk/decode-error", version = "=2.1.0" }
 solana-define-syscall = { path = "define-syscall", version = "=2.1.0" }
+solana-derivation-path = { path = "sdk/derivation-path", version = "=2.1.0" }
 solana-download-utils = { path = "download-utils", version = "=2.1.0" }
 solana-entry = { path = "entry", version = "=2.1.0" }
 solana-faucet = { path = "faucet", version = "=2.1.0" }

diff --git a/clap-utils/Cargo.toml b/clap-utils/Cargo.toml
@@ -13,6 +13,7 @@ edition = { workspace = true }
 chrono = { workspace = true, features = ["default"] }
 clap = "2.33.0"
 rpassword = { workspace = true }
+solana-derivation-path = { workspace = true }
 solana-remote-wallet = { workspace = true }
 solana-sdk = { workspace = true }
 thiserror = { workspace = true }

diff --git a/clap-utils/src/keypair.rs b/clap-utils/src/keypair.rs
@@ -18,13 +18,13 @@ use {
     bip39::{Language, Mnemonic, Seed},
     clap::ArgMatches,
     rpassword::prompt_password,
+    solana_derivation_path::{DerivationPath, DerivationPathError},
     solana_remote_wallet::{
         locator::{Locator as RemoteWalletLocator, LocatorError as RemoteWalletLocatorError},
         remote_keypair::generate_remote_keypair,
         remote_wallet::{maybe_wallet_manager, RemoteWalletError, RemoteWalletManager},
     },
     solana_sdk::{
-        derivation_path::{DerivationPath, DerivationPathError},
         hash::Hash,
         message::Message,
         pubkey::Pubkey,

diff --git a/clap-v3-utils/Cargo.toml b/clap-v3-utils/Cargo.toml
@@ -13,6 +13,7 @@ edition = { workspace = true }
 chrono = { workspace = true, features = ["default"] }
 clap = { version = "3.2.23", features = ["cargo"] }
 rpassword = { workspace = true }
+solana-derivation-path = { workspace = true }
 solana-remote-wallet = { workspace = true }
 solana-sdk = { workspace = true }
 solana-zk-token-sdk = { workspace = true }

diff --git a/clap-v3-utils/src/input_parsers/signer.rs b/clap-v3-utils/src/input_parsers/signer.rs
@@ -5,12 +5,12 @@ use {
         ASK_KEYWORD, SKIP_SEED_PHRASE_VALIDATION_ARG,
     },
     clap::{builder::ValueParser, ArgMatches},
+    solana_derivation_path::{DerivationPath, DerivationPathError},
     solana_remote_wallet::{
         locator::{Locator as RemoteWalletLocator, LocatorError as RemoteWalletLocatorError},
         remote_wallet::RemoteWalletManager,
     },
     solana_sdk::{
-        derivation_path::{DerivationPath, DerivationPathError},
         pubkey::Pubkey,
         signature::{read_keypair_file, Keypair, Signature, Signer},
     },

diff --git a/clap-v3-utils/src/keygen/derivation_path.rs b/clap-v3-utils/src/keygen/derivation_path.rs
@@ -1,6 +1,6 @@
 use {
     clap::{Arg, ArgMatches},
-    solana_sdk::derivation_path::DerivationPath,
+    solana_derivation_path::DerivationPath,
     std::error,
 };
 

diff --git a/clap-v3-utils/src/keypair.rs b/clap-v3-utils/src/keypair.rs
@@ -18,12 +18,12 @@ use {
     bip39::{Language, Mnemonic, Seed},
     clap::ArgMatches,
     rpassword::prompt_password,
+    solana_derivation_path::DerivationPath,
     solana_remote_wallet::{
         remote_keypair::generate_remote_keypair,
         remote_wallet::{maybe_wallet_manager, RemoteWalletError, RemoteWalletManager},
     },
     solana_sdk::{
-        derivation_path::DerivationPath,
         hash::Hash,
         message::Message,
         pubkey::Pubkey,

diff --git a/keygen/Cargo.toml b/keygen/Cargo.toml
@@ -16,6 +16,7 @@ dirs-next = { workspace = true }
 num_cpus = { workspace = true }
 solana-clap-v3-utils = { workspace = true }
 solana-cli-config = { workspace = true }
+solana-derivation-path = { workspace = true }
 solana-remote-wallet = { workspace = true, features = ["default"] }
 solana-sdk = { workspace = true }
 solana-version = { workspace = true }

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/remote-wallet/Cargo.toml b/remote-wallet/Cargo.toml
@@ -19,6 +19,7 @@ num-traits = { workspace = true }
 parking_lot = { workspace = true }
 qstring = { workspace = true }
 semver = { workspace = true }
+solana-derivation-path = { workspace = true }
 solana-sdk = { workspace = true }
 thiserror = { workspace = true }
 uriparse = { workspace = true }

diff --git a/remote-wallet/src/ledger.rs b/remote-wallet/src/ledger.rs
@@ -5,7 +5,7 @@ use {
     console::Emoji,
     dialoguer::{theme::ColorfulTheme, Select},
     semver::Version as FirmwareVersion,
-    solana_sdk::derivation_path::DerivationPath,
+    solana_derivation_path::DerivationPath,
     std::{fmt, rc::Rc},
 };
 #[cfg(feature = "hidapi")]

diff --git a/remote-wallet/src/remote_keypair.rs b/remote-wallet/src/remote_keypair.rs
@@ -7,8 +7,8 @@ use {
             RemoteWalletType,
         },
     },
+    solana_derivation_path::DerivationPath,
     solana_sdk::{
-        derivation_path::DerivationPath,
         pubkey::Pubkey,
         signature::{Signature, Signer, SignerError},
     },

diff --git a/remote-wallet/src/remote_wallet.rs b/remote-wallet/src/remote_wallet.rs
@@ -8,8 +8,8 @@ use {
     },
     log::*,
     parking_lot::RwLock,
+    solana_derivation_path::{DerivationPath, DerivationPathError},
     solana_sdk::{
-        derivation_path::{DerivationPath, DerivationPathError},
         pubkey::Pubkey,
         signature::{Signature, SignerError},
     },

diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -54,7 +54,6 @@ bytemuck_derive = { workspace = true }
 byteorder = { workspace = true, optional = true }
 chrono = { workspace = true, features = ["alloc"], optional = true }
 curve25519-dalek = { workspace = true, optional = true }
-derivation-path = { workspace = true }
 digest = { workspace = true, optional = true }
 ed25519-dalek = { workspace = true, optional = true }
 ed25519-dalek-bip32 = { workspace = true, optional = true }
@@ -72,7 +71,6 @@ num-derive = { workspace = true }
 num-traits = { workspace = true }
 num_enum = { workspace = true }
 pbkdf2 = { workspace = true }
-qstring = { workspace = true }
 qualifier_attr = { workspace = true, optional = true }
 rand = { workspace = true, optional = true }
 rand0-7 = { package = "rand", version = "0.7", optional = true }
@@ -86,6 +84,7 @@ sha3 = { workspace = true, optional = true }
 siphasher = { workspace = true }
 solana-bn254 = { workspace = true }
 solana-decode-error = { workspace = true }
+solana-derivation-path = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true }
 solana-frozen-abi-macro = { workspace = true, optional = true }
 solana-program = { workspace = true }
@@ -96,7 +95,6 @@ solana-secp256k1-recover = { workspace = true }
 solana-serde-varint = { workspace = true }
 solana-short-vec = { workspace = true }
 thiserror = { workspace = true }
-uriparse = { workspace = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 getrandom = { version = "0.1", features = ["wasm-bindgen"] }

diff --git a/sdk/derivation-path/Cargo.toml b/sdk/derivation-path/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "solana-derivation-path"
+description = "Solana BIP44 derivation paths."
+documentation = "https://docs.rs/solana-derivation-path"
+version = { workspace = true }
+authors = { workspace = true }
+repository = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+
+[dependencies]
+derivation-path = { workspace = true }
+qstring = { workspace = true }
+thiserror = { workspace = true }
+uriparse = { workspace = true }
+
+[dev-dependencies]
+assert_matches = { workspace = true }
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
diff --git a/sdk/src/derivation_path.rs → sdk/derivation-path/src/lib.rs b/sdk/src/derivation_path.rs → sdk/derivation-path/src/lib.rs
diff --git a/sdk/src/lib.rs b/sdk/src/lib.rs
@@ -63,7 +63,6 @@ pub mod account_utils;
 pub mod client;
 pub mod commitment_config;
 pub mod compute_budget;
-pub mod derivation_path;
 pub mod deserialize_utils;
 pub mod ed25519_instruction;
 pub mod entrypoint;
@@ -113,6 +112,8 @@ pub mod wasm;
 pub use solana_bn254 as alt_bn128;
 #[deprecated(since = "2.1.0", note = "Use `solana-decode-error` crate instead")]
 pub use solana_decode_error as decode_error;
+#[deprecated(since = "2.1.0", note = "Use `solana-derivation-path` crate instead")]
+pub use solana_derivation_path as derivation_path;
 #[deprecated(since = "2.1.0", note = "Use `solana-program-memory` crate instead")]
 pub use solana_program_memory as program_memory;
 #[deprecated(since = "2.1.0", note = "Use `solana-sanitize` crate instead")]

diff --git a/sdk/src/signer/keypair.rs b/sdk/src/signer/keypair.rs
@@ -4,7 +4,6 @@
 use wasm_bindgen::prelude::*;
 use {
     crate::{
-        derivation_path::DerivationPath,
         pubkey::Pubkey,
         signature::Signature,
         signer::{EncodableKey, EncodableKeypair, SeedDerivable, Signer, SignerError},
@@ -13,6 +12,7 @@ use {
     ed25519_dalek_bip32::Error as Bip32Error,
     hmac::Hmac,
     rand0_7::{rngs::OsRng, CryptoRng, RngCore},
+    solana_derivation_path::DerivationPath,
     std::{
         error,
         io::{Read, Write},