From 33ee49f8e518f3ed9236b279de693430d89a096c Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Tue, 10 Oct 2023 05:17:26 +1100 Subject: [PATCH] Update bech32 dependency Update the `bech32` dependency to use the newly release beta version. The main fix here is silent, a bug fix in `bech32` that was being hit by our fuzzing suite. --- Cargo-minimal.lock | 4 ++-- Cargo-recent.lock | 4 ++-- bitcoin/Cargo.toml | 2 +- bitcoin/src/address/error.rs | 6 +++--- bitcoin/src/address/mod.rs | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo-minimal.lock b/Cargo-minimal.lock index 1d16d101..d38a5d4c 100644 --- a/Cargo-minimal.lock +++ b/Cargo-minimal.lock @@ -16,9 +16,9 @@ checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "bech32" -version = "0.10.0-alpha" +version = "0.10.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cc1dec4c25e5a78c52802eda8e2adf0d2aca57ffc536326b75c0e531ea0a9b" +checksum = "98f7eed2b2781a6f0b5c903471d48e15f56fb4e1165df8a9a2337fd1a59d45ea" [[package]] name = "bincode" diff --git a/Cargo-recent.lock b/Cargo-recent.lock index 17c80905..e4b3ad1b 100644 --- a/Cargo-recent.lock +++ b/Cargo-recent.lock @@ -16,9 +16,9 @@ checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "bech32" -version = "0.10.0-alpha" +version = "0.10.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cc1dec4c25e5a78c52802eda8e2adf0d2aca57ffc536326b75c0e531ea0a9b" +checksum = "98f7eed2b2781a6f0b5c903471d48e15f56fb4e1165df8a9a2337fd1a59d45ea" [[package]] name = "bincode" diff --git a/bitcoin/Cargo.toml b/bitcoin/Cargo.toml index 924b1756..03953431 100644 --- a/bitcoin/Cargo.toml +++ b/bitcoin/Cargo.toml @@ -36,7 +36,7 @@ rustdoc-args = ["--cfg", "docsrs"] [dependencies] internals = { package = "bitcoin-internals", version = "0.2.0" } hex = { package = "hex-conservative", version = "0.1.1", default-features = false } -bech32 = { version = "0.10.0-alpha", default-features = false } +bech32 = { version = "0.10.0-beta", default-features = false } hashes = { package = "bitcoin_hashes", version = "0.13.0", default-features = false } secp256k1 = { version = "0.27.0", default-features = false, features = ["bitcoin_hashes"] } hex_lit = "0.1.1" diff --git a/bitcoin/src/address/error.rs b/bitcoin/src/address/error.rs index 3f5854cf..964edb21 100644 --- a/bitcoin/src/address/error.rs +++ b/bitcoin/src/address/error.rs @@ -103,7 +103,7 @@ pub enum ParseError { /// Base58 error. Base58(base58::Error), /// Bech32 segwit decoding error. - Bech32(bech32::primitives::decode::SegwitHrpstringError), + Bech32(bech32::segwit::DecodeError), /// A witness version conversion/parsing error. WitnessVersion(witness_version::TryFromError), /// A witness program error. @@ -141,8 +141,8 @@ impl From for ParseError { fn from(e: base58::Error) -> Self { Self::Base58(e) } } -impl From for ParseError { - fn from(e: bech32::primitives::decode::SegwitHrpstringError) -> Self { Self::Bech32(e) } +impl From for ParseError { + fn from(e: bech32::segwit::DecodeError) -> Self { Self::Bech32(e) } } impl From for ParseError { diff --git a/bitcoin/src/address/mod.rs b/bitcoin/src/address/mod.rs index 6388ed24..1152338e 100644 --- a/bitcoin/src/address/mod.rs +++ b/bitcoin/src/address/mod.rs @@ -264,9 +264,9 @@ impl<'a> fmt::Display for AddressEncoding<'a> { let program = witness_program.program().as_bytes(); if fmt.alternate() { - bech32::segwit::encode_to_fmt_unchecked_uppercase(fmt, hrp, version, program) + bech32::segwit::encode_upper_to_fmt_unchecked(fmt, hrp, version, program) } else { - bech32::segwit::encode_to_fmt_unchecked(fmt, hrp, version, program) + bech32::segwit::encode_lower_to_fmt_unchecked(fmt, hrp, version, program) } } }