Merge branch 'master' into release/0.18.0

diff --cc CHANGELOG.md
index 6c439c605742a98ac03072dd8e123ff21a8c8530,cb0897417ee4e52b4950680883af5fb51f75389d..7ba0d603420890a31f8c004ef5735f1ea900ded3
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -13,7 -9,7 +13,8 @@@ and this project adheres to [Semantic V
  - Add `sqlite-bundled` feature for deployments that need a bundled version of sqlite, ie. for mobile platforms.
  - Added `Wallet::get_signers()`, `Wallet::descriptor_checksum()` and `Wallet::get_address_validators()`, exposed the `AsDerived` trait.
  - Deprecate `database::Database::flush()`, the function is only needed for the sled database on mobile, instead for mobile use the sqlite database.
 +- Add `keychain: KeychainKind` to `wallet::AddressInfo`.
+ - Improve key generation traits
  
  ## [v0.17.0] - [v0.16.1]
  
@@@ -446,5 -442,4 +447,5 @@@ final transaction is created by callin
  [v0.16.0]: https://github.com/bitcoindevkit/bdk/compare/v0.15.0...v0.16.0
  [v0.16.1]: https://github.com/bitcoindevkit/bdk/compare/v0.16.0...v0.16.1
  [v0.17.0]: https://github.com/bitcoindevkit/bdk/compare/v0.16.1...v0.17.0
 -[unreleased]: https://github.com/bitcoindevkit/bdk/compare/v0.17.0...HEAD
 +[v0.18.0]: https://github.com/bitcoindevkit/bdk/compare/v0.17.0...v0.18.0
- [unreleased]: https://github.com/bitcoindevkit/bdk/compare/v0.18.0...HEAD
++[unreleased]: https://github.com/bitcoindevkit/bdk/compare/v0.18.0...HEAD