Merge branch 'master' of https://github.com/apoelstra/rust-miniscript

Author: sanket1729

examples/htlc.rs

@@ -35,7 +35,7 @@ fn main() {
 
     assert_eq!(
         format!("{}", htlc_descriptor),
-        "wsh(andor(pk(022222222222222222222222222222222222222222222222222222222222222222),sha256(1111111111111111111111111111111111111111111111111111111111111111),and_v(vc:pk_h(4377a5acd66dc5cb67148a24818d1e51fa183bd2),older(4444))))"
+        "wsh(andor(pk(022222222222222222222222222222222222222222222222222222222222222222),sha256(1111111111111111111111111111111111111111111111111111111111111111),and_v(v:pkh(4377a5acd66dc5cb67148a24818d1e51fa183bd2),older(4444))))"
     );
 
     assert_eq!(

src/descriptor/mod.rs

@@ -565,7 +565,7 @@ mod tests {
     fn roundtrip_descriptor(s: &str) {
         let desc = Descriptor::<DummyKey>::from_str(&s).unwrap();
         let output = desc.to_string();
-        let normalize_aliases = s.replace("c:pk_k(", "pk(");
+        let normalize_aliases = s.replace("c:pk_k(", "pk(").replace("c:pk_h(", "pkh(");
         assert_eq!(normalize_aliases, output);
     }
 
@@ -574,6 +574,7 @@ mod tests {
         roundtrip_descriptor("c:pk_k()");
         roundtrip_descriptor("wsh(pk())");
         roundtrip_descriptor("wsh(c:pk_k())");
+        roundtrip_descriptor("c:pk_h()");
     }
     #[test]
     fn parse_descriptor() {

src/miniscript/astelem.rs

@@ -301,6 +301,9 @@ impl<Pk: MiniscriptKey> fmt::Display for Terminal<Pk> {
                         if let Terminal::PkK(ref pk) = sub.node {
                             // alias: pk(K) = c:pk_k(K)
                             return write!(f, "pk({})", pk);
+                        } else if let Terminal::PkH(ref pkh) = sub.node {
+                            // alias: pkh(K) = c:pk_h(K)
+                            return write!(f, "pkh({})", pkh);
                         }
                     }
 
@@ -314,6 +317,8 @@ impl<Pk: MiniscriptKey> fmt::Display for Terminal<Pk> {
                         Some(('c', ms)) => {
                             if let Terminal::PkK(ref _pk) = ms.node {
                                 fmt::Write::write_char(f, ':')?;
+                            } else if let Terminal::PkH(ref _pkh) = ms.node {
+                                fmt::Write::write_char(f, ':')?;
                             }
                         }
                         _ => {}
@@ -345,7 +350,7 @@ where
     <<Pk as MiniscriptKey>::Hash as str::FromStr>::Err: ToString,
 {
     fn from_tree(top: &expression::Tree) -> Result<Terminal<Pk>, Error> {
-        let aliased_wrap;
+        let mut aliased_wrap;
         let frag_name;
         let frag_wrap;
         let mut name_split = top.name.split(':');
@@ -358,6 +363,9 @@ where
                 if name == "pk" {
                     frag_name = "pk_k";
                     frag_wrap = "c";
+                } else if name == "pkh" {
+                    frag_name = "pk_h";
+                    frag_wrap = "c";
                 } else {
                     frag_name = name;
                     frag_wrap = "";
@@ -369,7 +377,13 @@ where
                 }
                 if name == "pk" {
                     frag_name = "pk_k";
-                    aliased_wrap = wrap.to_owned() + &"c";
+                    aliased_wrap = wrap.to_owned();
+                    aliased_wrap.push_str("c");
+                    frag_wrap = &aliased_wrap;
+                } else if name == "pkh" {
+                    frag_name = "pk_h";
+                    aliased_wrap = wrap.to_owned();
+                    aliased_wrap.push_str("c");
                     frag_wrap = &aliased_wrap;
                 } else {
                     frag_name = name;

src/miniscript/mod.rs

@@ -526,11 +526,7 @@ mod tests {
             ty: Type::cast_check(Type::from_pk_h()).unwrap(),
             ext: ExtData::cast_check(ExtData::from_pk_h()).unwrap(),
         };
-        string_rtt(
-            pkh_ms,
-            "[B/nduesm]c:[K/nduesm]pk_h(DummyKeyHash)",
-            "c:pk_h()",
-        );
+        string_rtt(pkh_ms, "[B/nduesm]c:[K/nduesm]pk_h(DummyKeyHash)", "pkh()");
 
         let pkk_ms: Miniscript<bitcoin::PublicKey> = Miniscript {
             node: Terminal::Check(Arc::new(Miniscript {
@@ -605,6 +601,32 @@ mod tests {
             "[B/onufsm]t[V/onfsm]v[B/onduesm]c:[K/onduesm]pk_k(PublicKey { compressed: true, key: PublicKey(aa4c32e50fb34a95a372940ae3654b692ea35294748c3dd2c08b29f87ba9288c8294efcb73dc719e45b91c45f084e77aebc07c1ff3ed8f37935130a36304a340) })",
             "tv:pk(028c28a97bf8298bc0d23d8c749452a32e694b65e30a9472a3954ab30fe5324caa)"
         );
+
+        let pubkey_hash =
+            hash160::Hash::from_str("f54a5851e9372b87810a8e60cdd2e7cfd80b6e31").unwrap();
+        let script: Miniscript<bitcoin::PublicKey> = ms_str!("c:pk_h({})", pubkey_hash.to_string());
+
+        string_rtt(
+            script,
+            "[B/nduesm]c:[K/nduesm]pk_h(f54a5851e9372b87810a8e60cdd2e7cfd80b6e31)",
+            "pkh(f54a5851e9372b87810a8e60cdd2e7cfd80b6e31)",
+        );
+
+        let script: Miniscript<bitcoin::PublicKey> = ms_str!("pkh({})", pubkey_hash.to_string());
+
+        string_rtt(
+            script,
+            "[B/nduesm]c:[K/nduesm]pk_h(f54a5851e9372b87810a8e60cdd2e7cfd80b6e31)",
+            "pkh(f54a5851e9372b87810a8e60cdd2e7cfd80b6e31)",
+        );
+
+        let script: Miniscript<bitcoin::PublicKey> = ms_str!("tv:pkh({})", pubkey_hash.to_string());
+
+        string_rtt(
+            script,
+            "[B/nufsm]t[V/nfsm]v[B/nduesm]c:[K/nduesm]pk_h(f54a5851e9372b87810a8e60cdd2e7cfd80b6e31)",
+            "tv:pkh(f54a5851e9372b87810a8e60cdd2e7cfd80b6e31)",
+        );
     }
 
     #[test]