From 973013cbdfb0093c9d0bc8d2f5176c981160e060 Mon Sep 17 00:00:00 2001 From: dhruvbaliyan Date: Tue, 9 Aug 2022 14:20:14 +0530 Subject: [PATCH] Removed ExtendedKeyInfo & related methods --- src/bdk.udl | 14 +------------- src/lib.rs | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 53 deletions(-) diff --git a/src/bdk.udl b/src/bdk.udl index d98cfec..acbd439 100644 --- a/src/bdk.udl +++ b/src/bdk.udl @@ -1,10 +1,4 @@ -namespace bdk { - [Throws=BdkError] - ExtendedKeyInfo generate_extended_key(Network network, WordCount word_count, string? password); - - [Throws=BdkError] - ExtendedKeyInfo restore_extended_key(Network network, string mnemonic, string? password); -}; +namespace bdk {}; [Error] enum BdkError { @@ -101,12 +95,6 @@ interface Transaction { Confirmed(TransactionDetails details, BlockTime confirmation); }; -dictionary ExtendedKeyInfo { - string mnemonic; - string xprv; - string fingerprint; -}; - enum WordCount { "Words12", "Words15", diff --git a/src/lib.rs b/src/lib.rs index 95243cb..f84c08a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -351,46 +351,6 @@ impl Wallet { } } -pub struct ExtendedKeyInfo { - mnemonic: String, - xprv: String, - fingerprint: String, -} - -fn generate_extended_key( - network: Network, - word_count: WordCount, - password: Option, -) -> Result { - let mnemonic: GeneratedKey<_, BareCtx> = - Mnemonic::generate((word_count, Language::English)).unwrap(); - let mnemonic = mnemonic.into_key(); - let xkey: ExtendedKey = (mnemonic.clone(), password).into_extended_key()?; - let xprv = xkey.into_xprv(network).unwrap(); - let fingerprint = xprv.fingerprint(&Secp256k1::new()); - Ok(ExtendedKeyInfo { - mnemonic: mnemonic.to_string(), - xprv: xprv.to_string(), - fingerprint: fingerprint.to_string(), - }) -} - -fn restore_extended_key( - network: Network, - mnemonic: String, - password: Option, -) -> Result { - let mnemonic = Mnemonic::parse_in(Language::English, mnemonic).unwrap(); - let xkey: ExtendedKey = (mnemonic.clone(), password).into_extended_key()?; - let xprv = xkey.into_xprv(network).unwrap(); - let fingerprint = xprv.fingerprint(&Secp256k1::new()); - Ok(ExtendedKeyInfo { - mnemonic: mnemonic.to_string(), - xprv: xprv.to_string(), - fingerprint: fingerprint.to_string(), - }) -} - fn to_script_pubkey(address: &str) -> Result { Address::from_str(address) .map(|x| x.script_pubkey())