Add segwit API

src/lib.rs

@@ -43,6 +43,7 @@ pub use crate::primitives::{Bech32, Bech32m};
 
 mod error;
 pub mod primitives;
+pub mod segwit;
 
 #[cfg(feature = "arrayvec")]
 use arrayvec::{ArrayVec, CapacityError};

src/primitives/decode.rs

@@ -35,6 +35,7 @@
 //! ```
 //! use bech32::{Bech32, Bech32m, Fe32, Hrp};
 //! use bech32::primitives::decode::{CheckedHrpstring, SegwitHrpstring, UncheckedHrpstring};
+//! use bech32::segwit::VERSION_1;
 //!
 //! // An arbitrary HRP and a string of valid bech32 characters.
 //! let s = "abcd143hj65vxw49rts6kcw35u6r6tgzguyr03vvveeewjqpn05efzq444444";
@@ -66,7 +67,7 @@
 //! let segwit = SegwitHrpstring::new(address).expect("valid segwit address");
 //! let _encoded_data = segwit.byte_iter();
 //! assert_eq!(segwit.hrp(), Hrp::parse("bc").unwrap());
-//! assert_eq!(segwit.witness_version(), Fe32::P);
+//! assert_eq!(segwit.witness_version(), VERSION_1);
 //! ```
 //!
 //! [BIP-173]: <https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki>
@@ -78,6 +79,7 @@ use crate::primitives::checksum::{self, Checksum};
 use crate::primitives::gf32::Fe32;
 use crate::primitives::hrp::{self, Hrp};
 use crate::primitives::iter::{Fe32IterExt, FesToBytes};
+use crate::primitives::segwit::{self, WitnessLengthError, VERSION_0};
 use crate::{write_err, Bech32, Bech32m};
 
 /// Separator between the hrp and payload (as defined by BIP-173).
@@ -264,7 +266,7 @@ impl<'s> CheckedHrpstring<'s> {
         self.data = &self.data[1..]; // Remove the witness version byte from data.
 
         self.validate_padding()?;
-        self.validate_witness_length(witness_version)?;
+        self.validate_witness_program_length(witness_version)?;
 
         Ok(SegwitHrpstring { hrp: self.hrp(), witness_version, data: self.data })
     }
@@ -309,21 +311,11 @@ impl<'s> CheckedHrpstring<'s> {
     /// Validates the segwit witness length rules.
     ///
     /// Must be called after the witness version byte is removed from the data.
-    #[allow(clippy::manual_range_contains)] // For witness length range check.
-    fn validate_witness_length(&self, witness_version: Fe32) -> Result<(), WitnessLengthError> {
-        use WitnessLengthError::*;
-
-        let witness_len = self.byte_iter().len();
-        if witness_len < 2 {
-            return Err(TooShort);
-        }
-        if witness_len > 40 {
-            return Err(TooLong);
-        }
-        if witness_version == Fe32::Q && witness_len != 20 && witness_len != 32 {
-            return Err(InvalidSegwitV0);
-        }
-        Ok(())
+    fn validate_witness_program_length(
+        &self,
+        witness_version: Fe32,
+    ) -> Result<(), WitnessLengthError> {
+        segwit::validate_witness_program_length(self.byte_iter().len(), witness_version)
     }
 }
 
@@ -372,7 +364,7 @@ impl<'s> SegwitHrpstring<'s> {
         }
 
         let checked: CheckedHrpstring<'s> = match witness_version {
-            Fe32::Q => unchecked.validate_and_remove_checksum::<Bech32>()?,
+            VERSION_0 => unchecked.validate_and_remove_checksum::<Bech32>()?,
             _ => unchecked.validate_and_remove_checksum::<Bech32m>()?,
         };
 
@@ -746,41 +738,6 @@ impl std::error::Error for ChecksumError {
     }
 }
 
-/// Witness program invalid because of incorrect length.
-#[derive(Debug, Clone, PartialEq, Eq)]
-#[non_exhaustive]
-pub enum WitnessLengthError {
-    /// The witness data is too short.
-    TooShort,
-    /// The witness data is too long.
-    TooLong,
-    /// The segwit v0 witness is not 20 or 32 bytes long.
-    InvalidSegwitV0,
-}
-
-impl fmt::Display for WitnessLengthError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        use WitnessLengthError::*;
-
-        match *self {
-            TooShort => write!(f, "witness program is less than 2 bytes long"),
-            TooLong => write!(f, "witness program is more than 40 bytes long"),
-            InvalidSegwitV0 => write!(f, "the segwit v0 witness is not 20 or 32 bytes long"),
-        }
-    }
-}
-
-#[cfg(feature = "std")]
-impl std::error::Error for WitnessLengthError {
-    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-        use WitnessLengthError::*;
-
-        match *self {
-            TooShort | TooLong | InvalidSegwitV0 => None,
-        }
-    }
-}
-
 /// Error validating the padding bits on the witness data.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum PaddingError {

