@bennyblader/ddk-rn 0.3.22 → 0.3.25

package/cpp/ddk_ffi.cpp

@@ -195,6 +195,16 @@ extern "C" {
         uint64_t fund_output_serial_id, 
         RustCallStatus *uniffi_out_err
     );
+    RustBuffer uniffi_ddk_ffi_fn_func_create_extkey_from_parent_path(
+        RustBuffer extkey, 
+        RustBuffer path, 
+        RustCallStatus *uniffi_out_err
+    );
+    RustBuffer uniffi_ddk_ffi_fn_func_create_extkey_from_seed(
+        RustBuffer seed, 
+        RustBuffer network, 
+        RustCallStatus *uniffi_out_err
+    );
     RustBuffer uniffi_ddk_ffi_fn_func_create_fund_tx_locking_script(
         RustBuffer local_fund_pubkey, 
         RustBuffer remote_fund_pubkey, 
@@ -222,7 +232,7 @@ extern "C" {
         RustCallStatus *uniffi_out_err
     );
     RustBuffer uniffi_ddk_ffi_fn_func_create_xpriv_from_parent_path(
-        RustBuffer xpriv, 
+        RustBuffer seed_or_xpriv, 
         RustBuffer base_derivation_path, 
         RustBuffer network, 
         RustBuffer path, 
@@ -233,6 +243,11 @@ extern "C" {
         uint64_t fee_rate, 
         RustCallStatus *uniffi_out_err
     );
+    RustBuffer uniffi_ddk_ffi_fn_func_get_pubkey_from_extkey(
+        RustBuffer extkey, 
+        RustBuffer network, 
+        RustCallStatus *uniffi_out_err
+    );
     RustBuffer uniffi_ddk_ffi_fn_func_get_raw_funding_transaction_input_signature(
         RustBuffer funding_transaction, 
         RustBuffer privkey, 
@@ -536,6 +551,10 @@ extern "C" {
     );
     uint16_t uniffi_ddk_ffi_checksum_func_create_dlc_transactions(
     );
+    uint16_t uniffi_ddk_ffi_checksum_func_create_extkey_from_parent_path(
+    );
+    uint16_t uniffi_ddk_ffi_checksum_func_create_extkey_from_seed(
+    );
     uint16_t uniffi_ddk_ffi_checksum_func_create_fund_tx_locking_script(
     );
     uint16_t uniffi_ddk_ffi_checksum_func_create_refund_transaction(
@@ -546,6 +565,8 @@ extern "C" {
     );
     uint16_t uniffi_ddk_ffi_checksum_func_get_change_output_and_fees(
     );
+    uint16_t uniffi_ddk_ffi_checksum_func_get_pubkey_from_extkey(
+    );
     uint16_t uniffi_ddk_ffi_checksum_func_get_raw_funding_transaction_input_signature(
     );
     uint16_t uniffi_ddk_ffi_checksum_func_get_total_input_vsize(
@@ -2168,6 +2189,22 @@ NativeDdkFfi::NativeDdkFfi(
             return this->cpp_uniffi_ddk_ffi_fn_func_create_dlc_transactions(rt, thisVal, args, count);
         }
     );
+    props["ubrn_uniffi_ddk_ffi_fn_func_create_extkey_from_parent_path"] = jsi::Function::createFromHostFunction(
+        rt,
+        jsi::PropNameID::forAscii(rt, "ubrn_uniffi_ddk_ffi_fn_func_create_extkey_from_parent_path"),
+        2,
+        [this](jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *args, size_t count) -> jsi::Value {
+            return this->cpp_uniffi_ddk_ffi_fn_func_create_extkey_from_parent_path(rt, thisVal, args, count);
+        }
+    );
+    props["ubrn_uniffi_ddk_ffi_fn_func_create_extkey_from_seed"] = jsi::Function::createFromHostFunction(
+        rt,
+        jsi::PropNameID::forAscii(rt, "ubrn_uniffi_ddk_ffi_fn_func_create_extkey_from_seed"),
+        2,
+        [this](jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *args, size_t count) -> jsi::Value {
+            return this->cpp_uniffi_ddk_ffi_fn_func_create_extkey_from_seed(rt, thisVal, args, count);
+        }
+    );
     props["ubrn_uniffi_ddk_ffi_fn_func_create_fund_tx_locking_script"] = jsi::Function::createFromHostFunction(
         rt,
         jsi::PropNameID::forAscii(rt, "ubrn_uniffi_ddk_ffi_fn_func_create_fund_tx_locking_script"),
@@ -2208,6 +2245,14 @@ NativeDdkFfi::NativeDdkFfi(
             return this->cpp_uniffi_ddk_ffi_fn_func_get_change_output_and_fees(rt, thisVal, args, count);
         }
     );
+    props["ubrn_uniffi_ddk_ffi_fn_func_get_pubkey_from_extkey"] = jsi::Function::createFromHostFunction(
+        rt,
+        jsi::PropNameID::forAscii(rt, "ubrn_uniffi_ddk_ffi_fn_func_get_pubkey_from_extkey"),
+        2,
+        [this](jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *args, size_t count) -> jsi::Value {
+            return this->cpp_uniffi_ddk_ffi_fn_func_get_pubkey_from_extkey(rt, thisVal, args, count);
+        }
+    );
     props["ubrn_uniffi_ddk_ffi_fn_func_get_raw_funding_transaction_input_signature"] = jsi::Function::createFromHostFunction(
         rt,
         jsi::PropNameID::forAscii(rt, "ubrn_uniffi_ddk_ffi_fn_func_get_raw_funding_transaction_input_signature"),
@@ -2352,6 +2397,22 @@ NativeDdkFfi::NativeDdkFfi(
             return this->cpp_uniffi_ddk_ffi_checksum_func_create_dlc_transactions(rt, thisVal, args, count);
         }
     );
+    props["ubrn_uniffi_ddk_ffi_checksum_func_create_extkey_from_parent_path"] = jsi::Function::createFromHostFunction(
+        rt,
+        jsi::PropNameID::forAscii(rt, "ubrn_uniffi_ddk_ffi_checksum_func_create_extkey_from_parent_path"),
+        0,
+        [this](jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *args, size_t count) -> jsi::Value {
+            return this->cpp_uniffi_ddk_ffi_checksum_func_create_extkey_from_parent_path(rt, thisVal, args, count);
+        }
+    );
+    props["ubrn_uniffi_ddk_ffi_checksum_func_create_extkey_from_seed"] = jsi::Function::createFromHostFunction(
+        rt,
+        jsi::PropNameID::forAscii(rt, "ubrn_uniffi_ddk_ffi_checksum_func_create_extkey_from_seed"),
+        0,
+        [this](jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *args, size_t count) -> jsi::Value {
+            return this->cpp_uniffi_ddk_ffi_checksum_func_create_extkey_from_seed(rt, thisVal, args, count);
+        }
+    );
     props["ubrn_uniffi_ddk_ffi_checksum_func_create_fund_tx_locking_script"] = jsi::Function::createFromHostFunction(
         rt,
         jsi::PropNameID::forAscii(rt, "ubrn_uniffi_ddk_ffi_checksum_func_create_fund_tx_locking_script"),
@@ -2392,6 +2453,14 @@ NativeDdkFfi::NativeDdkFfi(
             return this->cpp_uniffi_ddk_ffi_checksum_func_get_change_output_and_fees(rt, thisVal, args, count);
         }
     );
+    props["ubrn_uniffi_ddk_ffi_checksum_func_get_pubkey_from_extkey"] = jsi::Function::createFromHostFunction(
+        rt,
+        jsi::PropNameID::forAscii(rt, "ubrn_uniffi_ddk_ffi_checksum_func_get_pubkey_from_extkey"),
+        0,
+        [this](jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *args, size_t count) -> jsi::Value {
+            return this->cpp_uniffi_ddk_ffi_checksum_func_get_pubkey_from_extkey(rt, thisVal, args, count);
+        }
+    );
     props["ubrn_uniffi_ddk_ffi_checksum_func_get_raw_funding_transaction_input_signature"] = jsi::Function::createFromHostFunction(
         rt,
         jsi::PropNameID::forAscii(rt, "ubrn_uniffi_ddk_ffi_checksum_func_get_raw_funding_transaction_input_signature"),
@@ -2611,6 +2680,26 @@ jsi::Value NativeDdkFfi::cpp_uniffi_ddk_ffi_fn_func_create_dlc_transactions(jsi:
         uniffi::ddk_ffi::Bridging<RustCallStatus>::copyIntoJs(rt, callInvoker, status, args[count - 1]);
 
         
+        return uniffi::ddk_ffi::Bridging<RustBuffer>::toJs(rt, callInvoker, value);
+}
+jsi::Value NativeDdkFfi::cpp_uniffi_ddk_ffi_fn_func_create_extkey_from_parent_path(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count) {
+        RustCallStatus status = uniffi::ddk_ffi::Bridging<RustCallStatus>::rustSuccess(rt);
+        auto value = uniffi_ddk_ffi_fn_func_create_extkey_from_parent_path(uniffi::ddk_ffi::Bridging<RustBuffer>::fromJs(rt, callInvoker, args[0]), uniffi::ddk_ffi::Bridging<RustBuffer>::fromJs(rt, callInvoker, args[1]), 
+            &status
+        );
+        uniffi::ddk_ffi::Bridging<RustCallStatus>::copyIntoJs(rt, callInvoker, status, args[count - 1]);
+
+        
+        return uniffi::ddk_ffi::Bridging<RustBuffer>::toJs(rt, callInvoker, value);
+}
+jsi::Value NativeDdkFfi::cpp_uniffi_ddk_ffi_fn_func_create_extkey_from_seed(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count) {
+        RustCallStatus status = uniffi::ddk_ffi::Bridging<RustCallStatus>::rustSuccess(rt);
+        auto value = uniffi_ddk_ffi_fn_func_create_extkey_from_seed(uniffi::ddk_ffi::Bridging<RustBuffer>::fromJs(rt, callInvoker, args[0]), uniffi::ddk_ffi::Bridging<RustBuffer>::fromJs(rt, callInvoker, args[1]), 
+            &status
+        );
+        uniffi::ddk_ffi::Bridging<RustCallStatus>::copyIntoJs(rt, callInvoker, status, args[count - 1]);
+
+        
         return uniffi::ddk_ffi::Bridging<RustBuffer>::toJs(rt, callInvoker, value);
 }
 jsi::Value NativeDdkFfi::cpp_uniffi_ddk_ffi_fn_func_create_fund_tx_locking_script(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count) {
@@ -2661,6 +2750,16 @@ jsi::Value NativeDdkFfi::cpp_uniffi_ddk_ffi_fn_func_get_change_output_and_fees(j
         uniffi::ddk_ffi::Bridging<RustCallStatus>::copyIntoJs(rt, callInvoker, status, args[count - 1]);
 
         
+        return uniffi::ddk_ffi::Bridging<RustBuffer>::toJs(rt, callInvoker, value);
+}
+jsi::Value NativeDdkFfi::cpp_uniffi_ddk_ffi_fn_func_get_pubkey_from_extkey(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count) {
+        RustCallStatus status = uniffi::ddk_ffi::Bridging<RustCallStatus>::rustSuccess(rt);
+        auto value = uniffi_ddk_ffi_fn_func_get_pubkey_from_extkey(uniffi::ddk_ffi::Bridging<RustBuffer>::fromJs(rt, callInvoker, args[0]), uniffi::ddk_ffi::Bridging<RustBuffer>::fromJs(rt, callInvoker, args[1]), 
+            &status
+        );
+        uniffi::ddk_ffi::Bridging<RustCallStatus>::copyIntoJs(rt, callInvoker, status, args[count - 1]);
+
+        
         return uniffi::ddk_ffi::Bridging<RustBuffer>::toJs(rt, callInvoker, value);
 }
 jsi::Value NativeDdkFfi::cpp_uniffi_ddk_ffi_fn_func_get_raw_funding_transaction_input_signature(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count) {
@@ -2819,6 +2918,20 @@ jsi::Value NativeDdkFfi::cpp_uniffi_ddk_ffi_checksum_func_create_dlc_transaction
         );
 
         
+        return uniffi_jsi::Bridging<uint16_t>::toJs(rt, callInvoker, value);
+}
+jsi::Value NativeDdkFfi::cpp_uniffi_ddk_ffi_checksum_func_create_extkey_from_parent_path(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count) {
+        auto value = uniffi_ddk_ffi_checksum_func_create_extkey_from_parent_path(
+        );
+
+        
+        return uniffi_jsi::Bridging<uint16_t>::toJs(rt, callInvoker, value);
+}
+jsi::Value NativeDdkFfi::cpp_uniffi_ddk_ffi_checksum_func_create_extkey_from_seed(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count) {
+        auto value = uniffi_ddk_ffi_checksum_func_create_extkey_from_seed(
+        );
+
+        
         return uniffi_jsi::Bridging<uint16_t>::toJs(rt, callInvoker, value);
 }
 jsi::Value NativeDdkFfi::cpp_uniffi_ddk_ffi_checksum_func_create_fund_tx_locking_script(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count) {
@@ -2854,6 +2967,13 @@ jsi::Value NativeDdkFfi::cpp_uniffi_ddk_ffi_checksum_func_get_change_output_and_
         );
 
         
+        return uniffi_jsi::Bridging<uint16_t>::toJs(rt, callInvoker, value);
+}
+jsi::Value NativeDdkFfi::cpp_uniffi_ddk_ffi_checksum_func_get_pubkey_from_extkey(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count) {
+        auto value = uniffi_ddk_ffi_checksum_func_get_pubkey_from_extkey(
+        );
+
+        
         return uniffi_jsi::Bridging<uint16_t>::toJs(rt, callInvoker, value);
 }
 jsi::Value NativeDdkFfi::cpp_uniffi_ddk_ffi_checksum_func_get_raw_funding_transaction_input_signature(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count) {

package/cpp/ddk_ffi.hpp

@@ -28,11 +28,14 @@ class NativeDdkFfi : public jsi::HostObject {
     jsi::Value cpp_uniffi_ddk_ffi_fn_func_create_cet_adaptor_sigs_from_oracle_info(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_fn_func_create_cets(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_fn_func_create_dlc_transactions(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
+    jsi::Value cpp_uniffi_ddk_ffi_fn_func_create_extkey_from_parent_path(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
+    jsi::Value cpp_uniffi_ddk_ffi_fn_func_create_extkey_from_seed(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_fn_func_create_fund_tx_locking_script(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_fn_func_create_refund_transaction(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_fn_func_create_spliced_dlc_transactions(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_fn_func_create_xpriv_from_parent_path(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_fn_func_get_change_output_and_fees(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
+    jsi::Value cpp_uniffi_ddk_ffi_fn_func_get_pubkey_from_extkey(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_fn_func_get_raw_funding_transaction_input_signature(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_fn_func_get_total_input_vsize(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_fn_func_get_xpub_from_xpriv(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
@@ -51,11 +54,14 @@ class NativeDdkFfi : public jsi::HostObject {
     jsi::Value cpp_uniffi_ddk_ffi_checksum_func_create_cet_adaptor_sigs_from_oracle_info(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_checksum_func_create_cets(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_checksum_func_create_dlc_transactions(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
+    jsi::Value cpp_uniffi_ddk_ffi_checksum_func_create_extkey_from_parent_path(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
+    jsi::Value cpp_uniffi_ddk_ffi_checksum_func_create_extkey_from_seed(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_checksum_func_create_fund_tx_locking_script(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_checksum_func_create_refund_transaction(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_checksum_func_create_spliced_dlc_transactions(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_checksum_func_create_xpriv_from_parent_path(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_checksum_func_get_change_output_and_fees(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
+    jsi::Value cpp_uniffi_ddk_ffi_checksum_func_get_pubkey_from_extkey(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_checksum_func_get_raw_funding_transaction_input_signature(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_checksum_func_get_total_input_vsize(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);
     jsi::Value cpp_uniffi_ddk_ffi_checksum_func_get_xpub_from_xpriv(jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count);

package/ddk-ffi/Cargo.lock

@@ -282,9 +282,9 @@ checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 
 [[package]]
 name = "ddk-dlc"
-version = "0.0.21"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd81ea804b1fe6ad44621b79db9261b7a595e0c41e9fb33642ec4798100eeff7"
+checksum = "0079e364d8e7be9dbf6b9fbe0d867e9cf2c92c395a19ffbea50d379bf3fc3e48"
 dependencies = [
  "bitcoin",
  "miniscript",
@@ -295,7 +295,7 @@ dependencies = [
 
 [[package]]
 name = "ddk_ffi"
-version = "0.3.22"
+version = "0.3.25"
 dependencies = [
  "bip39",
  "bitcoin",

package/ddk-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ddk_ffi"
-version = "0.3.22"
+version = "0.3.25"
 edition = "2021"
 license = "MIT"
 description = "rust-dlc language bindings"
@@ -16,7 +16,7 @@ crate-type = ["cdylib", "staticlib", "rlib"]
 uniffi = { version = "0.29.4", features = ["cli"] }
 # ddk-dlc = { path = "../../../ernest/dlcdevkit/dlc", features = ["use-serde"] }
 # ddk-dlc = { git = "https://github.com/bennyhodl/dlcdevkit.git", branch = "master", features = ["use-serde"] }
-ddk-dlc = { version = "0.0.21", features = ["use-serde"] }
+ddk-dlc = { version = "1.0.0", features = ["use-serde"] }
 bitcoin = "0.32.7"
 thiserror = "2.0.12"
 secp256k1-zkp = "0.11.0"

package/ddk-ffi/src/ddk_ffi.udl

@@ -1,17 +1,31 @@
 namespace ddk_ffi {
     string version();
+
+    // === SEED OPERATIONS ===
     [Throws=DLCError]
     sequence<u8> convert_mnemonic_to_seed(string mnemonic, string? passphrase);
+
+    [Throws=DLCError]
+    sequence<u8> create_extkey_from_seed(sequence<u8> seed, string network);
+
+    // === EXTENDED KEY OPERATIONS ===
+    [Throws=DLCError]
+    sequence<u8> create_extkey_from_parent_path(sequence<u8> extkey, string path);
+
+    [Throws=DLCError]
+    sequence<u8> get_pubkey_from_extkey(sequence<u8> extkey, string network);
+
+    [Throws=DLCError]
+    sequence<u8> get_xpub_from_xpriv(sequence<u8> xpriv, string network);
+
+    // === DEPRECATED ===
     [Throws=DLCError]
     sequence<u8> create_xpriv_from_parent_path(
-        sequence<u8> xpriv,
+        sequence<u8> seed_or_xpriv,
         string base_derivation_path,
         string network,
         string path
     );
-    [Throws=DLCError]
-    sequence<u8> get_xpub_from_xpriv(sequence<u8> xpriv, string network);
-
 
     // DLC Transaction Creation Functions
     [Throws=DLCError]

package/ddk-ffi/src/lib.rs

@@ -1,6 +1,7 @@
 #![allow(clippy::too_many_arguments)]
+#![allow(deprecated)]
 use bip39::{Language, Mnemonic};
-use bitcoin::bip32::{DerivationPath, IntoDerivationPath, Xpriv, Xpub};
+use bitcoin::bip32::{IntoDerivationPath, Xpriv, Xpub};
 use bitcoin::hashes::Hash;
 use bitcoin::sighash::EcdsaSighashType;
 use bitcoin::{
@@ -1060,42 +1061,106 @@ pub fn convert_mnemonic_to_seed(
     Ok(seed.to_vec())
 }
 
-pub fn create_xpriv_from_parent_path(
-    xpriv: Vec<u8>,
-    base_derivation_path: String,
-    network: String,
-    path: String,
-) -> Result<Vec<u8>, DLCError> {
-    if xpriv.len() != 64 {
+/// Create master extended private key from 64-byte seed
+/// Returns 78-byte encoded xpriv
+pub fn create_extkey_from_seed(seed: Vec<u8>, network: String) -> Result<Vec<u8>, DLCError> {
+    if seed.len() != 64 {
         return Err(DLCError::KeyError(ExtendedKey::InvalidXpriv));
     }
-    let secp = get_secp_context();
     let network = Network::from_str(&network).map_err(|_| DLCError::InvalidNetwork)?;
-    let xpriv = Xpriv::new_master(network, &xpriv)
+    let xpriv = Xpriv::new_master(network, &seed)
         .map_err(|_| DLCError::KeyError(ExtendedKey::InvalidXpriv))?;
-    // Base path: 84'/0'/0'
-    let base_path = DerivationPath::from_str(&base_derivation_path)
-        .map_err(|_| DLCError::KeyError(ExtendedKey::InvalidDerivationPath))?;
+    Ok(xpriv.encode().to_vec())
+}
+
+/// Derive child extended private key from parent extended key
+/// Input: 78-byte encoded xpriv, Output: 78-byte encoded xpriv
+pub fn create_extkey_from_parent_path(extkey: Vec<u8>, path: String) -> Result<Vec<u8>, DLCError> {
+    if extkey.len() != 78 {
+        return Err(DLCError::KeyError(ExtendedKey::InvalidXpriv));
+    }
 
-    // App path: {0 || 1}/{child_number}
-    let app_path = path
+    let secp = get_secp_context();
+    let xpriv =
+        Xpriv::decode(&extkey).map_err(|_| DLCError::KeyError(ExtendedKey::InvalidXpriv))?;
+
+    let derivation_path = path
         .into_derivation_path()
         .map_err(|_| DLCError::KeyError(ExtendedKey::InvalidDerivationPath))?;
 
-    let full_path = base_path.extend(app_path);
-
     let derived_xpriv = xpriv
-        .derive_priv(secp, &full_path)
+        .derive_priv(secp, &derivation_path)
         .map_err(|_| DLCError::KeyError(ExtendedKey::InvalidXpriv))?;
 
     Ok(derived_xpriv.encode().to_vec())
 }
 
+/// Extract public key from extended key (private or public)
+/// Input: 78-byte encoded xpriv/xpub, Output: 33-byte compressed public key
+pub fn get_pubkey_from_extkey(extkey: Vec<u8>, network: String) -> Result<Vec<u8>, DLCError> {
+    if extkey.len() != 78 {
+        return Err(DLCError::KeyError(ExtendedKey::InvalidXpriv));
+    }
+
+    let secp = get_secp_context();
+    let _network = Network::from_str(&network).map_err(|_| DLCError::InvalidNetwork)?;
+
+    // Try as xpriv first
+    if let Ok(xpriv) = Xpriv::decode(&extkey) {
+        let xpub = Xpub::from_priv(secp, &xpriv);
+        return Ok(xpub.public_key.serialize().to_vec());
+    }
+
+    // Try as xpub
+    if let Ok(xpub) = Xpub::decode(&extkey) {
+        return Ok(xpub.public_key.serialize().to_vec());
+    }
+
+    Err(DLCError::KeyError(ExtendedKey::InvalidXpriv))
+}
+
+/// DEPRECATED: Use create_extkey_from_seed + create_extkey_from_parent_path instead
+/// This function handles both seeds (64 bytes) and xprivs (78 bytes) which is confusing
+#[deprecated(
+    since = "0.4.0",
+    note = "Use create_extkey_from_seed + create_extkey_from_parent_path"
+)]
+pub fn create_xpriv_from_parent_path(
+    seed_or_xpriv: Vec<u8>,
+    base_derivation_path: String,
+    network: String,
+    path: String,
+) -> Result<Vec<u8>, DLCError> {
+    let master_xpriv = if seed_or_xpriv.len() == 64 {
+        // This is a seed, create master xpriv
+        create_extkey_from_seed(seed_or_xpriv, network.clone())?
+    } else if seed_or_xpriv.len() == 78 {
+        // This is already an xpriv
+        seed_or_xpriv
+    } else {
+        return Err(DLCError::KeyError(ExtendedKey::InvalidXpriv));
+    };
+
+    // Derive base path from master
+    let base_xpriv =
+        create_extkey_from_parent_path(master_xpriv, base_derivation_path.replace("m/", ""))?;
+
+    // Derive final path from base
+    create_extkey_from_parent_path(base_xpriv, path)
+}
+
+/// Convert extended private key to extended public key
+/// Input: 78-byte encoded xpriv, Output: 78-byte encoded xpub
 pub fn get_xpub_from_xpriv(xpriv: Vec<u8>, network: String) -> Result<Vec<u8>, DLCError> {
+    if xpriv.len() != 78 {
+        return Err(DLCError::KeyError(ExtendedKey::InvalidXpriv));
+    }
+
     let secp = get_secp_context();
-    let network = Network::from_str(&network).map_err(|_| DLCError::InvalidNetwork)?;
-    let xpriv = Xpriv::new_master(network, &xpriv)
-        .map_err(|_| DLCError::KeyError(ExtendedKey::InvalidXpriv))?;
+    let _network = Network::from_str(&network).map_err(|_| DLCError::InvalidNetwork)?;
+
+    let xpriv = Xpriv::decode(&xpriv).map_err(|_| DLCError::KeyError(ExtendedKey::InvalidXpriv))?;
+
     let xpub = Xpub::from_priv(secp, &xpriv);
     Ok(xpub.encode().to_vec())
 }
@@ -1103,6 +1168,7 @@ pub fn get_xpub_from_xpriv(xpriv: Vec<u8>, network: String) -> Result<Vec<u8>, D
 #[cfg(test)]
 mod tests {
     use super::*;
+    use bitcoin::bip32::DerivationPath;
     use bitcoin::{hashes::sha256, locktime::absolute::LockTime, Address, CompressedPublicKey};
     use ddk_dlc::secp_utils;
     use secp256k1_zkp::{
@@ -1177,7 +1243,11 @@ mod tests {
         let mnemonic = Mnemonic::generate(24).unwrap();
         let rust_xpriv =
             Xpriv::new_master(Network::Bitcoin, &mnemonic.to_seed_normalized("").to_vec()).unwrap();
-        let ffi_xpriv = convert_mnemonic_to_seed(mnemonic.to_string(), None).unwrap();
+        let ffi_xpriv = create_extkey_from_seed(
+            mnemonic.to_seed_normalized("").to_vec(),
+            "bitcoin".to_string(),
+        )
+        .unwrap();
         let rust_xpub = Xpub::from_priv(get_secp_context(), &rust_xpriv);
         let ffi_xpub = get_xpub_from_xpriv(ffi_xpriv, "bitcoin".to_string()).unwrap();
         assert_eq!(rust_xpub.encode().to_vec(), ffi_xpub);

package/lib/commonjs/ddk_ffi-ffi.js.map

@@ -1 +1 @@
-{"version":3,"names":["getter","globalThis","NativeDdkFfi","_default","exports","default","isRustFutureContinuationCallbackTypeCompatible","isUniffiForeignFutureTypeCompatible"],"sourceRoot":"../../src","sources":["ddk_ffi-ffi.ts"],"mappings":";;;;;;AAAA;AACA;;AAoOA;AACA;AACA;AACA;AACA;AACA,MAAMA,MAAmC,GAAGA,CAAA,KACzCC,UAAU,CAASC,YAAY;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GACpBL,MAAM,EAErB;AAmHA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMM,8CAGL,GAAG,IAAI;AACR,MAAMC,mCAGL,GAAG,IAAI","ignoreList":[]}
+{"version":3,"names":["getter","globalThis","NativeDdkFfi","_default","exports","default","isRustFutureContinuationCallbackTypeCompatible","isUniffiForeignFutureTypeCompatible"],"sourceRoot":"../../src","sources":["ddk_ffi-ffi.ts"],"mappings":";;;;;;AAAA;AACA;;AAsPA;AACA;AACA;AACA;AACA;AACA,MAAMA,MAAmC,GAAGA,CAAA,KACzCC,UAAU,CAASC,YAAY;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GACpBL,MAAM,EAErB;AAmHA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMM,8CAGL,GAAG,IAAI;AACR,MAAMC,mCAGL,GAAG,IAAI","ignoreList":[]}

package/lib/commonjs/ddk_ffi.js

@@ -11,12 +11,15 @@ exports.createCetAdaptorSignatureFromOracleInfo = createCetAdaptorSignatureFromO
 exports.createCetAdaptorSigsFromOracleInfo = createCetAdaptorSigsFromOracleInfo;
 exports.createCets = createCets;
 exports.createDlcTransactions = createDlcTransactions;
+exports.createExtkeyFromParentPath = createExtkeyFromParentPath;
+exports.createExtkeyFromSeed = createExtkeyFromSeed;
 exports.createFundTxLockingScript = createFundTxLockingScript;
 exports.createRefundTransaction = createRefundTransaction;
 exports.createSplicedDlcTransactions = createSplicedDlcTransactions;
 exports.createXprivFromParentPath = createXprivFromParentPath;
 exports.default = void 0;
 exports.getChangeOutputAndFees = getChangeOutputAndFees;
+exports.getPubkeyFromExtkey = getPubkeyFromExtkey;
 exports.getRawFundingTransactionInputSignature = getRawFundingTransactionInputSignature;
 exports.getTotalInputVsize = getTotalInputVsize;
 exports.getXpubFromXpriv = getXpubFromXpriv;
@@ -101,6 +104,22 @@ function createDlcTransactions(outcomes, localParams, remoteParams, refundLockti
     })()(FfiConverterArrayTypePayout.lower(outcomes), FfiConverterTypePartyParams.lower(localParams), FfiConverterTypePartyParams.lower(remoteParams), _uniffiBindgenReactNative.FfiConverterUInt32.lower(refundLocktime), _uniffiBindgenReactNative.FfiConverterUInt64.lower(feeRate), _uniffiBindgenReactNative.FfiConverterUInt32.lower(fundLockTime), _uniffiBindgenReactNative.FfiConverterUInt32.lower(cetLockTime), _uniffiBindgenReactNative.FfiConverterUInt64.lower(fundOutputSerialId), callStatus);
   }, /*liftString:*/FfiConverterString.lift));
 }
+function createExtkeyFromParentPath(extkey, path) /*throws*/{
+  return FfiConverterArrayUInt8.lift(uniffiCaller.rustCallWithError(/*liftError:*/FfiConverterTypeDLCError.lift.bind(FfiConverterTypeDLCError), /*caller:*/callStatus => {
+    return (() => {
+      console.debug(`-- uniffi_ddk_ffi_fn_func_create_extkey_from_parent_path`);
+      return (0, _ddk_ffiFfi.default)().ubrn_uniffi_ddk_ffi_fn_func_create_extkey_from_parent_path;
+    })()(FfiConverterArrayUInt8.lower(extkey), FfiConverterString.lower(path), callStatus);
+  }, /*liftString:*/FfiConverterString.lift));
+}
+function createExtkeyFromSeed(seed, network) /*throws*/{
+  return FfiConverterArrayUInt8.lift(uniffiCaller.rustCallWithError(/*liftError:*/FfiConverterTypeDLCError.lift.bind(FfiConverterTypeDLCError), /*caller:*/callStatus => {
+    return (() => {
+      console.debug(`-- uniffi_ddk_ffi_fn_func_create_extkey_from_seed`);
+      return (0, _ddk_ffiFfi.default)().ubrn_uniffi_ddk_ffi_fn_func_create_extkey_from_seed;
+    })()(FfiConverterArrayUInt8.lower(seed), FfiConverterString.lower(network), callStatus);
+  }, /*liftString:*/FfiConverterString.lift));
+}
 function createFundTxLockingScript(localFundPubkey, remoteFundPubkey) /*throws*/{
   return FfiConverterArrayUInt8.lift(uniffiCaller.rustCallWithError(/*liftError:*/FfiConverterTypeDLCError.lift.bind(FfiConverterTypeDLCError), /*caller:*/callStatus => {
     return (() => {
@@ -125,12 +144,12 @@ function createSplicedDlcTransactions(outcomes, localParams, remoteParams, refun
     })()(FfiConverterArrayTypePayout.lower(outcomes), FfiConverterTypePartyParams.lower(localParams), FfiConverterTypePartyParams.lower(remoteParams), _uniffiBindgenReactNative.FfiConverterUInt32.lower(refundLocktime), _uniffiBindgenReactNative.FfiConverterUInt64.lower(feeRate), _uniffiBindgenReactNative.FfiConverterUInt32.lower(fundLockTime), _uniffiBindgenReactNative.FfiConverterUInt32.lower(cetLockTime), _uniffiBindgenReactNative.FfiConverterUInt64.lower(fundOutputSerialId), callStatus);
   }, /*liftString:*/FfiConverterString.lift));
 }
-function createXprivFromParentPath(xpriv, baseDerivationPath, network, path) /*throws*/{
+function createXprivFromParentPath(seedOrXpriv, baseDerivationPath, network, path) /*throws*/{
   return FfiConverterArrayUInt8.lift(uniffiCaller.rustCallWithError(/*liftError:*/FfiConverterTypeDLCError.lift.bind(FfiConverterTypeDLCError), /*caller:*/callStatus => {
     return (() => {
       console.debug(`-- uniffi_ddk_ffi_fn_func_create_xpriv_from_parent_path`);
       return (0, _ddk_ffiFfi.default)().ubrn_uniffi_ddk_ffi_fn_func_create_xpriv_from_parent_path;
-    })()(FfiConverterArrayUInt8.lower(xpriv), FfiConverterString.lower(baseDerivationPath), FfiConverterString.lower(network), FfiConverterString.lower(path), callStatus);
+    })()(FfiConverterArrayUInt8.lower(seedOrXpriv), FfiConverterString.lower(baseDerivationPath), FfiConverterString.lower(network), FfiConverterString.lower(path), callStatus);
   }, /*liftString:*/FfiConverterString.lift));
 }
 function getChangeOutputAndFees(params, feeRate) /*throws*/{
@@ -141,6 +160,14 @@ function getChangeOutputAndFees(params, feeRate) /*throws*/{
     })()(FfiConverterTypePartyParams.lower(params), _uniffiBindgenReactNative.FfiConverterUInt64.lower(feeRate), callStatus);
   }, /*liftString:*/FfiConverterString.lift));
 }
+function getPubkeyFromExtkey(extkey, network) /*throws*/{
+  return FfiConverterArrayUInt8.lift(uniffiCaller.rustCallWithError(/*liftError:*/FfiConverterTypeDLCError.lift.bind(FfiConverterTypeDLCError), /*caller:*/callStatus => {
+    return (() => {
+      console.debug(`-- uniffi_ddk_ffi_fn_func_get_pubkey_from_extkey`);
+      return (0, _ddk_ffiFfi.default)().ubrn_uniffi_ddk_ffi_fn_func_get_pubkey_from_extkey;
+    })()(FfiConverterArrayUInt8.lower(extkey), FfiConverterString.lower(network), callStatus);
+  }, /*liftString:*/FfiConverterString.lift));
+}
 function getRawFundingTransactionInputSignature(fundingTransaction, privkey, prevTxId, prevTxVout, value) /*throws*/{
   return FfiConverterArrayUInt8.lift(uniffiCaller.rustCallWithError(/*liftError:*/FfiConverterTypeDLCError.lift.bind(FfiConverterTypeDLCError), /*caller:*/callStatus => {
     return (() => {
@@ -1235,6 +1262,12 @@ function uniffiEnsureInitialized() {
   if ((0, _ddk_ffiFfi.default)().ubrn_uniffi_ddk_ffi_checksum_func_create_dlc_transactions() !== 29518) {
     throw new _uniffiBindgenReactNative.UniffiInternalError.ApiChecksumMismatch('uniffi_ddk_ffi_checksum_func_create_dlc_transactions');
   }
+  if ((0, _ddk_ffiFfi.default)().ubrn_uniffi_ddk_ffi_checksum_func_create_extkey_from_parent_path() !== 26671) {
+    throw new _uniffiBindgenReactNative.UniffiInternalError.ApiChecksumMismatch('uniffi_ddk_ffi_checksum_func_create_extkey_from_parent_path');
+  }
+  if ((0, _ddk_ffiFfi.default)().ubrn_uniffi_ddk_ffi_checksum_func_create_extkey_from_seed() !== 12526) {
+    throw new _uniffiBindgenReactNative.UniffiInternalError.ApiChecksumMismatch('uniffi_ddk_ffi_checksum_func_create_extkey_from_seed');
+  }
   if ((0, _ddk_ffiFfi.default)().ubrn_uniffi_ddk_ffi_checksum_func_create_fund_tx_locking_script() !== 2761) {
     throw new _uniffiBindgenReactNative.UniffiInternalError.ApiChecksumMismatch('uniffi_ddk_ffi_checksum_func_create_fund_tx_locking_script');
   }
@@ -1244,12 +1277,15 @@ function uniffiEnsureInitialized() {
   if ((0, _ddk_ffiFfi.default)().ubrn_uniffi_ddk_ffi_checksum_func_create_spliced_dlc_transactions() !== 19497) {
     throw new _uniffiBindgenReactNative.UniffiInternalError.ApiChecksumMismatch('uniffi_ddk_ffi_checksum_func_create_spliced_dlc_transactions');
   }
-  if ((0, _ddk_ffiFfi.default)().ubrn_uniffi_ddk_ffi_checksum_func_create_xpriv_from_parent_path() !== 50010) {
+  if ((0, _ddk_ffiFfi.default)().ubrn_uniffi_ddk_ffi_checksum_func_create_xpriv_from_parent_path() !== 34808) {
     throw new _uniffiBindgenReactNative.UniffiInternalError.ApiChecksumMismatch('uniffi_ddk_ffi_checksum_func_create_xpriv_from_parent_path');
   }
   if ((0, _ddk_ffiFfi.default)().ubrn_uniffi_ddk_ffi_checksum_func_get_change_output_and_fees() !== 44150) {
     throw new _uniffiBindgenReactNative.UniffiInternalError.ApiChecksumMismatch('uniffi_ddk_ffi_checksum_func_get_change_output_and_fees');
   }
+  if ((0, _ddk_ffiFfi.default)().ubrn_uniffi_ddk_ffi_checksum_func_get_pubkey_from_extkey() !== 64637) {
+    throw new _uniffiBindgenReactNative.UniffiInternalError.ApiChecksumMismatch('uniffi_ddk_ffi_checksum_func_get_pubkey_from_extkey');
+  }
   if ((0, _ddk_ffiFfi.default)().ubrn_uniffi_ddk_ffi_checksum_func_get_raw_funding_transaction_input_signature() !== 35708) {
     throw new _uniffiBindgenReactNative.UniffiInternalError.ApiChecksumMismatch('uniffi_ddk_ffi_checksum_func_get_raw_funding_transaction_input_signature');
   }