From 39eea6153879c09e7dfe8605eb6f038163480f0e Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Mon, 19 Apr 2021 10:14:14 +1000
Subject: [PATCH] Upgrade to bdk 0.6

---
 Cargo.lock                 | 5 +++--
 swap/Cargo.toml            | 2 +-
 swap/src/bitcoin/wallet.rs | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d49073ba..d3609319 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -279,8 +279,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
 [[package]]
 name = "bdk"
-version = "0.5.2-dev"
-source = "git+https://github.com/bitcoindevkit/bdk.git?rev=e5ecc7f#e5ecc7f5410aea9d7a108a46d01c7a2fa0822bb7"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51dcf686dfc6200d641e8619019c027976533b7e2d5c00de2b4182c88287a18b"
 dependencies = [
  "async-trait",
  "bdk-macros",
diff --git a/swap/Cargo.toml b/swap/Cargo.toml
index a62a9058..7d5e4dc0 100644
--- a/swap/Cargo.toml
+++ b/swap/Cargo.toml
@@ -15,7 +15,7 @@ async-trait = "0.1"
 atty = "0.2"
 backoff = { version = "0.3", features = ["tokio"] }
 base64 = "0.13"
-bdk = { git = "https://github.com/bitcoindevkit/bdk.git", rev = "e5ecc7f" }
+bdk = "0.6"
 big-bytes = "1"
 bitcoin = { version = "0.26", features = ["rand", "use-serde"] }
 bmrng = "0.5"
diff --git a/swap/src/bitcoin/wallet.rs b/swap/src/bitcoin/wallet.rs
index 09033edc..a5efa20f 100644
--- a/swap/src/bitcoin/wallet.rs
+++ b/swap/src/bitcoin/wallet.rs
@@ -43,8 +43,8 @@ impl Wallet {
         let db = bdk::sled::open(wallet_dir)?.open_tree(SLED_TREE_NAME)?;
 
         let wallet = bdk::Wallet::new(
-            bdk::template::BIP84(key.clone(), KeychainKind::External),
-            Some(bdk::template::BIP84(key, KeychainKind::Internal)),
+            bdk::template::Bip84(key.clone(), KeychainKind::External),
+            Some(bdk::template::Bip84(key, KeychainKind::Internal)),
             env_config.bitcoin_network,
             db,
             ElectrumBlockchain::from(client),