Update to latest 'bdk' commit

diff --git a/Cargo.toml b/Cargo.toml
index 70fd6ddfe9a0150a922678a47b3900db6d3c9de5..1e09f81ac390d000224fbec70a6b12d544d12694 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,8 +12,8 @@ readme = "README.md"
 license = "MIT"
 
 [dependencies]
-bdk = { git = "https://github.com/bitcoindevkit/bdk.git", commit = "4c36020e", features = ["all-keys"]}
-bdk-macros = { git = "https://github.com/bitcoindevkit/bdk.git", commit = "4c36020e" }
+bdk = { git = "https://github.com/bitcoindevkit/bdk.git", rev = "c4f2179", features = ["all-keys"]}
+bdk-macros = { git = "https://github.com/bitcoindevkit/bdk.git", rev = "c4f2179" }
 structopt = "^0.3"
 serde_json = { version = "^1.0" }
 log = "^0.4"

diff --git a/src/lib.rs b/src/lib.rs
index 49232f4affb979cb5c714bf8522624e9b6d33f99..75089f4c7c80a74b584ec3a80027d1ed5e76cdbc 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -760,7 +760,7 @@ feature to create keys that secure actual funds on the Bitcoin mainnet.
 #[derive(Debug, StructOpt, Clone, PartialEq)]
 #[structopt(rename_all = "snake")]
 pub enum KeySubCommand {
-    /// Generates new random seed mnemonic phrase and corresponding master extended keys
+    /// Generates new random seed mnemonic phrase and corresponding master extended key
     Generate {
         /// Entropy level based on number of random seed mnemonic words
         #[structopt(
@@ -775,7 +775,7 @@ pub enum KeySubCommand {
         #[structopt(name = "PASSWORD", short = "p", long = "password")]
         password: Option<String>,
     },
-    /// Restore a master extended keys from seed backup mnemonic words
+    /// Restore a master extended key from seed backup mnemonic words
     Restore {
         /// Seed mnemonic words, must be quoted (eg. "word1 word2 ...")
         #[structopt(name = "MNEMONIC", short = "m", long = "mnemonic")]
@@ -804,7 +804,7 @@ pub fn handle_key_subcommand(
                 12 => MnemonicType::Words12,
                 _ => MnemonicType::Words24,
             };
-            let mnemonic: GeneratedKey<_, miniscript::Bare> =
+            let mnemonic: GeneratedKey<_, miniscript::BareCtx> =
                 Mnemonic::generate((mnemonic_type, Language::English)).unwrap();
             //.map_err(|e| KeyError::from(e.unwrap()))?;
             let mnemonic = mnemonic.into_key();