Skip to content

Commit 47a6b2b

Browse files
ulrichardulrichard
committed
upgrading bdk_wallet to version 1.2.0
1 parent 10c2b54 commit 47a6b2b

File tree

5 files changed

+60
-29
lines changed

5 files changed

+60
-29
lines changed

‎.github/workflows/cont_integration.yml‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
- 1.63.0 # MSRV
1515
steps:
1616
- name: checkout
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818
- name: Generate cache key
1919
run: echo "${{ matrix.rust }} ${{ matrix.features }}" | tee .cache_key
2020
- name: cache
21-
uses: actions/cache@v2
21+
uses: actions/cache@v4
2222
with:
2323
path: |
2424
~/.cargo/registry
@@ -38,11 +38,24 @@ jobs:
3838
- name: Pin dependencies for MSRV
3939
if: matrix.rust == '1.63.0'
4040
run: |
41-
cargo update -p home:0.5.11 --precise 0.5.5
42-
cargo update -p cc --precise 1.0.105
43-
cargo update -p rustls:0.23.21 --precise 0.23.12
44-
cargo update -p time --precise 0.3.20
45-
cargo update -p zstd-sys --precise "2.0.7+zstd.1.5.4"
41+
cargo update -p zstd-sys --precise "2.0.8+zstd.1.5.5"
42+
cargo update -p time --precise "0.3.20"
43+
cargo update -p home --precise "0.5.5"
44+
cargo update -p proptest --precise "1.2.0"
45+
cargo update -p url --precise "2.5.0"
46+
cargo update -p tokio --precise "1.38.1"
47+
cargo update -p tokio-util --precise "0.7.11"
48+
cargo update -p indexmap --precise "2.5.0"
49+
cargo update -p security-framework-sys --precise "2.11.1"
50+
cargo update -p csv --precise "1.3.0"
51+
cargo update -p unicode-width --precise "0.1.13"
52+
cargo update -p native-tls --precise "0.2.13"
53+
cargo update -p flate2 --precise "1.0.35"
54+
cargo update -p bzip2-sys --precise "0.1.12"
55+
cargo update -p ring --precise "0.17.12"
56+
cargo update -p once_cell --precise "1.20.3"
57+
cargo update -p base64ct --precise "1.6.0"
58+
cargo update -p minreq --precise "2.13.2"
4659
- name: Build
4760
run: cargo build
4861
- name: Clippy

‎Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "bdk-reserves"
3-
version = "1.0.0"
3+
version = "1.2.0"
44
authors = ["Richard Ulrich <[email protected]>"]
55
edition = "2018"
66
description = "Proof of reserves for bitcoin dev kit"
@@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0"
1010
repository = "https://github.com/bitcoindevkit/bdk-reserves"
1111

1212
[dependencies]
13-
bdk_wallet = { version = "1.0.0", default-features = false, features = ["std"] }
13+
bdk_wallet = { version = "1.2.0", default-features = false, features = ["std"] }
1414
bitcoinconsensus = "0.19.0-3"
1515
log = "^0.4"
1616

