rename hdk

Author: HaoXuan40404

solution/key_tool_box/hierarchical_deterministic_key/Cargo.toml

@@ -11,8 +11,8 @@ description = "Library of Hierarchical Deterministic Key (HDK) solution."
 [dependencies]
 hex = "0.3"
 rand = "0.7"
-wagyu-model = "0.6.3"
-wagyu_lib = { package = "wagyu-bitcoin", version = "0.6.3" }
+wagyu-model = { package = "h-wagyu-model", version = "0.6.3" }
+wagyu_lib = { package = "wagyu-hdk", version = "0.6.4" }
 wedpr_l_macros = "1.0.0"
 wedpr_l_utils = "1.0.0"
 

solution/key_tool_box/hierarchical_deterministic_key/src/hdk.rs

@@ -3,8 +3,8 @@
 //! Core functions of hierarchical deterministic key (HDK)
 
 use wagyu_lib::{
-    wordlist, BitcoinDerivationPath, BitcoinExtendedPrivateKey,
-    BitcoinMnemonic, Mainnet,
+    wordlist, HdkDerivationPath, HdkExtendedPrivateKey,
+    HdkMnemonic, Mainnet,
 };
 use wagyu_model::{
     mnemonic::Mnemonic, ExtendedPrivateKey, MnemonicCount, MnemonicExtended,
@@ -22,7 +22,7 @@ use wedpr_s_protos::generated::hdk::ExtendedKeyPair;
 pub fn create_mnemonic_en(word_count: u8) -> Result<String, WedprError> {
     let rng = &mut StdRng::from_entropy();
     let mnemonic =
-        match BitcoinMnemonic::<Mainnet, wordlist::English>::new_with_count(
+        match HdkMnemonic::<Mainnet, wordlist::English>::new_with_count(
             rng, word_count,
         ) {
             Ok(v) => v,
@@ -44,7 +44,7 @@ pub fn create_master_key_en(
     mnemonic_str: &str,
 ) -> Result<Vec<u8>, WedprError> {
     let mnemonic =
-        match BitcoinMnemonic::<Mainnet, wordlist::English>::from_phrase(
+        match HdkMnemonic::<Mainnet, wordlist::English>::from_phrase(
             mnemonic_str,
         ) {
             Ok(v) => v,
@@ -98,7 +98,7 @@ pub fn derive_extended_key(
         },
     };
     let master_key =
-        match BitcoinExtendedPrivateKey::<Mainnet>::from_str(master_key_str) {
+        match HdkExtendedPrivateKey::<Mainnet>::from_str(master_key_str) {
             Ok(v) => v,
             Err(_) => {
                 wedpr_println!(
@@ -110,7 +110,7 @@ pub fn derive_extended_key(
         };
 
     let derivation_path =
-        match BitcoinDerivationPath::from_str(&key_derivation_path) {
+        match HdkDerivationPath::from_str(&key_derivation_path) {
             Ok(v) => v,
             Err(_) => {
                 wedpr_println!(
@@ -132,10 +132,9 @@ pub fn derive_extended_key(
             return Err(WedprError::FormatError);
         },
     };
-    let private_key_hex = extended_private_key
+    let private_key_hex = hex::encode(extended_private_key
         .to_private_key()
-        .to_secp256k1_secret_key()
-        .to_string();
+        .to_secp256k1_secret_key().serialize());
 
     let extended_private_key_bytes = match decode_hex_string(&private_key_hex) {
         Ok(v) => v,
@@ -151,7 +150,8 @@ pub fn derive_extended_key(
     let extended_public_key_uncompress_bytes = extended_private_key
         .to_public_key()
         .to_secp256k1_public_key()
-        .serialize_uncompressed();
+        .serialize();
+        // .serialize_uncompressed();
 
     // TODO: Replace with a better way to initialize PB if available.
     Ok(ExtendedKeyPair {