@bennyblader/ddk-rn 0.3.15 → 0.3.17
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 +6 -6
- 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(
|
|
@@ -680,17 +680,18 @@ pub fn get_raw_funding_transaction_input_signature(
|
|
|
680
680
|
let wpkh = WPubkeyHash::hash(&pk.serialize());
|
|
681
681
|
let script = bitcoin::ScriptBuf::new_p2wpkh(&wpkh);
|
|
682
682
|
|
|
683
|
-
let sig = dlc::util::
|
|
683
|
+
let sig = dlc::util::get_sig_for_tx_input(
|
|
684
684
|
secp,
|
|
685
685
|
&btc_tx,
|
|
686
686
|
input_index,
|
|
687
687
|
&script,
|
|
688
688
|
Amount::from_sat(value),
|
|
689
|
+
EcdsaSighashType::All,
|
|
689
690
|
&sk,
|
|
690
691
|
)
|
|
691
692
|
.map_err(DLCError::from)?;
|
|
692
693
|
|
|
693
|
-
Ok(sig
|
|
694
|
+
Ok(sig)
|
|
694
695
|
}
|
|
695
696
|
|
|
696
697
|
/// Sign a funding transaction input
|
|
@@ -1593,8 +1594,7 @@ mod tests {
|
|
|
1593
1594
|
let script = ScriptBuf::from_bytes(script_pubkey);
|
|
1594
1595
|
let sig_hash_msg =
|
|
1595
1596
|
dlc::util::get_sig_hash_msg(&btc_txn, input_index, &script, Amount::from_sat(value))?;
|
|
1596
|
-
let sig =
|
|
1597
|
-
EcdsaSignature::from_compact(&signature).map_err(|_| DLCError::InvalidSignature)?;
|
|
1597
|
+
let sig = EcdsaSignature::from_der(&signature).map_err(|_| DLCError::InvalidSignature)?;
|
|
1598
1598
|
let pk = PublicKey::from_slice(&pk).map_err(|_| DLCError::InvalidPublicKey)?;
|
|
1599
1599
|
secp.verify_ecdsa(&sig_hash_msg, &sig, &pk)
|
|
1600
1600
|
.map_err(|_| DLCError::InvalidSignature)?;
|
|
@@ -1750,7 +1750,7 @@ mod tests {
|
|
|
1750
1750
|
)));
|
|
1751
1751
|
sign_res.expect("Error signing CET");
|
|
1752
1752
|
verify_tx_input_sig(
|
|
1753
|
-
adapted_sig.
|
|
1753
|
+
adapted_sig.serialize_der().to_vec(),
|
|
1754
1754
|
cets[0].clone(),
|
|
1755
1755
|
0,
|
|
1756
1756
|
funding_script_pubkey.clone().into_bytes(),
|