Merge pull request #225 from apoelstra/2021--rust-bitcoin-0.26

release 5.0, increase rust-bitcoin dep to 0.26

Author: heap-coder

CHANGELOG.md

@@ -1,3 +1,14 @@
+# 5.0.0 - Jan 14, 2021
+
+- Remove `PkCtx` from the API
+- Move descriptors into their own types, with an enum containing all of them
+- Move descriptor functionality into a trait
+- Remove `FromStr` bound from `MiniscriptKey`and `MiniscriptKey::Hash`
+- Various `DescriptorPublicKey` improvements
+- Allow hardened paths in `DescriptorPublicKey`, remove direct `ToPublicKey` implementation
+- Change `Option` to `Result` in all APIs
+- bump `rust-bitcoin` to 0.26
+
 # 4.0.0 - Nov 23, 2020
 
 - Add support for parsing secret keys

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "miniscript"
-version = "4.0.3"
+version = "5.0.0"
 authors = ["Andrew Poelstra <[email protected]>, Sanket Kanjalkar <[email protected]>"]
 repository = "https://github.com/apoelstra/miniscript"
 description = "Miniscript: a subset of Bitcoin Script designed for analysis"
@@ -16,7 +16,7 @@ use-serde = ["bitcoin/use-serde", "serde"]
 rand = ["bitcoin/rand"]
 
 [dependencies]
-bitcoin = "0.25"
+bitcoin = "0.26"
 
 [dependencies.serde]
 version = "1.0"

src/descriptor/key.rs

@@ -360,7 +360,10 @@ impl DescriptorPublicKey {
                     fingerprint
                 } else {
                     let mut engine = XpubIdentifier::engine();
-                    single.key.write_into(&mut engine);
+                    single
+                        .key
+                        .write_into(&mut engine)
+                        .expect("engines don't error");
                     bip32::Fingerprint::from(&XpubIdentifier::from_engine(engine)[..])
                 }
             }

src/lib.rs

@@ -165,7 +165,7 @@ impl MiniscriptKey for bitcoin::PublicKey {
 
     fn to_pubkeyhash(&self) -> Self::Hash {
         let mut engine = hash160::Hash::engine();
-        self.write_into(&mut engine);
+        self.write_into(&mut engine).expect("engines don't error");
         hash160::Hash::from_engine(engine)
     }
 }

src/psbt/finalizer.rs

@@ -317,7 +317,7 @@ pub fn finalize<C: secp256k1::Verification>(
         input.partial_sigs.clear();
         input.sighash_type = None;
         input.redeem_script = None;
-        input.hd_keypaths.clear();
+        input.bip32_derivation.clear();
         input.witness_script = None;
     }
     // Double check everything with the interpreter