Fail on witness failures

sanket1729 · sanket1729 · commit fde425f23c30 · 2020-11-18T17:43:08.000-06:00
diff --git a/src/miniscript/mod.rs b/src/miniscript/mod.rs
@@ -303,7 +303,13 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Miniscript<Pk, Ctx> {
         match satisfy::Satisfaction::satisfy(&self.node, &satisfier, self.ty.mall.safe, to_pk_ctx)
             .stack
         {
-            satisfy::Witness::Stack(stack) => Some(stack),
+            satisfy::Witness::Stack(stack) => {
+                if Ctx::check_witness::<Pk, Ctx>(&stack).is_err() {
+                    None
+                } else {
+                    Some(stack)
+                }
+            }
             satisfy::Witness::Unavailable | satisfy::Witness::Impossible => None,
         }
     }
@@ -326,7 +332,13 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Miniscript<Pk, Ctx> {
         )
         .stack
         {
-            satisfy::Witness::Stack(stack) => Some(stack),
+            satisfy::Witness::Stack(stack) => {
+                if Ctx::check_witness::<Pk, Ctx>(&stack).is_err() {
+                    None
+                } else {
+                    Some(stack)
+                }
+            }
             satisfy::Witness::Unavailable | satisfy::Witness::Impossible => None,
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,13 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Miniscript<Pk, Ctx> {`
`303`	`303`	`match satisfy::Satisfaction::satisfy(&self.node, &satisfier, self.ty.mall.safe, to_pk_ctx)`
`304`	`304`	`.stack`
`305`	`305`	`{`
`306`		`- satisfy::Witness::Stack(stack) => Some(stack),`
	`306`	`+ satisfy::Witness::Stack(stack) => {`
	`307`	`+ if Ctx::check_witness::<Pk, Ctx>(&stack).is_err() {`
	`308`	`+ None`
	`309`	`+ } else {`
	`310`	`+ Some(stack)`
	`311`	`+ }`
	`312`	`+ }`
`307`	`313`	`satisfy::Witness::Unavailable \| satisfy::Witness::Impossible => None,`
`308`	`314`	`}`
`309`	`315`	`}`
`@@ -326,7 +332,13 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Miniscript<Pk, Ctx> {`
`326`	`332`	`)`
`327`	`333`	`.stack`
`328`	`334`	`{`
`329`		`- satisfy::Witness::Stack(stack) => Some(stack),`
	`335`	`+ satisfy::Witness::Stack(stack) => {`
	`336`	`+ if Ctx::check_witness::<Pk, Ctx>(&stack).is_err() {`
	`337`	`+ None`
	`338`	`+ } else {`
	`339`	`+ Some(stack)`
	`340`	`+ }`
	`341`	`+ }`
`330`	`342`	`satisfy::Witness::Unavailable \| satisfy::Witness::Impossible => None,`
`331`	`343`	`}`
`332`	`344`	`}`