From: Steve Myers <steve@notmandatory.org>
Date: Tue, 22 Feb 2022 01:47:09 +0000 (-0800)
Subject: Merge branch 'master' into verifcation-refactor
X-Git-Tag: v0.17.0~7^2
X-Git-Url: http://internal-gitweb-vhost/script/%22https:/database/error/enum.CreateTxError.html?a=commitdiff_plain;h=ad65dd5c235318a97d765d1e2a64c4aae64c3232;p=bdk

Merge branch 'master' into verifcation-refactor
---

ad65dd5c235318a97d765d1e2a64c4aae64c3232
diff --cc CHANGELOG.md
index 409bc50c,319c83cc..75801e01
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -6,8 -6,7 +6,9 @@@ and this project adheres to [Semantic V
  
  ## [Unreleased]
  
+ - Pin tokio dependency version to ~1.14 to prevent errors due to their new MSRV 1.49.0
 +- Removed default verification from `wallet::sync`. sync-time verification is added in `script_sync` and is activated by `verify` feature flag.
 +- `verify` flag removed from `TransactionDetails`.
  
  ## [v0.16.0] - [v0.15.0]