From: Lloyd Fournier <LLFourn@users.noreply.github.com>
Date: Sat, 23 Jan 2021 06:36:01 +0000 (+1100)
Subject: Merge branch 'master' into make_txbuilder_take_ref_to_wallet
X-Git-Tag: v0.4.0~27
X-Git-Url: http://internal-gitweb-vhost/%22https:/parse/scripts/database/-script/-debug/struct.ScriptPath.html?a=commitdiff_plain;h=33426d4c3a4e30275e2ccb582f3477c520fbaa7a;p=bdk

Merge branch 'master' into make_txbuilder_take_ref_to_wallet
---

33426d4c3a4e30275e2ccb582f3477c520fbaa7a
diff --cc CHANGELOG.md
index 0dd29e75,1b1108de..491db6ed
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -19,17 -19,7 +19,18 @@@ and this project adheres to [Semantic V
  #### Changed
  - Remove `BlockchainMarker`, `OfflineClient` and `OfflineWallet` in favor of just using the unit
    type to mark for a missing client.
+ - Upgrade `tokio` to `1.0`.
 +  
 +#### Transaction Creation Overhaul
 +
 +The `TxBuilder` is now created from the `build_tx` or `build_fee_bump` functions on wallet and the
 +final transaction is created by calling `finish` on the builder.
 +
 +- Removed `TxBuilder::utxos` in favor of repeatedly calling `add_utxo`
 +- Added `Wallet::build_tx` to replace `Wallet::create_tx`
 +- Added `Wallet::build_fee_bump` to replace `Wallet::bump_fee`
 +- Added `Wallet::get_utxo`
 +- Added `Wallet::get_descriptor_for_keychain`
  
  ### CLI
  #### Changed