Skip to content

Commit

Permalink
Add tools and update lock files
Browse files Browse the repository at this point in the history
Copy over the `update-lock-files.sh` script from `bitcoin` and add a
`just` command.

(Note the update lock files script should really be in
`rust-bitcoin-maintainer-tools`.)

Update the `bitcoin_hashes` version manually to the latest version.
  • Loading branch information
tcharding committed Jul 12, 2024
1 parent d8d03a8 commit 46d59b7
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 32 deletions.
2 changes: 1 addition & 1 deletion Cargo-minimal.lock
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ dependencies = [

[[package]]
name = "miniscript"
version = "12.0.0"
version = "12.1.0"
dependencies = [
"bech32",
"bitcoin",
Expand Down
40 changes: 9 additions & 31 deletions Cargo-recent.lock
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f"
dependencies = [
"bitcoin-internals 0.3.0",
"bitcoin_hashes 0.14.0",
"bitcoin-internals",
"bitcoin_hashes",
]

[[package]]
Expand Down Expand Up @@ -60,22 +60,16 @@ dependencies = [
"base58ck",
"base64 0.21.7",
"bech32",
"bitcoin-internals 0.3.0",
"bitcoin-internals",
"bitcoin-io",
"bitcoin-units",
"bitcoin_hashes 0.14.0",
"hex-conservative 0.2.1",
"bitcoin_hashes",
"hex-conservative",
"hex_lit",
"secp256k1",
"serde",
]

[[package]]
name = "bitcoin-internals"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb"

[[package]]
name = "bitcoin-internals"
version = "0.3.0"
Expand All @@ -97,28 +91,18 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d437fd727271c866d6fd5e71eb2c886437d4c97f80d89246be3189b1da4e58b"
dependencies = [
"bitcoin-internals 0.3.0",
"bitcoin-internals",
"serde",
]

[[package]]
name = "bitcoin_hashes"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b"
dependencies = [
"bitcoin-internals 0.2.0",
"hex-conservative 0.1.1",
]

[[package]]
name = "bitcoin_hashes"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
dependencies = [
"bitcoin-io",
"hex-conservative 0.2.1",
"hex-conservative",
"serde",
]

Expand Down Expand Up @@ -222,12 +206,6 @@ dependencies = [
"wasi",
]

[[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.1"
Expand Down Expand Up @@ -316,7 +294,7 @@ dependencies = [

[[package]]
name = "miniscript"
version = "12.0.0"
version = "12.1.0"
dependencies = [
"bech32",
"bitcoin",
Expand Down Expand Up @@ -452,7 +430,7 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3"
dependencies = [
"bitcoin_hashes 0.13.0",
"bitcoin_hashes",
"rand",
"secp256k1-sys",
"serde",
Expand Down
11 changes: 11 additions & 0 deletions contrib/update-lock-files.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env bash
#
# Update the minimal/recent lock file

set -euo pipefail

for file in Cargo-minimal.lock Cargo-recent.lock; do
cp --force "$file" Cargo.lock
cargo check
cp --force Cargo.lock "$file"
done
4 changes: 4 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,7 @@ sane: fmt-check lint

# doctests don't get run from workspace root with `cargo test`.
cargo test --quiet --doc || exit 1

# Update the recent and minimal lock files.
update-lock-files:
contrib/update-lock-files.sh

0 comments on commit 46d59b7

Please sign in to comment.