Skip to content

Commit e5e73b7

Browse files
committed
rust: update bitcoin deps
1 parent 822f87c commit e5e73b7

File tree

453 files changed

+31183
-30663
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

453 files changed

+31183
-30663
lines changed

src/rust/Cargo.lock

Lines changed: 46 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/rust/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ members = [
2727
resolver = "2"
2828

2929
[workspace.dependencies]
30-
bitcoin = { version = "0.31.0", default-features = false, features = ["no-std"] }
30+
bitcoin = { version = "0.32.2", default-features = false }
3131
hex = { version = "0.4", default-features = false, features = ["alloc"] }
3232
lazy_static = { version = "1.4.0" }
3333
num-bigint = { version = "0.4.3", default-features = false }

src/rust/bitbox02-rust/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,20 @@ num-bigint = { workspace = true, optional = true }
4141
num-traits = { version = "0.2", default-features = false, optional = true }
4242
# If you change this, also change src/rust/.cargo/config.toml.
4343
bip32-ed25519 = { git = "https://github.com/digitalbitbox/rust-bip32-ed25519", tag = "v0.1.2", optional = true }
44-
bech32 = { version = "0.10.0-beta", default-features = false, optional = true }
44+
bech32 = { version = "0.11.0", default-features = false, features = ["alloc"], optional = true }
4545
blake2 = { version = "0.10.6", default-features = false, optional = true }
4646
minicbor = { version = "0.24.0", default-features = false, features = ["alloc"], optional = true }
4747
crc = { version = "3.0.1", optional = true }
4848
ed25519-dalek = { version = "2.0.0", default-features = false, features = ["hazmat"], optional = true }
4949
lazy_static = { workspace = true, optional = true }
5050
hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
5151

52-
miniscript = { version = "11.0.0", default-features = false, features = ["no-std"], optional = true }
52+
miniscript = { version = "12.0.0", default-features = false, features = ["no-std"], optional = true }
5353
bitcoin = { workspace = true, optional = true }
5454
# We don't rely on this dep directly, the miniscript/bitcoin deps do. We list it here to enable the
5555
# small-hash feature to reduce the binary size, saving around 2784 bytes (as measured at time of
5656
# writing, this might fluctuate over time).
57-
bitcoin_hashes = { version = "0.13.0", default-features = false, features = ["small-hash"] }
57+
bitcoin_hashes = { version = "0.14.0", default-features = false, features = ["small-hash"] }
5858

5959
[dependencies.prost]
6060
# keep version in sync with tools/prost-build/Cargo.toml.

src/rust/bitbox02-rust/src/hww/api/bitcoin/common.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ fn encode_segwit_addr(
307307
1 => bech32::segwit::VERSION_1,
308308
_ => return Err(()),
309309
};
310-
bech32::segwit::encode(&bech32::Hrp::parse_unchecked(hrp), version, witness_program).or(Err(()))
310+
bech32::segwit::encode(bech32::Hrp::parse_unchecked(hrp), version, witness_program).or(Err(()))
311311
}
312312

313313
#[cfg(test)]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"files":{"CHANGELOG.md":"b747587385a95b8ee6eb9cadd8846ff28a84da08b56c7b9dd98751e595ddee74","Cargo.toml":"ebe08363961099edf43a7b16778d23db7a237f3aac4aa1bd43aafade796e55a1","README.md":"5ca594f252c4a106630957fb747d2e101eeaca0073d2b184de8eec148f0a67bd","src/error.rs":"d68015a5f45aef30f1d93b4871533c8afc7ab50be18a9d2b11bf9478c5265a42","src/lib.rs":"d392f55b7ea1524c2f1f985fb861cd016ce1b6a19ae37fb3f6a1fe0aa93c6de3"},"package":"2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f"}

src/rust/vendor/base58ck/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# 0.1.0 - 2024-03-14
2+
3+
Initial release of the `base58ck` crate. This crate was cut out of
4+
`rust-bitcoin` and cleaned up for release as a separate crate.

src/rust/vendor/base58ck/Cargo.toml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
2+
#
3+
# When uploading crates to the registry Cargo will automatically
4+
# "normalize" Cargo.toml files for maximal compatibility
5+
# with all versions of Cargo and also rewrite `path` dependencies
6+
# to registry (e.g., crates.io) dependencies.
7+
#
8+
# If you are reading this file be aware that the original Cargo.toml
9+
# will likely look very different (and much more reasonable).
10+
# See Cargo.toml.orig for the original contents.
11+
12+
[package]
13+
edition = "2021"
14+
rust-version = "1.56.1"
15+
name = "base58ck"
16+
version = "0.1.0"
17+
authors = ["Andrew Poelstra <[email protected]>"]
18+
exclude = [
19+
"tests",
20+
"contrib",
21+
]
22+
description = "Bitcoin base58 encoding with checksum."
23+
readme = "README.md"
24+
keywords = [
25+
"bitcoin",
26+
"base58",
27+
"encode",
28+
"decode",
29+
"checksum",
30+
]
31+
categories = [
32+
"cryptography::cryptocurrencies",
33+
"encoding",
34+
]
35+
license = "CC0-1.0"
36+
repository = "https://github.com/rust-bitcoin/rust-bitcoin/"
37+
38+
[package.metadata.docs.rs]
39+
all-features = true
40+
rustdoc-args = [
41+
"--cfg",
42+
"docsrs",
43+
]
44+
45+
[dependencies.hashes]
46+
version = "0.14.0"
47+
features = ["alloc"]
48+
default-features = false
49+
package = "bitcoin_hashes"
50+
51+
[dependencies.internals]
52+
version = "0.3.0"
53+
package = "bitcoin-internals"
54+
55+
[dev-dependencies.hex]
56+
version = "0.2.0"
57+
features = ["alloc"]
58+
default-features = false
59+
package = "hex-conservative"
60+
61+
[features]
62+
default = ["std"]
63+
std = [
64+
"hashes/std",
65+
"internals/std",
66+
]

src/rust/vendor/base58ck/README.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
Bitcoin base58 encoding
2+
=======================
3+
4+
This crate provides encoding and decoding of base58 strings as defined by the Bitcoin ecosystem
5+
including the checksum.
6+
7+
There are a bunch of crates on crates.io that implement base58 encoding and decoding. The more
8+
obviously named ones differ from this crate because:
9+
10+
1. [bitcoin-base58](https://crates.io/crates/bitcoin-base58) is transpiled from the C++ code in
11+
Bitcoin Core as part of a large long-term transpilation project, whereas this crate is a pure
12+
Rust implementation intended to be production-ready and to provide an Rust-idiomatic API.
13+
14+
2. [base58](https://crates.io/crates/base58) implements parsing but does not validate checksums (see
15+
`base58check`). It may be appropriate in cases where performance is more important than safety.
16+
Appears unmaintained.
17+
18+
3. [base58check](https://crates.io/crates/base58check) Adds checksum to the `base58` crate and
19+
depends on [sha2](https://crates.io/crates/sha2/0.8.2) for hashing. Appears unmaintained.
20+
21+
This crate uses [bitcoin_hashes](https://crates.io/crates/bitcoin_hashes) when hashing to calculate
22+
the checksum.
23+
24+
25+
## Minimum Supported Rust Version (MSRV)
26+
27+
This library should always compile with any combination of features on **Rust 1.56.1**.
28+
29+
30+
## Licensing
31+
32+
The code in this project is licensed under the [Creative Commons CC0 1.0 Universal license](LICENSE).
33+
We use the [SPDX license list](https://spdx.org/licenses/) and [SPDX IDs](https://spdx.dev/ids/).

0 commit comments

Comments
 (0)