Merge #161: daemon: update rust-miniscript to 0.9

3224f08 daemon: update rust-miniscript to 0.9 (Antoine Poinsot)

Pull request description:

  This also updates the multipaths descriptor patch to the review PR rust-bitcoin/rust-miniscript#470 (rebased on 0.9)

  Fixes #123.

ACKs for top commit:
  darosior:
    self-ACK 3224f08 -- trivial.

Tree-SHA512: 03c8b181e96df8d73953cefadfbb090049859f01e6c8d03cf8417ad4d46795dc295b097f8df6c0f683fb9da03b78f39e824cb7768376d1d5718bdce177edcb6d

Author: darosior

Cargo.lock

@@ -25,8 +25,7 @@ jsonrpc_server = []
 
 [dependencies]
 # For managing transactions (it re-exports the bitcoin crate)
-# TODO: don't use my fork for a real release..
-miniscript = { git = "https://github.com/darosior/rust-miniscript", branch = "multipath_descriptors_on_8.0", features = ["serde"] }
+miniscript = { version = "9.0", features = ["serde"] }
 
 # Don't reinvent the wheel
 dirs = "3.0"
@@ -57,3 +56,6 @@ libc = "0.2"
 
 # Used for PSBTs
 base64 = "0.13"
+
+[patch.crates-io]
+miniscript = { git = "https://github.com/darosior/rust-miniscript", branch = "multipath_descriptors_on_9.0" }

Cargo.toml

@@ -190,12 +190,13 @@ fn is_valid_desc_key(key: &descriptor::DescriptorPublicKey) -> bool {
             false
         }
         descriptor::DescriptorPublicKey::MultiXPub(ref xpub) => {
+            let der_paths = xpub.derivation_paths.paths();
             // Rust-miniscript enforces BIP389 which states that all paths must have the same len.
-            let len = xpub.derivation_paths.get(0).expect("Cannot be empty").len();
+            let len = der_paths.get(0).expect("Cannot be empty").len();
             xpub.wildcard == descriptor::Wildcard::Unhardened
-                && xpub.derivation_paths.len() == 2
-                && xpub.derivation_paths[0][len - 1] == 0.into()
-                && xpub.derivation_paths[1][len - 1] == 1.into()
+                && der_paths.len() == 2
+                && der_paths[0][len - 1] == 0.into()
+                && der_paths[1][len - 1] == 1.into()
         }
     }
 }