From 0bf0a7ca791f59115c727c51d601507cd20851b3 Mon Sep 17 00:00:00 2001
From: Richard Ulrich <richard.ulrich@seba.swiss>
Date: Wed, 8 Jan 2025 16:12:58 +0100
Subject: [PATCH] upgrading to match bdk v0.30

---
 .github/workflows/cont_integration.yml |  7 ++++---
 Cargo.toml                             |  6 +++---
 Dockerfile                             |  4 ++++
 Makefile                               | 28 ++------------------------
 4 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml
index 22d0bae..421fd64 100644
--- a/.github/workflows/cont_integration.yml
+++ b/.github/workflows/cont_integration.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.75.0 # STABLE
+          - 1.81.0 # current
           - 1.63.0 # MSRV
     steps:
       - name: checkout
@@ -38,8 +38,9 @@ jobs:
       - name: Pin dependencies for MSRV
         if: matrix.rust == '1.63.0'
         run: |
-          cargo update -p home:0.5.9 --precise 0.5.5
-          cargo update -p tokio:1.40.0 --precise 1.38.1
+          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 tokio-macros:2.3.0 --precise 1.8.2
           cargo update -p cc --precise 1.0.105
       - name: Build
         run: cargo build
diff --git a/Cargo.toml b/Cargo.toml
index 630f529..86a22f1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bdk-reserves"
-version = "0.29.0"
+version = "0.30.1"
 authors = ["Richard Ulrich <richard.ulrich@aminagroup.com>"]
 edition = "2018"
 description = "Proof of reserves for bitcoin dev kit"
@@ -10,12 +10,12 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/bitcoindevkit/bdk-reserves"
 
 [dependencies]
-bdk = { version = "0.29", default-features = false, features = ["std"] }
+bdk = { version = "0.30.1", default-features = false, features = ["std"] }
 bitcoinconsensus = "0.19.0-3"
 log = "^0.4"
 
 [dev-dependencies]
 rstest = "^0.11"
 bdk-testutils = "^0.4"
-bdk = { version = "0.29", default-features = true }
+bdk = { version = "0.30.1", default-features = true }
 electrsd = { version = "0.24", features = ["bitcoind_22_0", "electrs_0_9_1"] }
diff --git a/Dockerfile b/Dockerfile
index e60c33c..00e33fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,8 @@
+<<<<<<< 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
diff --git a/Makefile b/Makefile
index 121facb..304ebea 100644
--- a/Makefile
+++ b/Makefile
@@ -14,35 +14,11 @@ test_current: builder
 	rm -f Cargo.lock
 	$(DOCKER_RUN) ${TAG} cargo test
 
-test_57: builder_57
-	#rm -f Cargo.lock
-	#$(DOCKER_RUN) ${TAG_57} cargo update -p log:0.4.20 --precise 0.4.18
-	#$(DOCKER_RUN) ${TAG_57} cargo update -p tempfile --precise 3.6.0
-	#$(DOCKER_RUN) ${TAG_57} cargo update -p sct:0.7.1 --precise 0.7.0
-	$(DOCKER_RUN) ${TAG_57} cargo update -p zip:0.6.6 --precise 0.6.3 || true
-	$(DOCKER_RUN) ${TAG_57} cargo update -p rustls:0.21.10 --precise 0.21.1 || true
-	$(DOCKER_RUN) ${TAG_57} cargo update -p rustls:0.21.7 --precise 0.21.1 || true
-	$(DOCKER_RUN) ${TAG_57} cargo update -p rustls:0.21.4 --precise 0.21.1 || true
-	$(DOCKER_RUN) ${TAG_57} cargo update -p rustls:0.21.2 --precise 0.21.1 || true
-	$(DOCKER_RUN) ${TAG_57} cargo update -p rustls:0.20.9 --precise 0.20.8 || true
-	$(DOCKER_RUN) ${TAG_57} cargo update -p rustls-webpki:0.100.3 --precise 0.100.1 || true
-	$(DOCKER_RUN) ${TAG_57} cargo update -p rustls-webpki:0.101.4 --precise 0.101.1 || true
-	$(DOCKER_RUN) ${TAG_57} cargo update -p rustls-webpki:0.101.7 --precise 0.101.1 || true
-	$(DOCKER_RUN) ${TAG_57} cargo update -p crossbeam-utils:0.8.18 --precise 0.8.16 || true
-	$(DOCKER_RUN) ${TAG_57} cargo update -p tokio:1.35.1 --precise 1.29.1 || true
-	$(DOCKER_RUN) ${TAG_57} cargo update -p rustix:0.38.9 --precise 0.38.3 || true
-	$(DOCKER_RUN) ${TAG_57} cargo update -p ring:0.17.7 --precise 0.16.20 || true
-	$(DOCKER_RUN) ${TAG_57} cargo update -p byteorder:1.5.0 --precise 0.4.3 || true
-	$(DOCKER_RUN) ${TAG_57} cargo update -p webpki:0.22.4 --precise 0.22.0 || true
-	$(DOCKER_RUN) ${TAG_57} cargo update -p crossbeam-epoch:0.9.17 --precise 0.9.15 || true
-	$(DOCKER_RUN) ${TAG_57} cargo update -p byteorder:1.5.0 --precise 0.4.3 || true
-	$(DOCKER_RUN) ${TAG_57} cargo test
-
 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.9 --precise 0.5.5 || true
-	$(DOCKER_RUN) ${TAG_63} cargo update -p tokio:1.40.0 --precise 1.38.1 || 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 test