milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Merge rust-bitcoin/rust-bitcoin#3543: Bump hex-conservative to 0.3.0 

7f289a9fdf Bump hex-conservative to 0.3.0 (Leo Nash)

Pull request description:

ACKs for top commit:
  tcharding:
    ACK 7f289a9fdf
  apoelstra:
    ACK 7f289a9fdf86604cc1ecfb31c6df0ea5bb175465; successfully ran local tests

Tree-SHA512: bf8543ef7dc9b7ec0d11659c0a53213be50b9bbae0e6ba6970a19d32b3d89025315fcae332c23d68582ef69ea5f8e6673192ff74316a1e3dc47521312bbc469e
This commit is contained in:
merge-script 2024-10-31 21:05:02 +00:00
parent d32bb20e6b 7f289a9fdf
commit 8af8bc7886
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
9 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Cargo-minimal.lock
View File

@ -26,7 +26,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"bitcoin-internals", "bitcoin-internals",
"bitcoin_hashes 0.15.0", "bitcoin_hashes 0.15.0",
"hex-conservative", "hex-conservative 0.3.0",
] ]
[[package]] [[package]]
@ -66,7 +66,7 @@ dependencies = [
"bitcoin-units", "bitcoin-units",
"bitcoin_hashes 0.15.0", "bitcoin_hashes 0.15.0",
"bitcoinconsensus", "bitcoinconsensus",
"hex-conservative", "hex-conservative 0.3.0",
"hex_lit", "hex_lit",
"mutagen", "mutagen",
"ordered", "ordered",
@ -95,7 +95,7 @@ name = "bitcoin-internals"
version = "0.4.0" version = "0.4.0"
dependencies = [ dependencies = [
"bincode", "bincode",
"hex-conservative", "hex-conservative 0.3.0",
"serde", "serde",
"serde_json", "serde_json",
] ]
@ -117,7 +117,7 @@ dependencies = [
"bitcoin-io", "bitcoin-io",
"bitcoin-units", "bitcoin-units",
"bitcoin_hashes 0.15.0", "bitcoin_hashes 0.15.0",
"hex-conservative", "hex-conservative 0.3.0",
"mutagen", "mutagen",
"ordered", "ordered",
"serde", "serde",
@ -141,7 +141,7 @@ version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
dependencies = [ dependencies = [
"hex-conservative", "hex-conservative 0.2.0",
] ]
[[package]] [[package]]
@ -149,7 +149,7 @@ name = "bitcoin_hashes"
version = "0.15.0" version = "0.15.0"
dependencies = [ dependencies = [
"bitcoin-io", "bitcoin-io",
"hex-conservative", "hex-conservative 0.3.0",
"serde", "serde",
"serde_json", "serde_json",
"serde_test", "serde_test",
@ -186,7 +186,7 @@ checksum = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
name = "chacha20-poly1305" name = "chacha20-poly1305"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"hex-conservative", "hex-conservative 0.3.0",
] ]
[[package]] [[package]]
@ -209,6 +209,15 @@ dependencies = [
"arrayvec", "arrayvec",
] ]
[[package]]
name = "hex-conservative"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4afe881d0527571892c4034822e59bb10c6c991cce6abe8199b6f5cf10766f55"
dependencies = [
"arrayvec",
]
[[package]] [[package]]
name = "hex_lit" name = "hex_lit"
version = "0.1.1" version = "0.1.1"

23
Cargo-recent.lock
View File

@ -26,7 +26,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"bitcoin-internals", "bitcoin-internals",
"bitcoin_hashes 0.15.0", "bitcoin_hashes 0.15.0",
"hex-conservative", "hex-conservative 0.3.0",
] ]
[[package]] [[package]]
@ -65,7 +65,7 @@ dependencies = [
"bitcoin-units", "bitcoin-units",
"bitcoin_hashes 0.15.0", "bitcoin_hashes 0.15.0",
"bitcoinconsensus", "bitcoinconsensus",
"hex-conservative", "hex-conservative 0.3.0",
"hex_lit", "hex_lit",
"mutagen", "mutagen",
"ordered", "ordered",
@ -94,7 +94,7 @@ name = "bitcoin-internals"
version = "0.4.0" version = "0.4.0"
dependencies = [ dependencies = [
"bincode", "bincode",
"hex-conservative", "hex-conservative 0.3.0",
"serde", "serde",
"serde_json", "serde_json",
] ]
@ -116,7 +116,7 @@ dependencies = [
"bitcoin-io", "bitcoin-io",
"bitcoin-units", "bitcoin-units",
"bitcoin_hashes 0.15.0", "bitcoin_hashes 0.15.0",
"hex-conservative", "hex-conservative 0.3.0",
"mutagen", "mutagen",
"ordered", "ordered",
"serde", "serde",
@ -140,7 +140,7 @@ version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
dependencies = [ dependencies = [
"hex-conservative", "hex-conservative 0.2.1",
] ]
[[package]] [[package]]
@ -148,7 +148,7 @@ name = "bitcoin_hashes"
version = "0.15.0" version = "0.15.0"
dependencies = [ dependencies = [
"bitcoin-io", "bitcoin-io",
"hex-conservative", "hex-conservative 0.3.0",
"serde", "serde",
"serde_json", "serde_json",
"serde_test", "serde_test",
@ -188,7 +188,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
name = "chacha20-poly1305" name = "chacha20-poly1305"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"hex-conservative", "hex-conservative 0.3.0",
] ]
[[package]] [[package]]
@ -211,6 +211,15 @@ dependencies = [
"arrayvec", "arrayvec",
] ]
[[package]]
name = "hex-conservative"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4afe881d0527571892c4034822e59bb10c6c991cce6abe8199b6f5cf10766f55"
dependencies = [
"arrayvec",
]
[[package]] [[package]]
name = "hex_lit" name = "hex_lit"
version = "0.1.1" version = "0.1.1"

2
base58/Cargo.toml
View File

@ -22,7 +22,7 @@ hashes = { package = "bitcoin_hashes", version = "0.15.0", default-features = fa
internals = { package = "bitcoin-internals", version = "0.4.0" } internals = { package = "bitcoin-internals", version = "0.4.0" }
[dev-dependencies] [dev-dependencies]
hex = { package = "hex-conservative", version = "0.2.0", default-features = false, features = ["alloc"] } hex = { package = "hex-conservative", version = "0.3.0", default-features = false, features = ["alloc"] }
[package.metadata.docs.rs] [package.metadata.docs.rs]
all-features = true all-features = true

2
bitcoin/Cargo.toml
View File

@ -28,7 +28,7 @@ arbitrary = ["dep:arbitrary", "units/arbitrary", "primitives/arbitrary"]
base58 = { package = "base58ck", version = "0.1.0", default-features = false, features = ["alloc"] } base58 = { package = "base58ck", version = "0.1.0", default-features = false, features = ["alloc"] }
bech32 = { version = "0.11.0", default-features = false, features = ["alloc"] } bech32 = { version = "0.11.0", default-features = false, features = ["alloc"] }
hashes = { package = "bitcoin_hashes", version = "0.15.0", default-features = false, features = ["alloc", "bitcoin-io"] } hashes = { package = "bitcoin_hashes", version = "0.15.0", default-features = false, features = ["alloc", "bitcoin-io"] }
hex = { package = "hex-conservative", version = "0.2.0", default-features = false, features = ["alloc"] } hex = { package = "hex-conservative", version = "0.3.0", default-features = false, features = ["alloc"] }
internals = { package = "bitcoin-internals", version = "0.4.0", features = ["alloc"] } internals = { package = "bitcoin-internals", version = "0.4.0", features = ["alloc"] }
io = { package = "bitcoin-io", version = "0.2.0", default-features = false, features = ["alloc"] } io = { package = "bitcoin-io", version = "0.2.0", default-features = false, features = ["alloc"] }
primitives = { package = "bitcoin-primitives", version = "0.100.0", default-features = false, features = ["alloc"] } primitives = { package = "bitcoin-primitives", version = "0.100.0", default-features = false, features = ["alloc"] }

4
bitcoin/src/consensus/serde.rs
View File

@ -74,7 +74,7 @@ pub mod hex {
pub struct Encoder<C: Case>(BufEncoder<{ HEX_BUF_SIZE }>, PhantomData<C>); pub struct Encoder<C: Case>(BufEncoder<{ HEX_BUF_SIZE }>, PhantomData<C>);
impl<C: Case> From<super::Hex<C>> for Encoder<C> { impl<C: Case> From<super::Hex<C>> for Encoder<C> {
fn from(_: super::Hex<C>) -> Self { Encoder(BufEncoder::new(), Default::default()) } fn from(_: super::Hex<C>) -> Self { Encoder(BufEncoder::new(C::INTERNAL_CASE), Default::default()) }
} }
impl<C: Case> super::EncodeBytes for Encoder<C> { impl<C: Case> super::EncodeBytes for Encoder<C> {
@ -83,7 +83,7 @@ pub mod hex {
if self.0.is_full() { if self.0.is_full() {
self.flush(writer)?; self.flush(writer)?;
} }
bytes = self.0.put_bytes_min(bytes, C::INTERNAL_CASE); bytes = self.0.put_bytes_min(bytes);
} }
Ok(()) Ok(())
} }

2
chacha20_poly1305/Cargo.toml
View File

@ -17,7 +17,7 @@ std = ["alloc"]
alloc = [] alloc = []
[dev-dependencies] [dev-dependencies]
hex = { package = "hex-conservative", version = "0.2.0", default-features = false, features = ["alloc"] } hex = { package = "hex-conservative", version = "0.3.0", default-features = false, features = ["alloc"] }
[package.metadata.docs.rs] [package.metadata.docs.rs]
all-features = true all-features = true

2
hashes/Cargo.toml
View File

@ -21,7 +21,7 @@ alloc = ["bitcoin-io?/alloc", "hex/alloc"]
small-hash = [] small-hash = []
[dependencies] [dependencies]
hex = { package = "hex-conservative", version = "0.2.0", default-features = false } hex = { package = "hex-conservative", version = "0.3.0", default-features = false }
bitcoin-io = { version = "0.2.0", default-features = false, optional = true } bitcoin-io = { version = "0.2.0", default-features = false, optional = true }
serde = { version = "1.0", default-features = false, optional = true } serde = { version = "1.0", default-features = false, optional = true }

2
internals/Cargo.toml
View File

@ -21,7 +21,7 @@ alloc = ["hex/alloc"]
test-serde = ["serde", "serde_json", "bincode"] test-serde = ["serde", "serde_json", "bincode"]
[dependencies] [dependencies]
hex = { package = "hex-conservative", version = "0.2.0", default-features = false } hex = { package = "hex-conservative", version = "0.3.0", default-features = false }
serde = { version = "1.0.103", default-features = false, optional = true } serde = { version = "1.0.103", default-features = false, optional = true }
# Don't enable these directly, use `test-serde` feature instead. # Don't enable these directly, use `test-serde` feature instead.

2
primitives/Cargo.toml
View File

@ -23,7 +23,7 @@ arbitrary = ["dep:arbitrary", "units/arbitrary"]
[dependencies] [dependencies]
hashes = { package = "bitcoin_hashes", version = "0.15.0", default-features = false, features = ["bitcoin-io"] } hashes = { package = "bitcoin_hashes", version = "0.15.0", default-features = false, features = ["bitcoin-io"] }
hex = { package = "hex-conservative", version = "0.2.0", default-features = false } hex = { package = "hex-conservative", version = "0.3.0", default-features = false }
internals = { package = "bitcoin-internals", version = "0.4.0" } internals = { package = "bitcoin-internals", version = "0.4.0" }
io = { package = "bitcoin-io", version = "0.2.0", default-features = false } io = { package = "bitcoin-io", version = "0.2.0", default-features = false }
units = { package = "bitcoin-units", version = "0.2.0", default-features = false } units = { package = "bitcoin-units", version = "0.2.0", default-features = false }