From f1b3fcc40ab666d8def97096d1942c274da9b279 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Tue, 11 Jun 2024 16:21:44 +0100 Subject: chore: bump rust-nostr to v0.32.0 both nostr and nostr-sdk packages and also in test_utils fix the many breaking changes fix: ignore trailing slash when depuplicate relays for send events. this was picked up as TagStandard::RelayMetadata has started adding a traling slash. refactor cli output test function `expect_send_with_progress` so that relays can succeed / fail in a random order --- Cargo.lock | 104 ++++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 68 insertions(+), 36 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 51ef7a7..bf0032e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -330,17 +330,17 @@ dependencies = [ [[package]] name = "async-wsocket" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c38341e6ee670913fb9dc3aba40c22d616261da4dc0928326d3168ebf576fb0" +checksum = "79c6465dab65a363da7353383af13a22fb05ce173d9b460c38322590e9245400" dependencies = [ "async-utility", "futures-util", "thiserror", "tokio", - "tokio-rustls", + "tokio-rustls 0.26.0", "tokio-socks", - "tokio-tungstenite 0.21.0", + "tokio-tungstenite 0.23.0", "url", "wasm-ws", "webpki-roots", @@ -359,9 +359,9 @@ dependencies = [ [[package]] name = "atomic-destructor" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4653a42bf04120a1d4e92452e006b4e3af4ab4afff8fb4af0f1bbb98418adf3e" +checksum = "7d919cb60ba95c87ba42777e9e246c4e8d658057299b437b7512531ce0a09a23" dependencies = [ "tracing", ] @@ -1330,10 +1330,10 @@ dependencies = [ "http 1.1.0", "hyper", "hyper-util", - "rustls", + "rustls 0.22.3", "rustls-pki-types", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", "tower-service", ] @@ -1776,8 +1776,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "nostr" -version = "0.30.0" -source = "git+https://github.com/DanConwayDev/nostr?branch=expose-nip49-log-n#6ef397b6c4cd5edd6e6c31ff33d8a978b5b04f8c" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1534cec170e72b57b82323422ac243716d9817d13ed77f3b952eb5133ebef060" dependencies = [ "aes 0.8.4", "base64 0.21.7", @@ -1805,8 +1806,9 @@ dependencies = [ [[package]] name = "nostr-database" -version = "0.30.0" -source = "git+https://github.com/DanConwayDev/nostr?branch=expose-nip49-log-n#6ef397b6c4cd5edd6e6c31ff33d8a978b5b04f8c" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a88a72f92fbd5d2514db36e07a864646f1c1f44931c4a5ea195f6961029af4b3" dependencies = [ "async-trait", "lru", @@ -1818,8 +1820,9 @@ dependencies = [ [[package]] name = "nostr-relay-pool" -version = "0.30.0" -source = "git+https://github.com/DanConwayDev/nostr?branch=expose-nip49-log-n#6ef397b6c4cd5edd6e6c31ff33d8a978b5b04f8c" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7b7bf72b02a24ccc7cf87033fa5ddfd57001c7d8c2e757321a7ca7a6df39876" dependencies = [ "async-utility", "async-wsocket", @@ -1833,10 +1836,12 @@ dependencies = [ [[package]] name = "nostr-sdk" -version = "0.30.0" -source = "git+https://github.com/DanConwayDev/nostr?branch=expose-nip49-log-n#6ef397b6c4cd5edd6e6c31ff33d8a978b5b04f8c" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "005915a59ee6401f23ba510c3a9ac4a07b457f80dfe1dc05cd2c8fdbde439246" dependencies = [ "async-utility", + "atomic-destructor", "lnurl-pay", "nostr", "nostr-database", @@ -1851,8 +1856,9 @@ dependencies = [ [[package]] name = "nostr-signer" -version = "0.30.0" -source = "git+https://github.com/DanConwayDev/nostr?branch=expose-nip49-log-n#6ef397b6c4cd5edd6e6c31ff33d8a978b5b04f8c" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525574dc32fa07d64d04a6c72b534d97455b1ad954c29753c820c834c94e3704" dependencies = [ "async-utility", "nostr", @@ -1864,8 +1870,9 @@ dependencies = [ [[package]] name = "nostr-zapper" -version = "0.30.0" -source = "git+https://github.com/DanConwayDev/nostr?branch=expose-nip49-log-n#6ef397b6c4cd5edd6e6c31ff33d8a978b5b04f8c" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "430c2527c0efd2e7f1a421b0c7df01a03b334a79c60c39cc7a1ca684f720f2bf" dependencies = [ "async-trait", "nostr", @@ -1965,8 +1972,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "nwc" -version = "0.30.0" -source = "git+https://github.com/DanConwayDev/nostr?branch=expose-nip49-log-n#6ef397b6c4cd5edd6e6c31ff33d8a978b5b04f8c" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fb91e4be3f6b872fc23c7714bbb500a58a1d59f458eb6eb9dd249fbec42fc2" dependencies = [ "async-utility", "nostr", @@ -2441,7 +2449,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "rustls 0.22.3", "rustls-pemfile", "rustls-pki-types", "serde", @@ -2449,7 +2457,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", "tokio-socks", "tower-service", "url", @@ -2556,6 +2564,20 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls" +version = "0.23.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebbbdb961df0ad3f2652da8f3fdc4b36122f568f968f45ad3316f26c025c677b" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + [[package]] name = "rustls-pemfile" version = "2.1.2" @@ -3039,7 +3061,18 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls", + "rustls 0.22.3", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.7", "rustls-pki-types", "tokio", ] @@ -3070,17 +3103,17 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +checksum = "becd34a233e7e31a3dbf7c7241b38320f57393dcae8e7324b0167d21b8e320b0" dependencies = [ "futures-util", "log", - "rustls", + "rustls 0.23.7", "rustls-pki-types", "tokio", - "tokio-rustls", - "tungstenite 0.21.0", + "tokio-rustls 0.26.0", + "tungstenite 0.23.0", "webpki-roots", ] @@ -3188,9 +3221,9 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" dependencies = [ "byteorder", "bytes", @@ -3199,11 +3232,10 @@ dependencies = [ "httparse", "log", "rand", - "rustls", + "rustls 0.23.7", "rustls-pki-types", "sha1", "thiserror", - "url", "utf-8", ] @@ -3427,9 +3459,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-ws" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5b3a482e27ff54809c0848629d9033179705c5ea2f58e26cf45dc77c34c4984" +checksum = "688c5806d1b06b4f3d90d015e23364dc5d3af412ee64abba6dde8fdc01637e33" dependencies = [ "async_io_stream", "futures", -- cgit v1.2.3