@bennyblader/ddk-rn 0.3.16 → 0.3.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ddk-ffi/Cargo.lock +1 -1
- package/ddk-ffi/Cargo.toml +1 -1
- package/ddk-ffi/src/lib.rs +12 -8
- package/package.json +1 -1
package/ddk-ffi/Cargo.lock
CHANGED
package/ddk-ffi/Cargo.toml
CHANGED
package/ddk-ffi/src/lib.rs
CHANGED
|
@@ -628,7 +628,7 @@ pub fn verify_fund_tx_signature(
|
|
|
628
628
|
let script = bitcoin::ScriptBuf::new_p2wpkh(&wpkh);
|
|
629
629
|
|
|
630
630
|
// Parse signature
|
|
631
|
-
let sig = EcdsaSignature::
|
|
631
|
+
let sig = EcdsaSignature::from_der(&signature).map_err(|_| DLCError::InvalidSignature)?;
|
|
632
632
|
|
|
633
633
|
let secp = Secp256k1::verification_only();
|
|
634
634
|
match dlc::verify_tx_input_sig(
|
|
@@ -1592,13 +1592,17 @@ mod tests {
|
|
|
1592
1592
|
let secp = get_secp_context();
|
|
1593
1593
|
let btc_txn = transaction_to_btc_tx(&tx)?;
|
|
1594
1594
|
let script = ScriptBuf::from_bytes(script_pubkey);
|
|
1595
|
-
let
|
|
1596
|
-
dlc::util::get_sig_hash_msg(&btc_txn, input_index, &script, Amount::from_sat(value))?;
|
|
1597
|
-
let sig =
|
|
1598
|
-
EcdsaSignature::from_compact(&signature).map_err(|_| DLCError::InvalidSignature)?;
|
|
1595
|
+
let sig = EcdsaSignature::from_der(&signature).map_err(|_| DLCError::InvalidSignature)?;
|
|
1599
1596
|
let pk = PublicKey::from_slice(&pk).map_err(|_| DLCError::InvalidPublicKey)?;
|
|
1600
|
-
|
|
1601
|
-
|
|
1597
|
+
dlc::verify_tx_input_sig(
|
|
1598
|
+
secp,
|
|
1599
|
+
&sig,
|
|
1600
|
+
&btc_txn,
|
|
1601
|
+
input_index,
|
|
1602
|
+
&script,
|
|
1603
|
+
Amount::from_sat(value),
|
|
1604
|
+
&pk,
|
|
1605
|
+
)?;
|
|
1602
1606
|
Ok(())
|
|
1603
1607
|
}
|
|
1604
1608
|
|
|
@@ -1751,7 +1755,7 @@ mod tests {
|
|
|
1751
1755
|
)));
|
|
1752
1756
|
sign_res.expect("Error signing CET");
|
|
1753
1757
|
verify_tx_input_sig(
|
|
1754
|
-
adapted_sig.
|
|
1758
|
+
adapted_sig.serialize_der().to_vec(),
|
|
1755
1759
|
cets[0].clone(),
|
|
1756
1760
|
0,
|
|
1757
1761
|
funding_script_pubkey.clone().into_bytes(),
|