upgrading bdk_wallet to version 2.1

Author: ulrichard

.github/workflows/cont_integration.yml

@@ -10,8 +10,8 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.87.0 # current
-          - 1.63.0 # MSRV
+          - 1.89.0 # current
+          - 1.75.0 # MSRV
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -36,19 +36,12 @@ jobs:
       - name: Update Cargo.lock
         run: cargo update
       - name: Pin dependencies for MSRV
-        if: matrix.rust == '1.63.0'
+        if: matrix.rust == '1.75.0'
         run: |
-          cargo update -p zstd-sys --precise "2.0.8+zstd.1.5.5"
-          cargo update -p time --precise "0.3.20"
-          cargo update -p home --precise "0.5.5"
-          cargo update -p flate2 --precise "1.0.35"
-          cargo update -p bzip2-sys --precise "0.1.12"
-          cargo update -p ring --precise "0.17.12"
-          cargo update -p once_cell --precise "1.20.3"
-          cargo update -p base64ct --precise "1.6.0"
-          cargo update -p minreq --precise "2.13.2"
-          cargo update -p bdk_electrum --precise 0.20.1
-          cargo update -p rustls:0.23.28 --precise 0.23.12
+	  cargo update -p base64ct --precise "1.7.3"
+	  cargo update -p home --precise "0.5.9"
+	  cargo update -p deranged --precise "0.4.0"
+	  cargo update -p minreq --precise "2.13.2"
       - name: Build
         run: cargo build
       - name: Clippy

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bdk-reserves"
-version = "1.2.0"
+version = "2.1.0"
 authors = ["Richard Ulrich <[email protected]>"]
 edition = "2018"
 description = "Proof of reserves for bitcoin dev kit"
@@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/bitcoindevkit/bdk-reserves"
 
 [dependencies]
-bdk_wallet = { version = "1.2.0", default-features = false, features = ["std"] }
+bdk_wallet = { version = "2.1.0", default-features = false, features = ["std"] }
 bitcoinconsensus = "0.19.0-3"
 log = "^0.4"
 