src/primitives/mod.rs

@@ -8,6 +8,7 @@ pub mod encode;
 pub mod gf32;
 pub mod hrp;
 pub mod iter;
+pub mod segwit;
 
 use checksum::{Checksum, PackedNull};
 

src/primitives/segwit.rs

@@ -0,0 +1,103 @@
+// SPDX-License-Identifier: MIT
+
+//! Segregated Witness functionality - useful for enforcing parts of [`BIP-173`] and [`BIP-350`].
+//!
+//! [BIP-173]: <https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki>
+//! [BIP-350]: <https://github.com/bitcoin/bips/blob/master/bip-0350.mediawiki>
+
+use core::fmt;
+
+use crate::primitives::gf32::Fe32;
+
+/// The field element representing segwit version 0.
+pub const VERSION_0: Fe32 = Fe32::Q;
+/// The field element representing segwit version 1 (taproot).
+pub const VERSION_1: Fe32 = Fe32::P;
+
+/// Returns true if given field element represents a valid segwit version.
+pub fn is_valid_witness_version(witness_version: Fe32) -> bool {
+    validate_witness_version(witness_version).is_ok()
+}
+
+/// Returns true if `length` represents a valid witness program length for `witness_version`.
+pub fn is_valid_witness_program_length(length: usize, witness_version: Fe32) -> bool {
+    validate_witness_program_length(length, witness_version).is_ok()
+}
+
+/// Checks that the given field element represents a valid segwit witness version.
+pub fn validate_witness_version(witness_version: Fe32) -> Result<(), InvalidWitnessVersionError> {
+    if witness_version.to_u8() > 16 {
+        Err(InvalidWitnessVersionError(witness_version))
+    } else {
+        Ok(())
+    }
+}
+
+/// Validates the segwit witness program `length` rules for witness `version`.
+pub fn validate_witness_program_length(
+    length: usize,
+    version: Fe32,
+) -> Result<(), WitnessLengthError> {
+    use WitnessLengthError::*;
+
+    if length < 2 {
+        return Err(TooShort);
+    }
+    if length > 40 {
+        return Err(TooLong);
+    }
+    if version == VERSION_0 && length != 20 && length != 32 {
+        return Err(InvalidSegwitV0);
+    }
+    Ok(())
+}
+
+/// Field element does not represent a valid witness version.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct InvalidWitnessVersionError(Fe32);
+
+impl fmt::Display for InvalidWitnessVersionError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "field element does not represent a valid witness version")
+    }
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for InvalidWitnessVersionError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { None }
+}
+
+/// Witness program invalid because of incorrect length.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[non_exhaustive]
+pub enum WitnessLengthError {
+    /// The witness data is too short.
+    TooShort,
+    /// The witness data is too long.
+    TooLong,
+    /// The segwit v0 witness is not 20 or 32 bytes long.
+    InvalidSegwitV0,
+}
+
+impl fmt::Display for WitnessLengthError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        use WitnessLengthError::*;
+
+        match *self {
+            TooShort => write!(f, "witness program is less than 2 bytes long"),
+            TooLong => write!(f, "witness program is more than 40 bytes long"),
+            InvalidSegwitV0 => write!(f, "the segwit v0 witness is not 20 or 32 bytes long"),
+        }
+    }
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for WitnessLengthError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        use WitnessLengthError::*;
+
+        match *self {
+            TooShort | TooLong | InvalidSegwitV0 => None,
+        }
+    }
+}

src/segwit.rs

