From c9ed8bdf6cedb5b1bf907c352144f98dbdba8b23 Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Fri, 24 Sep 2021 10:25:12 -0700 Subject: [PATCH 1/7] Bump version to 0.12.0-rc.1 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index ce4e40d5..92d06588 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bdk" -version = "0.11.1-dev" +version = "0.12.0-rc1" edition = "2018" authors = ["Alekos Filini ", "Riccardo Casatta "] homepage = "https://bitcoindevkit.org" From 1469a3487ab997c9a0eaf0618233048724155dcd Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Sun, 26 Sep 2021 18:51:03 -0700 Subject: [PATCH 2/7] Downgrade tiny-bip39 to version < 0.8 This is required until BDK MSRV is changed to 1.51 or we replace tiny-bip39 dependency. --- Cargo.toml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 92d06588..8c23b529 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,11 +32,12 @@ rocksdb = { version = "0.14", default-features = false, features = ["snappy"], o cc = { version = ">=1.0.64", optional = true } socks = { version = "0.3", optional = true } lazy_static = { version = "1.4", optional = true } -tiny-bip39 = { version = "^0.8", optional = true } -zeroize = { version = "<1.4.0", optional = true } -# 1.2 broke something so fix this until https://github.com/maciejhirsz/tiny-bip39/pull/29 is merged. -# (or we get rid of the tiny-bip39 dependency https://github.com/bitcoindevkit/bdk/issues/399) -zeroize_derive = { version = "~1.1.0", optional = true } + +# the latest 0.8 version of tiny-bip39 depends on zeroize_derive 1.2 which has MSRV 1.51 and our +# MSRV is 1.46, to fix this until we update our MSRV or replace the tiny-bip39 +# dependency https://github.com/bitcoindevkit/bdk/issues/399 we can only use an older version +tiny-bip39 = { version = "< 0.8", optional = true } + bitcoinconsensus = { version = "0.19.0-3", optional = true } # Needed by bdk_blockchain_tests macro @@ -60,7 +61,7 @@ sqlite = ["rusqlite"] compact_filters = ["rocksdb", "socks", "lazy_static", "cc"] key-value-db = ["sled"] all-keys = ["keys-bip39"] -keys-bip39 = ["tiny-bip39", "zeroize", "zeroize_derive"] +keys-bip39 = ["tiny-bip39"] rpc = ["core-rpc"] # We currently provide mulitple implementations of `Blockchain`, all are From b60465f31e2c3db09e4ad583b2523382df9f3184 Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Thu, 30 Sep 2021 10:54:43 -0700 Subject: [PATCH 3/7] Bump bdk-macros version to 0.6.0 --- macros/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macros/Cargo.toml b/macros/Cargo.toml index efec36d1..d5b2f5ff 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bdk-macros" -version = "0.5.0" +version = "0.6.0" authors = ["Alekos Filini "] edition = "2018" homepage = "https://bitcoindevkit.org" From 9e4ca516a8e1f69af5c6e0e149025d533fc7e599 Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Thu, 30 Sep 2021 10:40:51 -0700 Subject: [PATCH 4/7] Bump version to 0.12.0 --- CHANGELOG.md | 4 ++++ Cargo.toml | 4 ++-- DEVELOPMENT_CYCLE.md | 2 +- src/lib.rs | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eae7898e..a3111c54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] + +## [v0.12.0] - [v0.11.0] + - Activate `miniscript/use-serde` feature to allow consumers of the library to access it via the re-exported `miniscript` crate. - Add support for proxies in `EsploraBlockchain` - Added `SqliteDatabase` that implements `Database` backed by a sqlite database using `rusqlite` crate. @@ -381,3 +384,4 @@ final transaction is created by calling `finish` on the builder. [v0.9.0]: https://github.com/bitcoindevkit/bdk/compare/v0.8.0...v0.9.0 [v0.10.0]: https://github.com/bitcoindevkit/bdk/compare/v0.9.0...v0.10.0 [v0.11.0]: https://github.com/bitcoindevkit/bdk/compare/v0.10.0...v0.11.0 +[v0.12.0]: https://github.com/bitcoindevkit/bdk/compare/v0.11.0...v0.12.0 \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index 8c23b529..a4aa96ac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bdk" -version = "0.12.0-rc1" +version = "0.12.0" edition = "2018" authors = ["Alekos Filini ", "Riccardo Casatta "] homepage = "https://bitcoindevkit.org" @@ -12,7 +12,7 @@ readme = "README.md" license = "MIT OR Apache-2.0" [dependencies] -bdk-macros = { path = "macros"} # TODO: Change this to version number after next release. +bdk-macros = "^0.6" log = "^0.4" miniscript = { version = "^6.0", features = ["use-serde"] } bitcoin = { version = "^0.27", features = ["use-serde", "base64"] } diff --git a/DEVELOPMENT_CYCLE.md b/DEVELOPMENT_CYCLE.md index d7b92d6e..7e116053 100644 --- a/DEVELOPMENT_CYCLE.md +++ b/DEVELOPMENT_CYCLE.md @@ -32,7 +32,7 @@ Pre-`v1.0.0` our "major" releases only affect the "minor" semver value. Accordin - If it's a minor issue you can just fix it in the release branch, since it will be merged back to `master` eventually - For bigger issues you can fix them on `master` and then *cherry-pick* the commit to the release branch 6. Update the changelog with the new release version. -7. Update `src/lib.rs` with the new version (line ~59) +7. Update `src/lib.rs` with the new version (line ~43) 8. On release day, make a commit on the release branch to bump the version to `x.y.z`. The message should be "Bump version to x.y.z". 9. Add a tag to this commit. The tag name should be `vx.y.z` (for example `v0.5.0`), and the message "Release x.y.z". Make sure the tag is signed, for extra safety use the explicit `--sign` flag. 10. Push the new commits to the upstream release branch, wait for the CI to finish one last time. diff --git a/src/lib.rs b/src/lib.rs index 007311c9..6f2ee58d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -40,7 +40,7 @@ //! interact with the bitcoin P2P network. //! //! ```toml -//! bdk = "0.11.0" +//! bdk = "0.12.0" //! ``` #![cfg_attr( feature = "electrum", From 763bcc22ab37f136a064f124925b812e76eb1d9e Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Thu, 30 Sep 2021 13:39:17 -0700 Subject: [PATCH 5/7] Bump version to 0.12.1-dev --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index a4aa96ac..29b56517 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bdk" -version = "0.12.0" +version = "0.12.1-dev" edition = "2018" authors = ["Alekos Filini ", "Riccardo Casatta "] homepage = "https://bitcoindevkit.org" From 18f1107c41b2b2e4e2d4b4c7b1460fc2a17dd239 Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Thu, 30 Sep 2021 13:38:16 -0700 Subject: [PATCH 6/7] Update DEVELOPMENT_CYCLE release instructions --- DEVELOPMENT_CYCLE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPMENT_CYCLE.md b/DEVELOPMENT_CYCLE.md index 7e116053..c2392ddf 100644 --- a/DEVELOPMENT_CYCLE.md +++ b/DEVELOPMENT_CYCLE.md @@ -39,7 +39,7 @@ Pre-`v1.0.0` our "major" releases only affect the "minor" semver value. Accordin 11. Publish **all** the updated crates to crates.io. 12. Make a new commit to bump the version value to `x.y.(z+1)-dev`. The message should be "Bump version to x.y.(z+1)-dev". 13. Merge the release branch back into `master`. -14. If the `master` branch contains any unreleased changes to the `bdk-macros`, `bdk-testutils`, or `bdk-testutils-macros` crates, change the `bdk` Cargo.toml `[dev-dependencies]` to point to the local path (ie. `bdk-testutils-macros = { path = "./testutils-macros"}`) +14. If the `master` branch contains any unreleased changes to the `bdk-macros` crate, change the `bdk` Cargo.toml `[dependencies]` to point to the local path (ie. `bdk-macros = { path = "./macros"}`) 15. Create the release on GitHub: go to "tags", click on the dots on the right and select "Create Release". Then set the title to `vx.y.z` and write down some brief release notes. 16. Make sure the new release shows up on crates.io and that the docs are built correctly on docs.rs. 17. Announce the release on Twitter, Discord and Telegram. From 22c39b7b786b39448f9ed4b221a03d3322f33ec9 Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Thu, 30 Sep 2021 16:11:42 -0700 Subject: [PATCH 7/7] Fix cargo doc warning and missing `sqlite` feature --- Cargo.toml | 2 +- src/blockchain/rpc.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 29b56517..dd4fc911 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -113,6 +113,6 @@ required-features = ["compiler"] [workspace] members = ["macros"] [package.metadata.docs.rs] -features = ["compiler", "electrum", "esplora", "ureq", "compact_filters", "rpc", "key-value-db", "all-keys", "verify"] +features = ["compiler", "electrum", "esplora", "ureq", "compact_filters", "rpc", "key-value-db", "sqlite", "all-keys", "verify"] # defines the configuration attribute `docsrs` rustdoc-args = ["--cfg", "docsrs"] diff --git a/src/blockchain/rpc.rs b/src/blockchain/rpc.rs index 3ac67e4d..e88dda45 100644 --- a/src/blockchain/rpc.rs +++ b/src/blockchain/rpc.rs @@ -84,7 +84,7 @@ pub struct RpcConfig { /// This struct is equivalent to [core_rpc::Auth] but it implements [serde::Serialize] /// To be removed once upstream equivalent is implementing Serialize (json serialization format -/// should be the same) https://github.com/rust-bitcoin/rust-bitcoincore-rpc/pull/181 +/// should be the same), see [rust-bitcoincore-rpc/pull/181](https://github.com/rust-bitcoin/rust-bitcoincore-rpc/pull/181) #[derive(Clone, Debug, Hash, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize)] #[serde(rename_all = "snake_case")] #[serde(untagged)]