Feature/v2 2

.github/workflows/cont_integration.yml

@@ -10,8 +10,8 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # current
-          - 1.63.0 # MSRV
+          - 1.90.0 # current
+          - 1.85.0 # MSRV
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -36,16 +36,6 @@ jobs:
       - name: Update Cargo.lock
         run: cargo update
       - name: Pin dependencies for MSRV
-        if: matrix.rust == '1.63.0'
-        run: |
-          cargo update -p home --precise 0.5.5
-          cargo update -p tokio --precise 1.38.1
-          cargo update -p ring:0.17.14 --precise 0.17.8
-          cargo update -p cc --precise 1.0.105
-          cargo update -p flate2 --precise 1.0.35
-          cargo update -p once_cell --precise 1.20.3
-          cargo update -p bzip2-sys --precise 0.1.11+1.0.8
-          cargo update -p minreq --precise 2.12.0
       - name: Build
         run: cargo build
       - name: Clippy

Cargo.toml

@@ -1,21 +1,27 @@
 [package]
 name = "bdk-reserves"
-version = "0.30.2"
+version = "2.2.0"
 authors = ["Richard Ulrich <richard.ulrich@aminagroup.com>"]
-edition = "2018"
+edition = "2024"
 description = "Proof of reserves for bitcoin dev kit"
 keywords = ["proof", "reserves", "bitcoin", "psbt"]
 readme = "README.md"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/bitcoindevkit/bdk-reserves"
 
 [dependencies]
-bdk = { version = "0.30.2", default-features = false, features = ["std"] }
+bdk_wallet = { version = "2.2.0", default-features = false, features = ["std"] }
+bdk_coin_select = "0.4"
 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"] }
+rstest = "^0.26"
+bdk_wallet = { version = "2.2.0", default-features = true, features = ["test-utils"] }
+bdk_electrum = "0.23.1"
+bdk_tx = "0.1"
+secp256k1 = { version = "0.29", features = [ "rand" ] }
+electrsd = { version = "0.36", features = ["corepc-node_29_0", "electrs_0_10_6"] }

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.81-bookworm
+FROM rust:1.90-trixie
 ARG http_proxy
 ENV http_proxy=$http_proxy
 ENV https_proxy=$http_proxy
@@ -35,7 +35,4 @@ WORKDIR /home/satoshi
 
 RUN rustup component add clippy-preview \
  && rustup component add rustfmt
-RUN rustup target add wasm32-unknown-unknown
-RUN rustup target add wasm32-wasi
-RUN rustup target add wasm32-unknown-emscripten
 

Dockerfile_63 → Dockerfile_85

@@ -1,4 +1,4 @@
-FROM rust:1.63-buster
+FROM rust:1.85-trixie
 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 \
@@ -34,6 +35,4 @@ WORKDIR /home/satoshi
 
 RUN rustup component add clippy-preview \
  && rustup component add rustfmt
-RUN rustup target add wasm32-unknown-unknown
-RUN rustup target add wasm32-wasi
 

Makefile

@@ -1,30 +1,24 @@
 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_85
 
 test_current: builder
 	rm -f Cargo.lock
 	$(DOCKER_RUN) ${TAG} cargo test
 
-test_63: builder_63
+test_85: builder_85
 	rm -f Cargo.lock
-	$(DOCKER_RUN) ${TAG_63} cargo test || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p home --precise 0.5.5 || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p tokio --precise 1.38.1 || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p ring:0.17.14 --precise 0.17.8 || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p cc --precise 1.0.105 || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p flate2 --precise 1.0.35 || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p once_cell --precise 1.20.3 || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p bzip2-sys --precise 0.1.11+1.0.8 || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p minreq --precise 2.12.0 || true
-	$(DOCKER_RUN) ${TAG_63} cargo test
+	$(DOCKER_RUN) ${TAG_75} cargo test || true
+	$(DOCKER_RUN) ${TAG_75} cargo update -p home --precise "0.5.9" || 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
@@ -47,10 +41,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,15 +50,8 @@ 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.85.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 cc --precise 1.0.105
-```
 
 ## 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;