Upgrading to BDK v1.0

.github/workflows/cont_integration.yml

@@ -39,8 +39,10 @@ jobs:
         if: matrix.rust == '1.63.0'
         run: |
           cargo update -p home:0.5.11 --precise 0.5.5
-          cargo update -p tokio:1.43.0 --precise 1.38.1
           cargo update -p cc --precise 1.0.105
+          cargo update -p rustls:0.23.21 --precise 0.23.12
+          cargo update -p time --precise 0.3.20
+          cargo update -p zstd-sys --precise "2.0.7+zstd.1.5.4"
       - name: Build
         run: cargo build
       - name: Clippy

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bdk-reserves"
-version = "0.30.1"
+version = "1.0.0"
 authors = ["Richard Ulrich <[email protected]>"]
 edition = "2018"
 description = "Proof of reserves for bitcoin dev kit"
@@ -10,12 +10,15 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/bitcoindevkit/bdk-reserves"
 
 [dependencies]
-bdk = { version = "0.30.1", default-features = false, features = ["std"] }
+bdk_wallet = { version = "1.0.0", default-features = false, features = ["std"] }
 bitcoinconsensus = "0.19.0-3"
 log = "^0.4"
 
+# same version as in rust-bitcoin - I couldn't find a re-export
+units = { package = "bitcoin-units", version = "0.1.0", default-features = false, features = ["alloc"] }
+
 [dev-dependencies]
 rstest = "^0.11"
-bdk-testutils = "^0.4"
-bdk = { version = "0.30.1", default-features = true }
-electrsd = { version = "0.24", features = ["bitcoind_22_0", "electrs_0_9_1"] }
+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"] }

Dockerfile

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM rust:1.70-bookworm
-=======
 FROM rust:1.81-bookworm
->>>>>>> d2a9c38 (upgrading to match bdk v0.30)
 ARG http_proxy
 ENV http_proxy=$http_proxy
 ENV https_proxy=$http_proxy

Makefile

@@ -18,8 +18,10 @@ test_63: builder_63
 	rm -f Cargo.lock
 	$(DOCKER_RUN) ${TAG_63} cargo test || true
 	$(DOCKER_RUN) ${TAG_63} cargo update -p home:0.5.11 --precise 0.5.5 || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p tokio:1.43.0 --precise 1.38.1 || true
 	$(DOCKER_RUN) ${TAG_63} cargo update -p cc --precise 1.0.105 || true
+	$(DOCKER_RUN) ${TAG_63} cargo update -p rustls:0.23.21 --precise 0.23.12 || true
+	$(DOCKER_RUN) ${TAG_63} cargo update -p time --precise 0.3.20 || true
+	$(DOCKER_RUN) ${TAG_63} cargo update -p zstd-sys --precise "2.0.7+zstd.1.5.4" || true
 	$(DOCKER_RUN) ${TAG_63} cargo test
 
 run: builder

README.md

@@ -55,9 +55,11 @@ This library should always compile with Rust **1.63.0**.
 To build with the MSRV you will need to pin the below dependencies:
 
 ```shell
-cargo update -p home:0.5.9 --precise 0.5.5
-cargo update -p tokio:1.39.3 --precise 1.38.1
+cargo update -p home:0.5.11 --precise 0.5.5
 cargo update -p cc --precise 1.0.105
+cargo update -p rustls:0.23.21 --precise 0.23.12
+cargo update -p time --precise 0.3.20
+cargo update -p zstd-sys --precise "2.0.7+zstd.1.5.4"
 ```
 
 ## Contribution

src/lib.rs

@@ -9,6 +9,6 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
-pub extern crate bdk;
+pub extern crate bdk_wallet;
 
 pub mod reserves;