New miniscript compiler

Author: sanket1729

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "miniscript"
-version = "0.6.0"
+version = "0.7.0"
 authors = ["Andrew Poelstra <apoelstra@wpsoftware.net>"]
 repository = "https://github.com/apoelstra/miniscript"
 description = "Miniscript: a subset of Bitcoin Script designed for analysis"

examples/compiler.rs

@@ -12,16 +12,17 @@ fn do_test(data: &[u8]) {
     let data_str = String::from_utf8_lossy(data);
     if let Ok(pol) = DummyPolicy::from_str(&data_str) {
         // Compile
-        let desc = pol.compile();
-        // Lift
-        assert_eq!(desc.clone().lift(), pol.clone().lift());
-        // Try to roundtrip the output of the compiler
-        let output = desc.to_string();
-        if let Ok(desc) = DummyScript::from_str(&output) {
-            let rtt = desc.to_string();
-            assert_eq!(output, rtt);
-        } else {
-            panic!("compiler output something unparseable: {}", output)
+        if let Ok(desc) = pol.compile() {
+            // Lift
+            assert_eq!(desc.clone().lift(), pol.clone().lift());
+            // Try to roundtrip the output of the compiler
+            let output = desc.to_string();
+            if let Ok(desc) = DummyScript::from_str(&output) {
+                let rtt = desc.to_string();
+                assert_eq!(output, rtt);
+            } else {
+                panic!("compiler output something unparseable: {}", output)
+            }
         }
     }
 }

fuzz/fuzz_targets/compile_descriptor.rs

@@ -307,6 +307,9 @@ pub enum Error {
     BadDescriptor,
     ///Forward-secp related errors
     Secp(secp256k1::Error),
+    #[cfg(feature = "compiler")]
+    ///Compiler related errors
+    CompilerError(policy::compiler::CompilerError),
     ///Interpreter related errors
     InterpreterError(descriptor::InterpreterError),
     /// Bad Script Sig. As per standardness rules, only pushes are allowed in
@@ -395,6 +398,8 @@ impl fmt::Display for Error {
             Error::BadDescriptor => f.write_str("could not create a descriptor"),
             Error::Secp(ref e) => fmt::Display::fmt(e, f),
             Error::InterpreterError(ref e) => fmt::Display::fmt(e, f),
+            #[cfg(feature = "compiler")]
+            Error::CompilerError(ref e) => fmt::Display::fmt(e, f),
             Error::BadScriptSig => f.write_str("Script sig must only consist of pushes"),
             Error::NonEmptyWitness => f.write_str("Non empty witness for Pk/Pkh"),
             Error::NonEmptyScriptSig => f.write_str("Non empty script sig for segwit spend"),
@@ -415,6 +420,14 @@ impl From<psbt::Error> for Error {
     }
 }
 
+#[doc(hidden)]
+#[cfg(feature = "compiler")]
+impl From<policy::compiler::CompilerError> for Error {
+    fn from(e: policy::compiler::CompilerError) -> Error {
+        Error::CompilerError(e)
+    }
+}
+
 /// The size of an encoding of a number in Script
 pub fn script_num_size(n: usize) -> usize {
     match n {

src/lib.rs

@@ -489,7 +489,7 @@ impl<Pk: MiniscriptKey + ToPublicKey> Satisfiable<Pk> for Terminal<Pk> {
     }
 }
 
-impl<Pk: MiniscriptKey> Dissatisfiable<Pk> for Terminal<Pk> {
+impl<Pk: MiniscriptKey + ToPublicKey> Dissatisfiable<Pk> for Terminal<Pk> {
     fn dissatisfy<S: Satisfier<Pk>>(&self, satisfier: &S) -> Option<Vec<Vec<u8>>> {
         match *self {
             Terminal::Pk(..) => Some(vec![vec![]]),