‎Makefile‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
TAG := bdk-reserves
2-
TAG_57 := bdk-reserves-57
32
TAG_63 := bdk-reserves-61
43
http_proxy ?= http://172.17.0.1:3128
54
DOCKER_RUN := docker run --interactive --rm \
@@ -17,11 +16,24 @@ test_current: builder
1716
test_63: builder_63
1817
rm -f Cargo.lock
1918
$(DOCKER_RUN) ${TAG_63} cargo test || true
20-
$(DOCKER_RUN) ${TAG_63} cargo update -p home:0.5.11 --precise 0.5.5 || true
21-
$(DOCKER_RUN) ${TAG_63} cargo update -p cc --precise 1.0.105 || true
22-
$(DOCKER_RUN) ${TAG_63} cargo update -p rustls:0.23.21 --precise 0.23.12 || true
23-
$(DOCKER_RUN) ${TAG_63} cargo update -p time --precise 0.3.20 || true
24-
$(DOCKER_RUN) ${TAG_63} cargo update -p zstd-sys --precise "2.0.7+zstd.1.5.4" || true
19+
$(DOCKER_RUN) ${TAG_63} cargo update -p zstd-sys --precise "2.0.8+zstd.1.5.5" || true
20+
$(DOCKER_RUN) ${TAG_63} cargo update -p time --precise "0.3.20" || true
21+
$(DOCKER_RUN) ${TAG_63} cargo update -p home --precise "0.5.5" || true
22+
$(DOCKER_RUN) ${TAG_63} cargo update -p proptest --precise "1.2.0" || true
23+
$(DOCKER_RUN) ${TAG_63} cargo update -p url --precise "2.5.0" || true
24+
$(DOCKER_RUN) ${TAG_63} cargo update -p tokio --precise "1.38.1" || true
25+
$(DOCKER_RUN) ${TAG_63} cargo update -p tokio-util --precise "0.7.11" || true
26+
$(DOCKER_RUN) ${TAG_63} cargo update -p indexmap --precise "2.5.0" || true
27+
$(DOCKER_RUN) ${TAG_63} cargo update -p security-framework-sys --precise "2.11.1" || true
28+
$(DOCKER_RUN) ${TAG_63} cargo update -p csv --precise "1.3.0" || true
29+
$(DOCKER_RUN) ${TAG_63} cargo update -p unicode-width --precise "0.1.13" || true
30+
$(DOCKER_RUN) ${TAG_63} cargo update -p native-tls --precise "0.2.13" || true
31+
$(DOCKER_RUN) ${TAG_63} cargo update -p flate2 --precise "1.0.35" || true
32+
$(DOCKER_RUN) ${TAG_63} cargo update -p bzip2-sys --precise "0.1.12" || true
33+
$(DOCKER_RUN) ${TAG_63} cargo update -p ring --precise "0.17.12" || true
34+
$(DOCKER_RUN) ${TAG_63} cargo update -p once_cell --precise "1.20.3" || true
35+
$(DOCKER_RUN) ${TAG_63} cargo update -p base64ct --precise "1.6.0" || true
36+
$(DOCKER_RUN) ${TAG_63} cargo update -p minreq --precise "2.13.2" || true
2537
$(DOCKER_RUN) ${TAG_63} cargo test
2638

2739
run: builder
@@ -45,13 +57,6 @@ builder:
4557
--build-arg UID="$(shell id -u)" \
4658
.
4759

48-
builder_57:
49-
docker build --tag ${TAG_57}\
50-
--build-arg http_proxy="${http_proxy}" \
51-
--build-arg UID="$(shell id -u)" \
52-
-f Dockerfile_57 \
53-
.
54-
5560
builder_63:
5661
docker build --tag ${TAG_63}\
5762
--build-arg http_proxy="${http_proxy}" \

‎README.md‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,24 @@ This library should always compile with Rust **1.63.0**.
5555
To build with the MSRV you will need to pin the below dependencies:
5656

5757
```shell
58-
cargo update -p home:0.5.11 --precise 0.5.5
59-
cargo update -p cc --precise 1.0.105
60-
cargo update -p rustls:0.23.21 --precise 0.23.12
61-
cargo update -p time --precise 0.3.20
62-
cargo update -p zstd-sys --precise "2.0.7+zstd.1.5.4"
58+
cargo update -p zstd-sys --precise "2.0.8+zstd.1.5.5"
59+
cargo update -p time --precise "0.3.20"
60+
cargo update -p home --precise "0.5.5"
61+
cargo update -p proptest --precise "1.2.0"
62+
cargo update -p url --precise "2.5.0"
63+
cargo update -p tokio --precise "1.38.1"
64+
cargo update -p tokio-util --precise "0.7.11"
65+
cargo update -p indexmap --precise "2.5.0"
66+
cargo update -p security-framework-sys --precise "2.11.1"
67+
cargo update -p csv --precise "1.3.0"
68+
cargo update -p unicode-width --precise "0.1.13"
69+
cargo update -p native-tls --precise "0.2.13"
70+
cargo update -p flate2 --precise "1.0.35"
71+
cargo update -p bzip2-sys --precise "0.1.12"
72+
cargo update -p ring --precise "0.17.12"
73+
cargo update -p once_cell --precise "1.20.3"
74+
cargo update -p base64ct --precise "1.6.0"
75+
cargo update -p minreq --precise "2.13.2"
6376
```
6477