@@ -0,0 +1,266 @@
+// SPDX-License-Identifier: MIT
+
+//! Segregated Witness API - enables typical usage for encoding and decoding segwit addresses.
+//!
+//! [BIP-173] and [BIP-350] contain some complexity. This module aims to allow you to create modern
+//! Bitcoin addresses correctly and easily without intimate knowledge of the BIPs. However, if you
+//! do posses such knowledge and are doing unusual things you may prefer to use the `primitives`
+//! submodules directly.
+//!
+//! # Examples
+//!
+//! ```
+//! # #[cfg(feature = "alloc")] {
+//! use bech32::primitives::hrp::{self, Hrp};
+//! use bech32::{Fe32, segwit};
+//!
+//! let witness_prog = [
+//!     0x75, 0x1e, 0x76, 0xe8, 0x19, 0x91, 0x96, 0xd4,
+//!     0x54, 0x94, 0x1c, 0x45, 0xd1, 0xb3, 0xa3, 0x23,
+//!     0xf1, 0x43, 0x3b, 0xd6,
+//! ];
+//!
+//! // Encode a taproot address suitable for use on mainnet.
+//! let _ = segwit::encode_v1(&hrp::BC, &witness_prog);
+//!
+//! // Encode a segwit v0 address suitable for use on testnet.
+//! let _ = segwit::encode_v0(&hrp::TB, &witness_prog);
+//!
+//! // If you have the witness version already you can use:
+//! # let witness_version = segwit::VERSION_0;
+//! let _ = segwit::encode(&hrp::BC, witness_version, &witness_prog);
+//!
+//! // Decode a Bitcoin bech32 segwit address.
+//! let address = "bc1q2s3rjwvam9dt2ftt4sqxqjf3twav0gdx0k0q2etxflx38c3x8tnssdmnjq";
+//! let (hrp, witness_version, witness_program) = segwit::decode(address).expect("failed to decode address");
+//! # }
+//! ```
+//!
+//! [BIP-173]: <https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki>
+//! [BIP-350]: <https://github.com/bitcoin/bips/blob/master/bip-0350.mediawiki>
+//! [`bip_173_test_vectors.rs`]: <https://github.com/rust-bitcoin/rust-bech32/blob/master/tests/bip_173_test_vectors.rs>
+//! [`bip_350_test_vectors.rs`]: <https://github.com/rust-bitcoin/rust-bech32/blob/master/tests/bip_350_test_vectors.rs>
+
+#[cfg(all(feature = "alloc", not(feature = "std"), not(test)))]
+use alloc::{string::String, vec::Vec};
+use core::fmt;
+
+#[cfg(feature = "alloc")]
+use crate::primitives::decode::{SegwitHrpstring, SegwitHrpstringError};
+use crate::primitives::gf32::Fe32;
+use crate::primitives::hrp::Hrp;
+use crate::primitives::iter::{ByteIterExt, Fe32IterExt};
+use crate::primitives::segwit::{self, InvalidWitnessVersionError, WitnessLengthError};
+pub use crate::primitives::segwit::{VERSION_0, VERSION_1};
+use crate::primitives::{Bech32, Bech32m};
+use crate::write_err;
+
+/// Decodes a segwit address.
+///
+/// # Examples
+///
+/// ```
+/// use bech32::segwit;
+/// let address = "bc1py3m7vwnghyne9gnvcjw82j7gqt2rafgdmlmwmqnn3hvcmdm09rjqcgrtxs";
+/// let (_hrp, _witness_version, _witness_program) = segwit::decode(address).expect("failed to decode address");
+/// ```
+#[cfg(feature = "alloc")]
+pub fn decode(s: &str) -> Result<(Hrp, Fe32, Vec<u8>), SegwitHrpstringError> {
+    let segwit = SegwitHrpstring::new(s)?;
+    Ok((segwit.hrp(), segwit.witness_version(), segwit.byte_iter().collect::<Vec<u8>>()))
+}
+
+/// Encodes a segwit address.
+///
+/// Does validity checks on the `witness_version` and length checks on the `witness_program`.
+///
+/// As specified by [`BIP-350`] we use the [`Bech32m`] checksum algorithm for witness versions 1 and
+/// above, and for witness version 0 we use the original ([`BIP-173`]) [`Bech32`] checksum
+/// algorithm.
+///
+/// See also [`encode_v0`] or [`encode_v1`].
+///
+/// [`Bech32`]: crate::primitives::Bech32
+/// [`Bech32m`]: crate::primitives::Bech32m
+/// [BIP-173]: <https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki>
+/// [BIP-350]: <https://github.com/bitcoin/bips/blob/master/bip-0350.mediawiki>
+#[cfg(feature = "alloc")]
+pub fn encode(
+    hrp: &Hrp,
+    witness_version: Fe32,
+    witness_program: &[u8],
+) -> Result<String, EncodeError> {
+    segwit::validate_witness_version(witness_version)?;
+    segwit::validate_witness_program_length(witness_program.len(), witness_version)?;
+
+    let mut buf = String::new();
+    encode_to_fmt_unchecked(&mut buf, hrp, witness_version, witness_program)?;
+    Ok(buf)
+}
+
+/// Encodes a segwit version 0 address.
+#[cfg(feature = "alloc")]
+pub fn encode_v0(hrp: &Hrp, witness_program: &[u8]) -> Result<String, EncodeError> {
+    encode(hrp, VERSION_0, witness_program)
+}
+
+/// Encodes a segwit version 1 address.
+#[cfg(feature = "alloc")]
+pub fn encode_v1(hrp: &Hrp, witness_program: &[u8]) -> Result<String, EncodeError> {
+    encode(hrp, VERSION_1, witness_program)
+}
+
+/// Encodes a segwit address to a writer ([`fmt::Write`]) using lowercase characters.
+///
+/// Does not check the validity of the witness version and witness program lengths (see
+/// the [`crate::primitives::segwit`] module for validation functions).
+pub fn encode_to_fmt_unchecked<W: fmt::Write>(
+    fmt: &mut W,
+    hrp: &Hrp,
+    witness_version: Fe32,
+    witness_program: &[u8],
+) -> fmt::Result {
+    let iter = witness_program.iter().copied().bytes_to_fes();
+    match witness_version {
+        VERSION_0 => {
+            for c in iter.with_checksum::<Bech32>(hrp).with_witness_version(VERSION_0).chars() {
+                fmt.write_char(c)?;
+            }
+        }
+        version => {
+            for c in iter.with_checksum::<Bech32m>(hrp).with_witness_version(version).chars() {
+                fmt.write_char(c)?;
+            }
+        }
+    }
+    Ok(())
+}
+
+/// Encodes a segwit address to a writer ([`fmt::Write`]) using uppercase characters.
+///
+/// This is provided for use when creating QR codes.
+///
+/// Does not check the validity of the witness version and witness program lengths (see
+/// the [`crate::primitives::segwit`] module for validation functions).
+pub fn encode_to_fmt_unchecked_uppercase<W: fmt::Write>(
+    fmt: &mut W,
+    hrp: &Hrp,
+    witness_version: Fe32,
+    witness_program: &[u8],
+) -> fmt::Result {
+    let iter = witness_program.iter().copied().bytes_to_fes();
+    match witness_version {
+        VERSION_0 => {
+            for c in iter.with_checksum::<Bech32>(hrp).with_witness_version(VERSION_0).chars() {
+                fmt.write_char(c.to_ascii_uppercase())?;
+            }
+        }
+        version => {
+            for c in iter.with_checksum::<Bech32m>(hrp).with_witness_version(version).chars() {
+                fmt.write_char(c.to_ascii_uppercase())?;
+            }
+        }
+    }
+
+    Ok(())
+}
+
+/// An error while constructing a [`SegwitHrpstring`] type.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum EncodeError {
+    /// Invalid witness version (must be 0-16 inclusive).
+    WitnessVersion(InvalidWitnessVersionError),
+    /// Invalid witness length.
+    WitnessLength(WitnessLengthError),
+    /// Writing to formatter failed.
+    Write(fmt::Error),
+}
+
+impl fmt::Display for EncodeError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        use EncodeError::*;
+
+        match *self {
+            WitnessVersion(ref e) => write_err!(f, "witness version"; e),
+            WitnessLength(ref e) => write_err!(f, "witness length"; e),
+            Write(ref e) => write_err!(f, "writing to formatter failed"; e),
+        }
+    }
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for EncodeError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        use EncodeError::*;
+
+        match *self {
+            WitnessVersion(ref e) => Some(e),
+            WitnessLength(ref e) => Some(e),
+            Write(ref e) => Some(e),
+        }
+    }
+}
+
+impl From<InvalidWitnessVersionError> for EncodeError {
+    fn from(e: InvalidWitnessVersionError) -> Self { Self::WitnessVersion(e) }
+}
+
+impl From<WitnessLengthError> for EncodeError {
+    fn from(e: WitnessLengthError) -> Self { Self::WitnessLength(e) }
+}
+
+impl From<fmt::Error> for EncodeError {
+    fn from(e: fmt::Error) -> Self { Self::Write(e) }
+}
+
+#[cfg(all(test, feature = "alloc"))]
+mod tests {
+    use super::*;
+    use crate::primitives::hrp;
+
+    #[test]
+    // Just shows we handle both v0 and v1 addresses, for complete test
+    // coverage see primitives submodules and test vectors.
+    fn roundtrip_valid_mainnet_addresses() {
+        // A few recent addresses from mainnet (Block 801266).
+        let addresses = vec![
+            "bc1q2s3rjwvam9dt2ftt4sqxqjf3twav0gdx0k0q2etxflx38c3x8tnssdmnjq", // Segwit v0
+            "bc1py3m7vwnghyne9gnvcjw82j7gqt2rafgdmlmwmqnn3hvcmdm09rjqcgrtxs", // Segwit v1
+        ];
+
+        for address in addresses {
+            let (hrp, version, program) = decode(address).expect("failed to decode valid address");
+            let encoded = encode(&hrp, version, &program).expect("failed to encode address");
+            assert_eq!(encoded, address);
+        }
+    }
+
+    fn witness_program() -> [u8; 20] {
+        [
+            0x75, 0x1e, 0x76, 0xe8, 0x19, 0x91, 0x96, 0xd4, 0x54, 0x94, 0x1c, 0x45, 0xd1, 0xb3,
+            0xa3, 0x23, 0xf1, 0x43, 0x3b, 0xd6,
+        ]
+    }
+
+    #[test]
+    fn encode_to_fmt_lowercase() {
+        let program = witness_program();
+        let mut address = String::new();
+        encode_to_fmt_unchecked(&mut address, &hrp::BC, VERSION_0, &program)
+            .expect("failed to encode address to QR code");
+
+        let want = "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4";
+        assert_eq!(address, want);
+    }
+
+    #[test]
+    fn encode_to_fmt_uppercase() {
+        let program = witness_program();
+        let mut address = String::new();
+        encode_to_fmt_unchecked_uppercase(&mut address, &hrp::BC, VERSION_0, &program)
+            .expect("failed to encode address to QR code");
+
+        let want = "BC1QW508D6QEJXTDG4Y5R3ZARVARY0C5XW7KV8F3T4";
+        assert_eq!(address, want);
+    }
+}

