Update to v0.28.0

bitcoindevkit · May 24, 2023 · 10d6118 · 10d6118
1 parent 2d1b1e3
commit 10d6118
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bdk-reserves"
-version = "0.27.1"
+version = "0.28.0"
 authors = ["Richard Ulrich <richard.ulrich@seba.swiss>"]
 edition = "2018"
 description = "Proof of reserves for bitcoin dev kit"
@@ -10,13 +10,16 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/bitcoindevkit/bdk-reserves"
 
 [dependencies]
-bdk = { version = "0.27.1", default-features = false }
+bdk = { version = "0.28", default-features = false }
 bitcoinconsensus = "0.19.0-3"
 log = "^0.4"
 
 [dev-dependencies]
 rstest = "^0.11"
 bdk-testutils = "^0.4"
-bdk = { version = "0.27.1", default-features = true }
-electrsd = { version = "0.21", features = ["bitcoind_22_0", "electrs_0_9_1"] }
-base64 = "^0.13"
+bdk = { version = "0.28", default-features = true }
+electrsd = { version = "0.23", features = ["bitcoind_22_0", "electrs_0_9_1"] }
+# zip versions after 0.6.3 don't work with our MSRV 1.57.0
+zip = "=0.6.3"
+# base64ct versions at 1.6.0 and higher have MSRV 1.60.0
+base64ct = { version = "<1.6.0", features = ["alloc"] }
diff --git a/src/reserves.rs b/src/reserves.rs
@@ -334,7 +334,7 @@ fn challenge_txin(message: &str) -> TxIn {
 #[cfg(test)]
 mod test {
     use super::*;
-    use base64;
+    use base64ct::{Base64, Encoding};
     use bdk::bitcoin::consensus::encode::deserialize;
     use bdk::bitcoin::{Address, Network};
     use bdk::wallet::get_funded_wallet;
@@ -347,8 +347,9 @@ mod test {
         let message = "This belongs to me.";
         let psbt = wallet.create_proof(message).unwrap();
         let psbt_ser = serialize(&psbt);
-        let psbt_b64 = base64::encode(&psbt_ser);
+        let psbt_b64 = Base64::encode_string(&psbt_ser);
         let expected = r#"cHNidP8BAH4BAAAAAmw1RvG4UzfnSafpx62EPTyha6VslP0Er7n3TxjEpeBeAAAAAAD/////2johM0znoXIXT1lg+ySrvGrtq1IGXPJzpfi/emkV9iIAAAAAAP////8BUMMAAAAAAAAZdqkUn3/QltN+0sDj9/DPySS+70/862iIrAAAAAAAAQEKAAAAAAAAAAABUQEHAAABAR9QwwAAAAAAABYAFOzlJlcQU9qGRUyeBmd56vnRUC5qIgYDKwVYB4vsOGlKhJM9ZZMD4lddrn6RaFkRRUEVv9ZEh+ME7OUmVwAA"#;
+
         assert_eq!(psbt_b64, expected);
     }
 
@@ -376,7 +377,7 @@ mod test {
 
     fn get_signed_proof() -> PSBT {
         let psbt = "cHNidP8BAH4BAAAAAmw1RvG4UzfnSafpx62EPTyha6VslP0Er7n3TxjEpeBeAAAAAAD/////2johM0znoXIXT1lg+ySrvGrtq1IGXPJzpfi/emkV9iIAAAAAAP////8BUMMAAAAAAAAZdqkUn3/QltN+0sDj9/DPySS+70/862iIrAAAAAAAAQEKAAAAAAAAAAABUQEHAAABAR9QwwAAAAAAABYAFOzlJlcQU9qGRUyeBmd56vnRUC5qAQcAAQhrAkcwRAIgDSE4PQ57JDiZ7otGkTqz35bi/e1pexYaYKWaveuvRd4CIFzVB4sAmgtdEVz2vHzs1iXc9iRKJ+KQOQb+C2DtPyvzASEDKwVYB4vsOGlKhJM9ZZMD4lddrn6RaFkRRUEVv9ZEh+MAAA==";
-        let psbt = base64::decode(psbt).unwrap();
+        let psbt = Base64::decode_vec(&psbt).unwrap();
         deserialize(&psbt).unwrap()
     }
 

diff --git a/tests/regtestenv.rs b/tests/regtestenv.rs
@@ -1,11 +1,11 @@
 use bdk::blockchain::{electrum::ElectrumBlockchain, Blockchain};
 use bdk::database::memory::MemoryDatabase;
 use bdk::electrum_client::Client;
-use bdk::electrum_client::ElectrumApi;
 use bdk::wallet::{AddressIndex, SyncOptions, Wallet};
 use bdk::SignOptions;
 use electrsd::bitcoind::bitcoincore_rpc::{bitcoin::Address, RpcApi};
 use electrsd::bitcoind::BitcoinD;
+use electrsd::electrum_client::ElectrumApi;
 use electrsd::ElectrsD;
 use std::str::FromStr;
 use std::time::Duration;
@@ -93,7 +93,7 @@ impl RegTestEnv {
         let old_height = self
             .electrsd
             .client
-            .block_headers_subscribe()
+            .block_headers_subscribe_raw()
             .unwrap()
             .height;