From 315f1bd6cdd44df53a2532321981dd39f7aa6b6f Mon Sep 17 00:00:00 2001
From: Riccardo Casatta <riccardo@casatta.it>
Date: Wed, 14 Aug 2024 13:39:59 +0200
Subject: [PATCH] wip

---
 Cargo.toml            | 5 +++--
 src/blech32/decode.rs | 2 +-
 src/blech32/mod.rs    | 5 ++++-
 src/blind.rs          | 4 ++--
 src/lib.rs            | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d0f337a6..c04cc5c5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,8 +22,9 @@ json-contract = ["serde_json"]
 base64 = ["bitcoin/base64"]
 
 [dependencies]
-bitcoin = "0.31.0"
-secp256k1-zkp = { version = "0.10.0", features = ["global-context", "hashes"] }
+bech32 = "0.11.0"
+bitcoin = "0.32.2"
+secp256k1-zkp = { version = "0.11.0", features = ["global-context", "hashes"] }
 
 # Used for ContractHash::from_json_contract.
 serde_json = { version = "1.0", optional = true }
diff --git a/src/blech32/decode.rs b/src/blech32/decode.rs
index 4153b37a..a2dcd299 100644
--- a/src/blech32/decode.rs
+++ b/src/blech32/decode.rs
@@ -150,7 +150,7 @@ impl<'s> UncheckedHrpstring<'s> {
         }
 
         let mut checksum_eng = checksum::Engine::<Ck>::new();
-        checksum_eng.input_hrp(&self.hrp());
+        checksum_eng.input_hrp(self.hrp());
 
         // Unwrap ok since we checked all characters in our constructor.
         for fe in self.data.iter().map(|&b| Fe32::from_char(b.into()).unwrap()) {
diff --git a/src/blech32/mod.rs b/src/blech32/mod.rs
index 0fe75bba..c819fb7a 100644
--- a/src/blech32/mod.rs
+++ b/src/blech32/mod.rs
@@ -37,6 +37,8 @@ impl crate::bech32::Checksum for Blech32 {
         0x7093e5a608865b,
     ];
     const TARGET_RESIDUE: u64 = 1;
+
+    const CODE_LENGTH: usize = 9999; // TODO
 }
 
 /// The blech32m checksum algorithm.
@@ -54,5 +56,6 @@ impl crate::bech32::Checksum for Blech32m {
         0x7093e5a608865b,
     ];
     const TARGET_RESIDUE: u64 = 0x455972a3350f7a1;
-}
 
+    const CODE_LENGTH: usize = 9999; // TODO
+}
diff --git a/src/blind.rs b/src/blind.rs
index 0b7a533e..0aefeabc 100644
--- a/src/blind.rs
+++ b/src/blind.rs
@@ -1466,7 +1466,7 @@ mod tests {
                 SECP256K1,
                 &PrivateKey {
                     compressed: true,
-                    network: Network::Regtest,
+                    network: bitcoin::NetworkKind::Test,
                     inner: sk,
                 },
             );
@@ -1475,7 +1475,7 @@ mod tests {
                 SECP256K1,
                 &PrivateKey {
                     compressed: true,
-                    network: Network::Regtest,
+                    network: bitcoin::NetworkKind::Test,
                     inner: blinding_sk,
                 },
             );
diff --git a/src/lib.rs b/src/lib.rs
index e784896f..e175cb4a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -65,7 +65,7 @@ mod serde_utils;
 // consider making upstream public
 mod endian;
 // re-export bitcoin deps which we re-use
-pub use bitcoin::bech32;
+pub(crate) use bech32;
 pub use bitcoin::hashes;
 // export everything at the top level so it can be used as `elements::Transaction` etc.
 pub use crate::address::{Address, AddressParams, AddressError};