Skip to content

Commit 74b24d3

Browse files
committed
Merge #1491: Enable selecting use-rustls-ring feature on electrum client
f965f95 feat: enable selecting use-rustls-ring feature on electrum client (thunderbiscuit) Pull request description: This PR is a companion to bitcoindevkit/rust-electrum-client#135. It enables choosing the `ring` dependency on rustls instead of the new default (as of 0.23.0) `aws-lc-rs`. The AWS dependency breaks the Android and Swift builds. I wrote a more detailed explanation on [#135](bitcoindevkit/rust-electrum-client#135). ### Notes to the reviewers Do not merge before: - [x] [#135](bitcoindevkit/rust-electrum-client#135) is merged - [x] A new version of rust-electrum-client is released (will be 0.21.0) - [x] The dependency points to the new version of the client rather than my fork of it. ### Changelog notice ```md Added - bdk_electrum now enables choosing either the `use-rustls` or `use-rustls-ring` feature ``` ### Checklists #### All Submissions: * [x] I've signed all my commits * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk/blob/master/CONTRIBUTING.md) * [x] I ran `cargo fmt` and `cargo clippy` before committing ACKs for top commit: LLFourn: ACK f965f95 notmandatory: utACK f965f95 oleonardolima: ACK f965f95 Tree-SHA512: c82afa82ef8603bc8e6d024ee5030fa1ec6ab71fbce090182ce3a297ce1a788c1db48f593f05331b1de1931a731a5fc03f804cb1b17f8c7832286fda6c09aa4b
2 parents 9db0d19 + f965f95 commit 74b24d3

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

crates/electrum/Cargo.toml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ description = "Fetch data from electrum in the form BDK accepts"
99
license = "MIT OR Apache-2.0"
1010
readme = "README.md"
1111

12-
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
13-
1412
[dependencies]
1513
bdk_chain = { path = "../chain", version = "0.17.0" }
16-
electrum-client = { version = "0.20" }
17-
#rustls = { version = "=0.21.1", optional = true, features = ["dangerous_configuration"] }
14+
electrum-client = { version = "0.21", features = ["proxy"], default-features = false }
1815

1916
[dev-dependencies]
2017
bdk_testenv = { path = "../testenv", default-features = false }
18+
19+
[features]
20+
default = ["use-rustls"]
21+
use-rustls = ["electrum-client/use-rustls"]
22+
use-rustls-ring = ["electrum-client/use-rustls-ring"]

0 commit comments

Comments
 (0)