Skip to content

Commit 50f102c

Browse files
committed
Merge #1575: use ring provider with rustls in electrum client
b5049f0 add source for reproducible build (Michael Mallan) 7a1d87f use ring provider with rustls in electrum client (Michael Mallan) Pull request description: This uses a modified version of bdk_electrum 0.15 (corresponding to BDK tag v1.0.0-alpha.13) that enables the use of the ring provider in rustls. The default aws-lc-rs provider breaks the reproducible build. ACKs for top commit: edouardparis: ACK b5049f0 Tree-SHA512: 80d6e7125fda8dd6a769b3782775f32e75784f1f145662992ad9c32a597f509f0a99d7ac85314fd0aee4d748fd06762da209435b668f9e2714152318128518f2
2 parents 4005985 + b5049f0 commit 50f102c

File tree

3 files changed

+16
-137
lines changed

3 files changed

+16
-137
lines changed

Cargo.lock

+6-136
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

contrib/reproducible/guix/build.sh

+5
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ replace-with = "vendored_sources"
1717
git = "https://github.com/edouardparis/iced"
1818
branch = "patch-0.12.3"
1919
replace-with = "vendored_sources"
20+
21+
[source."https://github.com/wizardsardine/bdk"]
22+
git = "https://github.com/wizardsardine/bdk"
23+
branch = "release/1.0.0-alpha.13"
24+
replace-with = "vendored_sources"
2025
EOF
2126

2227
ls -la .cargo/config.toml

lianad/Cargo.toml

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ liana = { path = "../liana" }
2626
miniscript = { version = "12.0", features = ["serde", "compiler", "base64"] }
2727

2828
# For Electrum backend.
29-
bdk_electrum = { version = "0.15" }
29+
# We use a branch of the v1.0.0-alpha.13 tag, which corresponds to the bdk_electrum v0.15 crate,
30+
# in order to bump the electrum_client dependency to v0.21. This allows to use the "use-rustls-ring"
31+
# feature and avoid the default aws-ls-rs provider from rustls, which would break the reproducible build
32+
# (see https://github.com/aws/aws-lc-rs/issues/409).
33+
bdk_electrum = { git = "https://github.com/wizardsardine/bdk", branch = "release/1.0.0-alpha.13", default-features = false, features = [ "use-rustls-ring" ] }
3034

3135
# Don't reinvent the wheel
3236
dirs = "5.0"

0 commit comments

Comments
 (0)