tests/bip_173_test_vectors.rs

@@ -55,6 +55,19 @@ macro_rules! check_valid_address_roundtrip {
         $(
             #[test]
             fn $test_name() {
+                // We cannot use encode/decode for all test vectors because according to BIP-173 the
+                // bech32 checksum algorithm can be used with any witness version, and this is
+                // tested by the test vectors. However when BIP-350 came into effect only witness
+                // version 0 uses bech32 (and this is enforced by encode/decode).
+                if let Ok((hrp, bech32::Fe32::Q, program)) = bech32::segwit::decode($addr) {
+                    let encoded = bech32::segwit::encode_v0(&hrp, &program).expect("failed to encode address");
+                    // The bips specifically say that encoder should output lowercase characters so we uppercase manually.
+                    if encoded != $addr {
+                        let got = encoded.to_uppercase();
+                        assert_eq!(got, $addr)
+                    }
+                }
+
                 let hrpstring = SegwitHrpstring::new_bech32($addr).expect("valid address");
                 let hrp = hrpstring.hrp();
                 let witness_version = hrpstring.witness_version();

tests/bip_350_test_vectors.rs

@@ -6,7 +6,7 @@ use bech32::primitives::decode::{
     CheckedHrpstring, CheckedHrpstringError, ChecksumError, SegwitHrpstring, SegwitHrpstringError,
     UncheckedHrpstring,
 };
-use bech32::{Bech32, Bech32m, ByteIterExt, Fe32, Fe32IterExt};
+use bech32::{Bech32, Bech32m};
 
 // This is a separate test because we correctly identify this string as invalid but not for the
 // reason given in the bip.
@@ -55,14 +55,8 @@ macro_rules! check_valid_address_roundtrip {
             #[test]
             #[cfg(feature = "alloc")]
             fn $test_name() {
-                let hrpstring = SegwitHrpstring::new($addr).expect("valid address");
-                let hrp = hrpstring.hrp();
-                let witness_version = hrpstring.witness_version();
-
-                let encoded = match witness_version {
-                    Fe32::Q => hrpstring.byte_iter().bytes_to_fes().with_checksum::<Bech32>(&hrp.into()).with_witness_version(witness_version).chars().collect::<String>(),
-                    _ => hrpstring.byte_iter().bytes_to_fes().with_checksum::<Bech32m>(&hrp.into()).with_witness_version(witness_version).chars().collect::<String>(),
-                };
+                let (hrp, version, program) = bech32::segwit::decode($addr).expect("failed to decode valid address");
+                let encoded = bech32::segwit::encode(&hrp, version, &program).expect("failed to encode address");
 
                 // The bips specifically say that encoder should output lowercase characters so we uppercase manually.
                 if encoded != $addr {