@bennyblader/ddk-rn 0.3.17 → 0.3.19

package/ddk-ffi/Cargo.lock

@@ -282,7 +282,7 @@ checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 
 [[package]]
 name = "ddk_ffi"
-version = "0.3.17"
+version = "0.3.19"
 dependencies = [
  "bip39",
  "bitcoin",

package/ddk-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ddk_ffi"
-version = "0.3.17"
+version = "0.3.19"
 edition = "2021"
 license = "MIT"
 description = "rust-dlc language bindings"

package/ddk-ffi/src/lib.rs

@@ -800,7 +800,9 @@ pub fn sign_cet(
     let funding_sk = SecretKey::from_slice(&funding_secret_key)
         .map_err(|_| DLCError::InvalidArgument("Invalid funding secret key".to_string()))?;
     let other_pk = PublicKey::from_slice(&other_pubkey).map_err(|_| DLCError::InvalidPublicKey)?;
-    let funding_script = Script::from_bytes(&funding_script_pubkey);
+    let funding_pubkey =
+        PublicKey::from_slice(&funding_script_pubkey).map_err(|_| DLCError::InvalidPublicKey)?;
+    let dlc_redeem_script = dlc::make_funding_redeemscript(&funding_pubkey, &other_pk);
     let secp = get_secp_context();
 
     dlc::sign_cet(
@@ -810,7 +812,7 @@ pub fn sign_cet(
         &[oracle_sigs],
         &funding_sk,
         &other_pk,
-        funding_script,
+        dlc_redeem_script.as_script(),
         Amount::from_sat(fund_output_value),
     )
     .map_err(|e| DLCError::Secp256k1Error(e.to_string()))?;
@@ -1592,12 +1594,17 @@ mod tests {
         let secp = get_secp_context();
         let btc_txn = transaction_to_btc_tx(&tx)?;
         let script = ScriptBuf::from_bytes(script_pubkey);
-        let sig_hash_msg =
-            dlc::util::get_sig_hash_msg(&btc_txn, input_index, &script, Amount::from_sat(value))?;
         let sig = EcdsaSignature::from_der(&signature).map_err(|_| DLCError::InvalidSignature)?;
         let pk = PublicKey::from_slice(&pk).map_err(|_| DLCError::InvalidPublicKey)?;
-        secp.verify_ecdsa(&sig_hash_msg, &sig, &pk)
-            .map_err(|_| DLCError::InvalidSignature)?;
+        dlc::verify_tx_input_sig(
+            secp,
+            &sig,
+            &btc_txn,
+            input_index,
+            &script,
+            Amount::from_sat(value),
+            &pk,
+        )?;
         Ok(())
     }
 
@@ -1712,7 +1719,7 @@ mod tests {
             oracle_signatures[0].clone(),
             accept_fund_sk.secret_bytes().to_vec(),
             offer_party_params.fund_pubkey.clone(),
-            funding_script_pubkey.clone().into_bytes(),
+            accept_party_params.fund_pubkey.clone(),
             fund_output_value,
         );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bennyblader/ddk-rn",
-  "version": "0.3.17",
+  "version": "0.3.19",
   "description": "dlcdevkit bindings for react-native",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",