Fix to at least bitcoin ^0.25.2

And fix the fallout.
2020-11-23 15:06:13 +11:00
parent 196c2f5450
commit d2490d9ce3
3 changed files with 10 additions and 5 deletions
--- a/src/descriptor/mod.rs
+++ b/src/descriptor/mod.rs
@@ -462,7 +462,13 @@ impl DescriptorMeta for Descriptor<DescriptorPublicKey> {
            {
                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()
                    && &ms.encode(deriv_ctx) == psbt_input.redeem_script.as_ref().unwrap() =>
            {