@@ -19,6 +19,6 @@ units = { package = "bitcoin-units", version = "0.1.0", default-features = false
 
 [dev-dependencies]
 rstest = "^0.11"
-bdk_wallet = { version = "1.0.0", default-features = true, features = ["test-utils"] }
-bdk_electrum = "0.20.1"
-electrsd = { version = "0.29", features = ["bitcoind_22_1", "electrs_0_9_1"] }
+bdk_wallet = { version = "2.1.0", default-features = true, features = ["test-utils"] }
+bdk_electrum = "0.23.1"
+electrsd = { version = "0.34", features = ["corepc-node_28_0", "electrs_0_10_6"] }

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.87-bookworm
+FROM rust:1.89-trixie
 ARG http_proxy
 ENV http_proxy=$http_proxy
 ENV https_proxy=$http_proxy

Dockerfile_63 renamed to Dockerfile_75

@@ -1,4 +1,4 @@
-FROM rust:1.63-buster
+FROM rust:1.75-bookworm
 ARG http_proxy
 ENV http_proxy=$http_proxy
 ENV https_proxy=$http_proxy
@@ -16,6 +16,7 @@ RUN apt-get update \
        ca-certificates \
        clang \
        curl \
+       emscripten \
        hunspell \
        libclang-dev \
        libssl-dev \

Makefile

@@ -1,33 +1,26 @@
 TAG := bdk-reserves
-TAG_63 := bdk-reserves-63
-http_proxy ?= http://172.17.0.1:3128
+TAG_75 := bdk-reserves-75
+#http_proxy ?= http://172.17.0.1:3128
 DOCKER_RUN := docker run --interactive --rm \
 	-v ${PWD}:/home/satoshi \
 
 build: builder
 	$(DOCKER_RUN) --tty ${TAG} cargo build
 
-test: test_current test_63
+test: test_current test_75
 
 test_current: builder
 	rm -f Cargo.lock
 	$(DOCKER_RUN) ${TAG} cargo test
 
-test_63: builder_63
+test_75: builder_75
 	rm -f Cargo.lock
-	$(DOCKER_RUN) ${TAG_63} cargo test || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p zstd-sys --precise "2.0.8+zstd.1.5.5" || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p time --precise "0.3.20" || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p home --precise "0.5.5" || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p flate2 --precise "1.0.35" || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p bzip2-sys --precise "0.1.12" || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p ring --precise "0.17.12" || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p once_cell --precise "1.20.3" || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p base64ct --precise "1.6.0" || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p minreq --precise "2.13.2" || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p bdk_electrum --precise 0.20.1 || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p rustls:0.23.28 --precise 0.23.12 || true
-	$(DOCKER_RUN) ${TAG_63} cargo test
+	$(DOCKER_RUN) ${TAG_75} cargo test || true
+	$(DOCKER_RUN) ${TAG_75} cargo update -p base64ct --precise "1.7.3" || true
+	$(DOCKER_RUN) ${TAG_75} cargo update -p home --precise "0.5.9" || true
+	$(DOCKER_RUN) ${TAG_75} cargo update -p deranged --precise "0.4.0" || true
+	$(DOCKER_RUN) ${TAG_75} cargo update -p minreq --precise "2.13.2" || true
+	$(DOCKER_RUN) ${TAG_75} cargo test
 
 run: builder
 	$(DOCKER_RUN) --tty ${TAG} cargo run
@@ -50,10 +43,10 @@ builder:
 		--build-arg UID="$(shell id -u)" \
 		.
 
-builder_63:
-	docker build --tag ${TAG_63}\
+builder_75:
+	docker build --tag ${TAG_75}\
 		--build-arg http_proxy="${http_proxy}" \
 		--build-arg UID="$(shell id -u)" \
-		-f Dockerfile_63 \
+		-f Dockerfile_75 \
 		.
 

README.md

@@ -50,22 +50,15 @@ at your option.
 
 ## Minimum Supported Rust Version (MSRV)
 
-This library should always compile with Rust **1.63.0**.
+This library should always compile with Rust **1.75.0**.
 
 To build with the MSRV you will need to pin the below dependencies:
 
 ```shell
-cargo update -p zstd-sys --precise "2.0.8+zstd.1.5.5"
-cargo update -p time --precise "0.3.20"
-cargo update -p home --precise "0.5.5"
-cargo update -p flate2 --precise "1.0.35"
-cargo update -p bzip2-sys --precise "0.1.12"
-cargo update -p ring --precise "0.17.12"
-cargo update -p once_cell --precise "1.20.3"
-cargo update -p base64ct --precise "1.6.0"
+cargo update -p base64ct --precise "1.7.3"
+cargo update -p home --precise "0.5.9"
+cargo update -p deranged --precise "0.4.0"
 cargo update -p minreq --precise "2.13.2"
-cargo update -p bdk_electrum --precise 0.20.1
-cargo update -p rustls:0.23.28 --precise 0.23.12
 ```
 
 ## Contribution

tests/regtestenv.rs

@@ -2,11 +2,8 @@ use bdk_electrum::electrum_client::Client;
 use bdk_electrum::{electrum_client, BdkElectrumClient};
 use bdk_wallet::bitcoin::{Amount, FeeRate};
 use bdk_wallet::{KeychainKind, SignOptions, Wallet};
-use electrsd::bitcoind::bitcoincore_rpc::{
-    bitcoin::{Address, Network},
-    RpcApi,
-};
-use electrsd::bitcoind::BitcoinD;
+use electrsd::corepc_node::client::bitcoin::{Address, Network};
+use electrsd::corepc_node::Node;
 use electrsd::electrum_client::ElectrumApi;
 use electrsd::ElectrsD;
 use std::str::FromStr;
@@ -15,20 +12,20 @@ use std::time::Duration;
 /// The environment to run a single test, while many of them can run in parallel.
 pub struct RegTestEnv {
     /// Instance of the bitcoin core daemon
-    bitcoind: BitcoinD,
+    bitcoind: Node,
     /// Instance of the electrs electrum server
     electrsd: ElectrsD,
 }
 
 impl RegTestEnv {
     /// set up local bitcoind and electrs instances in regtest mode
     pub fn new() -> Self {
-        let mut bitcoind_conf = electrsd::bitcoind::Conf::default();
-        bitcoind_conf.p2p = electrsd::bitcoind::P2P::Yes;
+        let mut bitcoind_conf = electrsd::corepc_node::Conf::default();
+        bitcoind_conf.p2p = electrsd::corepc_node::P2P::Yes;
 
-        let bitcoind_exe = electrsd::bitcoind::downloaded_exe_path()
+        let bitcoind_exe = electrsd::corepc_node::downloaded_exe_path()
             .expect("We should always have downloaded path");
-        let bitcoind = BitcoinD::with_conf(bitcoind_exe, &bitcoind_conf).unwrap();
+        let bitcoind = Node::with_conf(bitcoind_exe, &bitcoind_conf).unwrap();
 
         let mut elect_conf = electrsd::Conf::default();
         elect_conf.view_stderr = false; // setting this to true will lead to very verbose logging
@@ -116,7 +113,7 @@ impl RegTestEnv {
 
         self.bitcoind
             .client
-            .generate_to_address(blocks as u64, address)
+            .generate_to_address(blocks, address)
             .unwrap();
 
         let header = loop {
@@ -127,7 +124,7 @@ impl RegTestEnv {
             }
         };
 
-        assert_eq!(header.height, old_height + blocks);
+        assert!(header.height >= old_height + blocks, "{} >= {}", header.height, old_height + blocks);
     }
 }