frost/bdk
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to at least bitcoin ^0.25.2

Browse Source 
And fix the fallout.
This commit is contained in:
LLFourn 2020-11-23 15:06:13 +11:00
parent 196c2f5450
commit d2490d9ce3
No known key found for this signature in database
GPG Key ID: A27093B54DA11F65
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -7,8 +7,8 @@ authors = ["Alekos Filini <alekos.filini@gmail.com>", "Riccardo Casatta <riccard
[dependencies] [dependencies]
bdk-macros = { version = "0.1.0-beta.1", path = "./macros" } bdk-macros = { version = "0.1.0-beta.1", path = "./macros" }
log = "^0.4" log = "^0.4"
bitcoin = { version = "0.25", features = ["use-serde"] }
miniscript = { git = "https://github.com/rust-bitcoin/rust-miniscript.git", rev = "ca60da2" } miniscript = { git = "https://github.com/rust-bitcoin/rust-miniscript.git", rev = "ca60da2" }
bitcoin = { version = "^0.25.2", features = ["use-serde"] }
serde = { version = "^1.0", features = ["derive"] } serde = { version = "^1.0", features = ["derive"] }
serde_json = { version = "^1.0" } serde_json = { version = "^1.0" }
rand = "^0.7" rand = "^0.7"

8
src/descriptor/mod.rs
View File

@ -462,7 +462,13 @@ impl DescriptorMeta for Descriptor<DescriptorPublicKey> {
{ {
Some(self.clone()) Some(self.clone())
} }
Descriptor::Bare(ms) | Descriptor::Sh(ms) Descriptor::Bare(ms)
if psbt_input.redeem_script.is_some()
&& &ms.encode(deriv_ctx) == psbt_input.redeem_script.as_ref().unwrap() =>
{
Some(self.clone())
}
Descriptor::Sh(ms)
if psbt_input.redeem_script.is_some() if psbt_input.redeem_script.is_some()
&& &ms.encode(deriv_ctx) == psbt_input.redeem_script.as_ref().unwrap() => && &ms.encode(deriv_ctx) == psbt_input.redeem_script.as_ref().unwrap() =>
{ {

5
src/descriptor/policy.rs
View File

@ -820,9 +820,8 @@ impl ExtractPolicy for Descriptor<DescriptorPublicKey> {
| Descriptor::Pkh(pubkey) | Descriptor::Pkh(pubkey)
| Descriptor::Wpkh(pubkey) | Descriptor::Wpkh(pubkey)
| Descriptor::ShWpkh(pubkey) => Ok(Some(signature(pubkey, signers, secp))), | Descriptor::ShWpkh(pubkey) => Ok(Some(signature(pubkey, signers, secp))),
Descriptor::Bare(inner) | Descriptor::Sh(inner) => { Descriptor::Bare(inner) => Ok(inner.extract_policy(signers, secp)?),
Ok(inner.extract_policy(signers, secp)?) Descriptor::Sh(inner) => Ok(inner.extract_policy(signers, secp)?),
}
Descriptor::Wsh(inner) | Descriptor::ShWsh(inner) => { Descriptor::Wsh(inner) | Descriptor::ShWsh(inner) => {
Ok(inner.extract_policy(signers, secp)?) Ok(inner.extract_policy(signers, secp)?)
} }