Skip to content

Commit 178b64e

Browse files
committed
pool: bump async-wsocket to v0.9
This `async-wsocket` version include the patch to make `arti-client` work with `tungstenite`. Signed-off-by: Yuki Kishimoto <[email protected]>
1 parent 3300306 commit 178b64e

File tree

6 files changed

+39
-28
lines changed

6 files changed

+39
-28
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
* pool: avoid `Relay` clone in `RelayPool::connect_relay` method ([Yuki Kishimoto])
6565
* pool: `RelayPool::send_event` and `RelayPool::batch_event` send only to relays with `WRITE` flag ([Yuki Kishimoto])
6666
* pool: `RelayPool::subscribe_with_id`, `RelayPool::get_events_of` and `RelayPool::stream_events_of` REQ events only to relays with `READ` flag ([Yuki Kishimoto])
67+
* pool: bump `async-wsocket` to `v0.9` ([Yuki Kishimoto])
6768
* signer: update NIP-04 and NIP-44 methods signature ([Yuki Kishimoto])
6869
* webln: bump `webln` to `v0.3` ([Yuki Kishimoto])
6970
* sqlite: deprecate `SQLiteDatabase` in favor of LMDB ([Yuki Kishimoto])

Cargo.lock

Lines changed: 37 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ web-sys = { version = "0.3", default-features = false }
5454
[patch.crates-io]
5555
# Patch needed to reduce bindings size
5656
bip39 = { git = "https://github.com/rust-bitcoin/rust-bip39", rev = "256a00e7c23c5b2ecc04df90894f60248c8d56d5" }
57-
# TODO: remove when https://github.com/snapview/tungstenite-rs/pull/431 will be merged
58-
tungstenite = { git = "https://github.com/yukibtc/tungstenite-rs", branch = "tor" }
5957

6058
[profile.release]
6159
lto = true

crates/nostr-relay-pool/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ nip11 = ["nostr/nip11"]
1818

1919
[dependencies]
2020
async-utility.workspace = true
21-
async-wsocket = { version = "0.8", features = ["socks"] }
21+
async-wsocket = { version = "0.9", features = ["socks"] }
2222
atomic-destructor = { workspace = true, features = ["tracing"] }
2323
negentropy = { workspace = true, features = ["std"] }
2424
negentropy-deprecated = { workspace = true, features = ["std"] }

crates/nostr-sdk/README.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -150,17 +150,6 @@ The following crate feature flags are available:
150150
| `nip57` | Yes | Enable NIP-57: Zaps |
151151
| `nip59` | Yes | Enable NIP-59: Gift Wrap |
152152

153-
### Tor embedded client
154-
155-
The library used under the hood for websocket require a little fix ([PR here](https://github.com/snapview/tungstenite-rs/pull/431))
156-
to work with [`arti-client`](https://crates.io/crates/arti-client) (the pure rust tor implementation).
157-
Until it's merged and released, if you are interested to use the embedded tor client, you have to add the following lines in your `Cargo.toml`:
158-
159-
```toml
160-
[patch.crates-io]
161-
tungstenite = { git = "https://github.com/yukibtc/tungstenite-rs", branch = "tor" }
162-
```
163-
164153
## Supported NIPs
165154

166155
Look at <https://github.com/rust-nostr/nostr/tree/master/crates/nostr#supported-nips>

crates/nostr-sdk/src/client/options.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -304,14 +304,6 @@ impl Connection {
304304
}
305305

306306
/// Use embedded tor client
307-
///
308-
/// The library used under the hood for websocket require a little change ([PR here](https://github.com/snapview/tungstenite-rs/pull/431)).
309-
/// Until it's merged, you have to add the following lines in your `Cargo.toml`:
310-
///
311-
/// ```toml
312-
/// [patch.crates-io]
313-
/// tungstenite = { git = "https://github.com/yukibtc/tungstenite-rs", branch = "tor" }
314-
/// ```
315307
#[inline]
316308
#[cfg(all(feature = "tor", not(target_os = "android"), not(target_os = "ios")))]
317309
pub fn embedded_tor(mut self) -> Self {

0 commit comments

Comments
 (0)