diff --git a/Cargo-minimal.lock b/Cargo-minimal.lock index 20ca41e5..efc2a258 100644 --- a/Cargo-minimal.lock +++ b/Cargo-minimal.lock @@ -19,8 +19,8 @@ name = "base58ck" version = "0.1.0" dependencies = [ "bitcoin-internals", - "bitcoin_hashes", - "hex-conservative", + "bitcoin_hashes 0.14.0", + "hex-conservative 0.2.0", ] [[package]] @@ -56,9 +56,9 @@ dependencies = [ "bitcoin-internals", "bitcoin-io", "bitcoin-units", - "bitcoin_hashes", + "bitcoin_hashes 0.14.0", "bitcoinconsensus", - "hex-conservative", + "hex-conservative 0.2.0", "hex_lit", "mutagen", "ordered", @@ -103,9 +103,19 @@ dependencies = [ [[package]] name = "bitcoin_hashes" version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b" +dependencies = [ + "bitcoin-internals", + "hex-conservative 0.1.1", +] + +[[package]] +name = "bitcoin_hashes" +version = "0.14.0" dependencies = [ "bitcoin-io", - "hex-conservative", + "hex-conservative 0.2.0", "schemars", "serde", "serde_json", @@ -162,6 +172,12 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3" +[[package]] +name = "hex-conservative" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2" + [[package]] name = "hex-conservative" version = "0.2.0" @@ -356,7 +372,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2acea373acb8c21ecb5a23741452acd2593ed44ee3d343e72baaa143bc89d0d5" dependencies = [ - "bitcoin_hashes", + "bitcoin_hashes 0.13.0", "rand", "secp256k1-sys", "serde", diff --git a/Cargo-recent.lock b/Cargo-recent.lock index 959fb606..718ff67e 100644 --- a/Cargo-recent.lock +++ b/Cargo-recent.lock @@ -19,8 +19,8 @@ name = "base58ck" version = "0.1.0" dependencies = [ "bitcoin-internals", - "bitcoin_hashes", - "hex-conservative", + "bitcoin_hashes 0.14.0", + "hex-conservative 0.2.0", ] [[package]] @@ -55,9 +55,9 @@ dependencies = [ "bitcoin-internals", "bitcoin-io", "bitcoin-units", - "bitcoin_hashes", + "bitcoin_hashes 0.14.0", "bitcoinconsensus", - "hex-conservative", + "hex-conservative 0.2.0", "hex_lit", "mutagen", "ordered", @@ -102,9 +102,19 @@ dependencies = [ [[package]] name = "bitcoin_hashes" version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b" +dependencies = [ + "bitcoin-internals", + "hex-conservative 0.1.1", +] + +[[package]] +name = "bitcoin_hashes" +version = "0.14.0" dependencies = [ "bitcoin-io", - "hex-conservative", + "hex-conservative 0.2.0", "schemars", "serde", "serde_json", @@ -161,6 +171,12 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3" +[[package]] +name = "hex-conservative" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2" + [[package]] name = "hex-conservative" version = "0.2.0" @@ -345,7 +361,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2acea373acb8c21ecb5a23741452acd2593ed44ee3d343e72baaa143bc89d0d5" dependencies = [ - "bitcoin_hashes", + "bitcoin_hashes 0.13.0", "rand", "secp256k1-sys", "serde", diff --git a/base58/Cargo.toml b/base58/Cargo.toml index f27b76e4..73a3580e 100644 --- a/base58/Cargo.toml +++ b/base58/Cargo.toml @@ -21,7 +21,7 @@ all-features = true rustdoc-args = ["--cfg", "docsrs"] [dependencies] -hashes = { package = "bitcoin_hashes", version = "0.13.0", default-features = false, features = ["alloc"] } +hashes = { package = "bitcoin_hashes", version = "0.14.0", default-features = false, features = ["alloc"] } internals = { package = "bitcoin-internals", version = "0.2.0" } [dev-dependencies] diff --git a/bitcoin/Cargo.toml b/bitcoin/Cargo.toml index 4aaed915..2b3fd880 100644 --- a/bitcoin/Cargo.toml +++ b/bitcoin/Cargo.toml @@ -30,7 +30,7 @@ rustdoc-args = ["--cfg", "docsrs"] [dependencies] base58 = { package = "base58ck", version = "0.1.0", default-features = false } bech32 = { version = "0.11.0", default-features = false, features = ["alloc"] } -hashes = { package = "bitcoin_hashes", version = "0.13.0", default-features = false, features = ["alloc", "io"] } +hashes = { package = "bitcoin_hashes", version = "0.14.0", default-features = false, features = ["alloc", "io"] } hex = { package = "hex-conservative", version = "0.2.0", default-features = false, features = ["alloc"] } hex_lit = "0.1.1" internals = { package = "bitcoin-internals", version = "0.2.0" } diff --git a/contrib/run_task.sh b/contrib/run_task.sh index 42c83135..d99042f4 100755 --- a/contrib/run_task.sh +++ b/contrib/run_task.sh @@ -168,9 +168,13 @@ do_dup_deps() { duplicate_dependencies=$( # Only show the actual duplicated deps, not their reverse tree, then # whitelist the 'syn' crate which is duplicated but it's not our fault. + # + # Temporarily allow 2 versions of `hashes` and `hex` while we upgrade. cargo tree --target=all --all-features --duplicates \ | grep '^[0-9A-Za-z]' \ | grep -v 'syn' \ + | grep -v 'bitcoin_hashes' \ + | grep -v 'hex-conservative' \ | wc -l ) if [ "$duplicate_dependencies" -ne 0 ]; then diff --git a/hashes/CHANGELOG.md b/hashes/CHANGELOG.md index 44d52f9c..ca96b020 100644 --- a/hashes/CHANGELOG.md +++ b/hashes/CHANGELOG.md @@ -1,3 +1,24 @@ +# 0.14.0 - 2024-03-21 + +* Bump MSRV to Rust version 1.56.1 [#2188](https://github.com/rust-bitcoin/rust-bitcoin/pull/2188) + +## API improvemnts + +* Add support for SHA384 [#2538](https://github.com/rust-bitcoin/rust-bitcoin/pull/2538) +* Make from_hex inherent for byte-like types [#2491](https://github.com/rust-bitcoin/rust-bitcoin/pull/2491) +* Add `Hash::from_bytes_iter` to construct hashes from iterators [#2272](https://github.com/rust-bitcoin/rust-bitcoin/pull/2272) +* Make some constructors `const` [#2446](https://github.com/rust-bitcoin/rust-bitcoin/pull/2446) + +## Features/dependencies changes + +* Removed `core2` dependency in favour of the new `bitcoin-io` crate [#2066](https://github.com/rust-bitcoin/rust-bitcoin/pull/2066) +* Remove "serde-std" [#2384](https://github.com/rust-bitcoin/rust-bitcoin/pull/2384) + +## Error handling improvements + +* Improve leaf errors [#2530](https://github.com/rust-bitcoin/rust-bitcoin/pull/2530) +* Implement `From` for errors [#2516](https://github.com/rust-bitcoin/rust-bitcoin/pull/2516) + # 0.13.0 - 2023-06-29 The main improvement in this version is removal of the `hex` module in favour of the new diff --git a/hashes/Cargo.toml b/hashes/Cargo.toml index 14368252..6538379b 100644 --- a/hashes/Cargo.toml +++ b/hashes/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bitcoin_hashes" -version = "0.13.0" +version = "0.14.0" authors = ["Andrew Poelstra "] license = "CC0-1.0" repository = "https://github.com/rust-bitcoin/rust-bitcoin"