upgrading bdk_wallet to version 1.2.0

Author: ulrichard

.github/workflows/cont_integration.yml

@@ -14,11 +14,11 @@ jobs:
           - 1.63.0 # MSRV
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Generate cache key
         run: echo "${{ matrix.rust }} ${{ matrix.features }}" | tee .cache_key
       - name: cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/registry
@@ -38,11 +38,17 @@ jobs:
       - name: Pin dependencies for MSRV
         if: matrix.rust == '1.63.0'
         run: |
-          cargo update -p home:0.5.11 --precise 0.5.5
+          cargo update -p home --precise 0.5.5
+          cargo update -p ring:0.17.14 --precise 0.17.8
+          cargo update -p rustls:0.23.26 --precise 0.23.12
           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"
+          cargo update -p base64ct --precise "1.6.0"
+          cargo update -p once_cell --precise 1.20.3
+          cargo update -p flate2 --precise 1.0.35
+          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,6 +1,6 @@
 [package]
 name = "bdk-reserves"
-version = "1.0.0"
+version = "1.2.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.0.0", default-features = false, features = ["std"] }
+bdk_wallet = { version = "1.2.0", default-features = false, features = ["std"] }
 bitcoinconsensus = "0.19.0-3"
 log = "^0.4"
 

Makefile

@@ -1,5 +1,4 @@
 TAG := bdk-reserves
-TAG_57 := bdk-reserves-57
 TAG_63 := bdk-reserves-61
 http_proxy ?= http://172.17.0.1:3128
 DOCKER_RUN := docker run --interactive --rm \
@@ -17,11 +16,17 @@ test_current: builder
 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 home --precise 0.5.5 || true
+	$(DOCKER_RUN) ${TAG_63} cargo update -p ring:0.17.14 --precise 0.17.8 || true
+	$(DOCKER_RUN) ${TAG_63} cargo update -p rustls:0.23.26 --precise 0.23.12 || 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 update -p base64ct --precise "1.6.0" || true
+	$(DOCKER_RUN) ${TAG_63} cargo update -p once_cell --precise 1.20.3 || 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.11+1.0.8 || true
+	$(DOCKER_RUN) ${TAG_63} cargo update -p minreq --precise 2.12.0 || true
 	$(DOCKER_RUN) ${TAG_63} cargo test
 
 run: builder
@@ -45,13 +50,6 @@ builder:
 		--build-arg UID="$(shell id -u)" \
 		.
 
-builder_57:
-	docker build --tag ${TAG_57}\
-		--build-arg http_proxy="${http_proxy}" \
-		--build-arg UID="$(shell id -u)" \
-		-f Dockerfile_57 \
-		.
-
 builder_63:
 	docker build --tag ${TAG_63}\
 		--build-arg http_proxy="${http_proxy}" \

README.md

@@ -55,11 +55,17 @@ 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.11 --precise 0.5.5
+cargo update -p home --precise 0.5.5
+cargo update -p ring:0.17.14 --precise 0.17.8
 cargo update -p cc --precise 1.0.105
-cargo update -p rustls:0.23.21 --precise 0.23.12
+cargo update -p rustls:0.23.26 --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"
+cargo update -p base64ct --precise "1.6.0"
+cargo update -p once_cell --precise 1.20.3
+cargo update -p flate2 --precise 1.0.35
+cargo update -p bzip2-sys --precise 0.1.11+1.0.8
+cargo update -p minreq --precise 2.12.0
 ```
 
 ## Contribution

src/reserves.rs

@@ -358,7 +358,7 @@ mod test {
 
         let psbt_b64 = psbt.to_string();
 
-        let expected = r#"cHNidP8BAH4BAAAAAmw1RvG4UzfnSafpx62EPTyha6VslP0Er7n3TxjEpeBeAAAAAAD/////MQvsP2eDTCk3vWfQJ50IOFWLwuTHPsnYikR1hosdK0sAAAAAAP3///8BUMMAAAAAAAAZdqkUn3/QltN+0sDj9/DPySS+70/862iIrAAAAAAAAQEKAAAAAAAAAAABUQEHAAABAR9QwwAAAAAAABYAFOzlJlcQU9qGRUyeBmd56vnRUC5qIgYDKwVYB4vsOGlKhJM9ZZMD4lddrn6RaFkRRUEVv9ZEh+ME7OUmVwAA"#;
+        let expected = r#"cHNidP8BAH4CAAAAAmw1RvG4UzfnSafpx62EPTyha6VslP0Er7n3TxjEpeBeAAAAAAD/////MQvsP2eDTCk3vWfQJ50IOFWLwuTHPsnYikR1hosdK0sAAAAAAP3///8BUMMAAAAAAAAZdqkUn3/QltN+0sDj9/DPySS+70/862iIrAAAAAAAAQEKAAAAAAAAAAABUQEHAAABAR9QwwAAAAAAABYAFOzlJlcQU9qGRUyeBmd56vnRUC5qIgYDKwVYB4vsOGlKhJM9ZZMD4lddrn6RaFkRRUEVv9ZEh+ME7OUmVwAA"#;
 
         assert_eq!(psbt_b64, expected);
 
@@ -373,7 +373,7 @@ mod test {
 
         let psbt_b64 = psbt.to_string();
 
-        let expected = r#"cHNidP8BAH4BAAAAAmw1RvG4UzfnSafpx62EPTyha6VslP0Er7n3TxjEpeBeAAAAAAD/////MQvsP2eDTCk3vWfQJ50IOFWLwuTHPsnYikR1hosdK0sAAAAAAP3///8BUMMAAAAAAAAZdqkUn3/QltN+0sDj9/DPySS+70/862iIrAAAAAAAAQEKAAAAAAAAAAABUQEHAAABAR9QwwAAAAAAABYAFOzlJlcQU9qGRUyeBmd56vnRUC5qAQhrAkcwRAIgR9XtbnBY0jUe9zXI0kCEzEua5pHm6Bal6mCHNBmTTIECIE2NbjpRjD6/nZv72GQ7qPZ1Sdo3BPps0cBN1DOsB+S+ASEDKwVYB4vsOGlKhJM9ZZMD4lddrn6RaFkRRUEVv9ZEh+MAAA=="#;
+        let expected = r#"cHNidP8BAH4CAAAAAmw1RvG4UzfnSafpx62EPTyha6VslP0Er7n3TxjEpeBeAAAAAAD/////MQvsP2eDTCk3vWfQJ50IOFWLwuTHPsnYikR1hosdK0sAAAAAAP3///8BUMMAAAAAAAAZdqkUn3/QltN+0sDj9/DPySS+70/862iIrAAAAAAAAQEKAAAAAAAAAAABUQEHAAABAR9QwwAAAAAAABYAFOzlJlcQU9qGRUyeBmd56vnRUC5qAQhrAkcwRAIgMjk39sEdlh9VEb0GOKNy+C/X4yiZd4/AteVnZjdSuPYCIBQKVpBGTpUSZNoXqT93EucKLLFVQnLJIkPXKjRYO4eJASEDKwVYB4vsOGlKhJM9ZZMD4lddrn6RaFkRRUEVv9ZEh+MAAA=="#;
 
         assert_eq!(psbt_b64, expected);
     }