6578
## Contribution

‎src/reserves.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ mod test {
358358

359359
let psbt_b64 = psbt.to_string();
360360

361-
let expected = r#"cHNidP8BAH4BAAAAAmw1RvG4UzfnSafpx62EPTyha6VslP0Er7n3TxjEpeBeAAAAAAD/////MQvsP2eDTCk3vWfQJ50IOFWLwuTHPsnYikR1hosdK0sAAAAAAP3///8BUMMAAAAAAAAZdqkUn3/QltN+0sDj9/DPySS+70/862iIrAAAAAAAAQEKAAAAAAAAAAABUQEHAAABAR9QwwAAAAAAABYAFOzlJlcQU9qGRUyeBmd56vnRUC5qIgYDKwVYB4vsOGlKhJM9ZZMD4lddrn6RaFkRRUEVv9ZEh+ME7OUmVwAA"#;
361+
let expected = r#"cHNidP8BAH4CAAAAAmw1RvG4UzfnSafpx62EPTyha6VslP0Er7n3TxjEpeBeAAAAAAD/////MQvsP2eDTCk3vWfQJ50IOFWLwuTHPsnYikR1hosdK0sAAAAAAP3///8BUMMAAAAAAAAZdqkUn3/QltN+0sDj9/DPySS+70/862iIrAAAAAAAAQEKAAAAAAAAAAABUQEHAAABAR9QwwAAAAAAABYAFOzlJlcQU9qGRUyeBmd56vnRUC5qIgYDKwVYB4vsOGlKhJM9ZZMD4lddrn6RaFkRRUEVv9ZEh+ME7OUmVwAA"#;
362362

363363
assert_eq!(psbt_b64, expected);
364364

@@ -373,7 +373,7 @@ mod test {
373373

374374
let psbt_b64 = psbt.to_string();
375375

376-
let expected = r#"cHNidP8BAH4BAAAAAmw1RvG4UzfnSafpx62EPTyha6VslP0Er7n3TxjEpeBeAAAAAAD/////MQvsP2eDTCk3vWfQJ50IOFWLwuTHPsnYikR1hosdK0sAAAAAAP3///8BUMMAAAAAAAAZdqkUn3/QltN+0sDj9/DPySS+70/862iIrAAAAAAAAQEKAAAAAAAAAAABUQEHAAABAR9QwwAAAAAAABYAFOzlJlcQU9qGRUyeBmd56vnRUC5qAQhrAkcwRAIgR9XtbnBY0jUe9zXI0kCEzEua5pHm6Bal6mCHNBmTTIECIE2NbjpRjD6/nZv72GQ7qPZ1Sdo3BPps0cBN1DOsB+S+ASEDKwVYB4vsOGlKhJM9ZZMD4lddrn6RaFkRRUEVv9ZEh+MAAA=="#;
376+
let expected = r#"cHNidP8BAH4CAAAAAmw1RvG4UzfnSafpx62EPTyha6VslP0Er7n3TxjEpeBeAAAAAAD/////MQvsP2eDTCk3vWfQJ50IOFWLwuTHPsnYikR1hosdK0sAAAAAAP3///8BUMMAAAAAAAAZdqkUn3/QltN+0sDj9/DPySS+70/862iIrAAAAAAAAQEKAAAAAAAAAAABUQEHAAABAR9QwwAAAAAAABYAFOzlJlcQU9qGRUyeBmd56vnRUC5qAQhrAkcwRAIgMjk39sEdlh9VEb0GOKNy+C/X4yiZd4/AteVnZjdSuPYCIBQKVpBGTpUSZNoXqT93EucKLLFVQnLJIkPXKjRYO4eJASEDKwVYB4vsOGlKhJM9ZZMD4lddrn6RaFkRRUEVv9ZEh+MAAA=="#;
377377

378378
assert_eq!(psbt_b64, expected);
379379
}

0 commit comments

Comments
 (0)