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 f3983188..dd4fc911 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bdk" -version = "0.11.1-dev" +version = "0.12.1-dev" 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"] } @@ -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/DEVELOPMENT_CYCLE.md b/DEVELOPMENT_CYCLE.md index d7b92d6e..c2392ddf 100644 --- a/DEVELOPMENT_CYCLE.md +++ b/DEVELOPMENT_CYCLE.md @@ -32,14 +32,14 @@ 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. 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. 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" 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)] 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",