From e4cafe67f662264a2c2a8cc8bc0aca46c2cac74c Mon Sep 17 00:00:00 2001 From: Yuki Kishimoto Date: Thu, 15 Aug 2024 09:55:06 -0400 Subject: [PATCH] pool: bump `async-wsocket` to `v0.7` Signed-off-by: Yuki Kishimoto --- CHANGELOG.md | 2 +- Cargo.lock | 340 +++++++++++------------------ crates/nostr-relay-pool/Cargo.toml | 2 +- 3 files changed, 134 insertions(+), 210 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40af21ab5..0c7e4c768 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,7 +42,7 @@ * pool: take mutex ownership instead of clone in `InternalRelayPool::get_events_from` ([Yuki Kishimoto]) * pool: remove IDs collection from `InternalRelayPool::get_events_from` ([Yuki Kishimoto]) * pool: better checks before perform queries or send messages to relays ([Yuki Kishimoto]) -* pool: bump `async-wsocket` to `v0.6` ([Yuki Kishimoto]) +* pool: bump `async-wsocket` to `v0.7` ([Yuki Kishimoto]) * pool: get events only from remote relay when calling `get_events_of` or `get_events_from` ([Yuki Kishimoto]) * database: not match event if `Filter::search` field is set ([Yuki Kishimoto]) * database: avoid to copy `EventId` in `Event::decode` ([Yuki Kishimoto]) diff --git a/Cargo.lock b/Cargo.lock index a24ef8d49..5034cd7dc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -200,9 +200,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "arti-client" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f7d060584ee89ac70ab3d4f5d00f8f7948faf8129c69ecf420da5eb60a2a80" +checksum = "886e16f6550ba95bc44ec8706705d4eecfda59118bf0cb1355f34d45b041b5d2" dependencies = [ "async-trait", "cfg-if", @@ -217,6 +217,7 @@ dependencies = [ "humantime-serde", "libc", "postage", + "rand", "safelog", "serde", "thiserror", @@ -318,18 +319,6 @@ dependencies = [ "zstd-safe", ] -[[package]] -name = "async-native-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9343dc5acf07e79ff82d0c37899f079db3534d99f189a1837c8e549c99405bec" -dependencies = [ - "futures-util", - "native-tls", - "thiserror", - "url", -] - [[package]] name = "async-trait" version = "0.1.80" @@ -355,9 +344,9 @@ dependencies = [ [[package]] name = "async-wsocket" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c787e6b21b2117e859562d1f0de1b16319840f87089a68c7d4f4e05984f0c9d2" +checksum = "5725a0615e4eb98e82e9cb963529398114e3fccfbf0e8b9111d605e2ac443e46" dependencies = [ "arti-client", "async-utility", @@ -928,16 +917,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "core-foundation-sys" version = "0.8.6" @@ -1223,9 +1202,9 @@ dependencies = [ [[package]] name = "derive-deftly" -version = "0.13.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063829d0f555b9fc22c8ddd206f1602372c4186e7b51046c43716f295182561d" +checksum = "72f9bc3564f74be6c35d49a7efee54380d7946ccc631323067f33fabb9246027" dependencies = [ "derive-deftly-macros", "heck 0.5.0", @@ -1233,9 +1212,9 @@ dependencies = [ [[package]] name = "derive-deftly-macros" -version = "0.13.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a27f0a2651f507903d67f8fb0688291e3e69f70381cdb5ee9729366f795f80" +checksum = "e1b84d32b18d9a256d81e4fec2e4cfd0ab6dde5e5ff49be1713ae0adbd0060c2" dependencies = [ "heck 0.5.0", "indexmap 2.2.6", @@ -1643,21 +1622,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1767,6 +1731,17 @@ dependencies = [ "syn 2.0.68", ] +[[package]] +name = "futures-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb" +dependencies = [ + "futures-io", + "rustls 0.23.10", + "rustls-pki-types", +] + [[package]] name = "futures-sink" version = "0.3.30" @@ -2290,7 +2265,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin", + "spin 0.9.8", ] [[package]] @@ -2546,23 +2521,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "ndk-sys" version = "0.5.0+25.2.9519653" @@ -3000,50 +2958,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" -[[package]] -name = "openssl" -version = "0.10.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.103" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "opentimestamps" version = "0.2.0" @@ -3453,7 +3367,7 @@ checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" dependencies = [ "bytes", "rand", - "ring", + "ring 0.17.8", "rustc-hash", "rustls 0.23.10", "slab", @@ -3672,6 +3586,21 @@ dependencies = [ "subtle", ] +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted 0.7.1", + "web-sys", + "winapi", +] + [[package]] name = "ring" version = "0.17.8" @@ -3682,8 +3611,8 @@ dependencies = [ "cfg-if", "getrandom", "libc", - "spin", - "untrusted", + "spin 0.9.8", + "untrusted 0.9.0", "windows-sys 0.52.0", ] @@ -3774,7 +3703,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", - "ring", + "ring 0.17.8", "rustls-pki-types", "rustls-webpki", "subtle", @@ -3787,8 +3716,9 @@ version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ + "log", "once_cell", - "ring", + "ring 0.17.8", "rustls-pki-types", "rustls-webpki", "subtle", @@ -3817,9 +3747,9 @@ version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ - "ring", + "ring 0.17.8", "rustls-pki-types", - "untrusted", + "untrusted 0.9.0", ] [[package]] @@ -3894,15 +3824,6 @@ dependencies = [ "regex", ] -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "scoped-tls" version = "1.0.1" @@ -3982,29 +3903,6 @@ dependencies = [ "cc", ] -[[package]] -name = "security-framework" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "semver" version = "1.0.23" @@ -4256,6 +4154,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "spin" version = "0.9.8" @@ -4702,9 +4606,9 @@ dependencies = [ [[package]] name = "tor-async-utils" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10e0b21e5da44d48fb79f9ccc468fdb4e260514c3054fda2a9ebcc3572a3b2a9" +checksum = "2e5ed48271284a3330ccc56c26fb1ea39809ee01ffa1bf5ac489d4f209af261c" dependencies = [ "futures", "pin-project", @@ -4714,9 +4618,9 @@ dependencies = [ [[package]] name = "tor-basic-utils" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c877853697cd45b6ba114e11a835df92db1aafb0af0d2771dabbe7d4107321b" +checksum = "3d5540689cf480f756cc8f1e119312f7540571019372aead6618a8426eade246" dependencies = [ "hex", "libc", @@ -4729,9 +4633,9 @@ dependencies = [ [[package]] name = "tor-bytes" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef1b8ab9a722deaf9d6db2ec00adc05465b5e9654504426c4a46d58ef49e4692" +checksum = "8fb7c20efbe7d64b4def319686d821195436502d6410f7b71331f59f8d5efdb8" dependencies = [ "bytes", "digest", @@ -4745,9 +4649,9 @@ dependencies = [ [[package]] name = "tor-cell" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a278cc2fb3cbf9fc4137d492e0900f14e615f9181b8c5c7d5d1f1822725c65b" +checksum = "7ee15a1aa7e6477603ae824299cefe71644dcfe042ff7d691f5ba16f3b714335" dependencies = [ "bitflags 2.6.0", "bytes", @@ -4770,9 +4674,9 @@ dependencies = [ [[package]] name = "tor-cert" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d788592147d24f6269cea9bf43c18393905a8778540f4ab77065306e8158d105" +checksum = "dcfd7ebbc2949ab942c6aada0f781293fbe673b25ccbd2ca6f5782859aaf8e13" dependencies = [ "caret", "derive_more", @@ -4785,9 +4689,9 @@ dependencies = [ [[package]] name = "tor-chanmgr" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f70c19181bb19d58eb8e135146d617c6b7497c69e08a23c0967f42040926b4" +checksum = "0c32e75d36e98b6acb48899d57153f9052b6807a02ea135906d2c0df25dc72d2" dependencies = [ "async-trait", "derive_builder_fork_arti", @@ -4817,9 +4721,9 @@ dependencies = [ [[package]] name = "tor-checkable" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e598cac17d259d75093ebac644610d4f91259f056f26408146921808391fd4ba" +checksum = "a8dfe7eb05cc1ae7f791e77e8cb7b06ba3ea55078708de8b9e7c844db5914b5e" dependencies = [ "humantime", "signature", @@ -4829,9 +4733,9 @@ dependencies = [ [[package]] name = "tor-circmgr" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fe10d9577e2bf3042b2985e46b9144a9a4cdafecb6292948bca627781025e4b" +checksum = "e91cf25545a75b676a63eea222f18e244a0868c77a935e47f92770ce24266dff" dependencies = [ "amplify", "async-trait", @@ -4874,9 +4778,9 @@ dependencies = [ [[package]] name = "tor-config" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cbae8248eca02109bfd2d8b106d5f44d3898a1c79592cfb526e1d4a4bd11378" +checksum = "3d8d6e14add774f3d674b9a82a074ccb74d97f7dc36b0d4b69b27de10741d543" dependencies = [ "derive-deftly", "derive_builder_fork_arti", @@ -4904,9 +4808,9 @@ dependencies = [ [[package]] name = "tor-consdiff" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "997edd03dc12f1865b2e651b9f5c90f586c73b908cb470acb670261608432e27" +checksum = "1d2386f515bfb8136fe98f36b11814840c87f5adefbc4f6651ac8d5f1da691e3" dependencies = [ "digest", "hex", @@ -4916,9 +4820,9 @@ dependencies = [ [[package]] name = "tor-dirclient" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad3fc105b351b327a7f21348fa6ebf8b89c8e2106be77c94eb8d69f01dbfaa7" +checksum = "cad6e8fdf689898d2ae2f231bccd216874ca104afb8cf482043a3cf05a0a914a" dependencies = [ "async-compression", "base64ct", @@ -4944,9 +4848,9 @@ dependencies = [ [[package]] name = "tor-dirmgr" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9794952d73ea4cdbd3d8e88146ef65676a2dee4711c66f35e8cb6e07128530de" +checksum = "181d24e558f2658edac01d2bff615233c2b1be3e17c43d279cc431c7b0da50db" dependencies = [ "async-trait", "base64ct", @@ -4995,9 +4899,9 @@ dependencies = [ [[package]] name = "tor-error" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab4f75d5d8e00890261b9ff22e7c40354fdf88b375d83a6974d8128207f4db3" +checksum = "5a79f001b29df4aaf5d6e295d0bb33c8d41a56c20ddfa13e743eee4cf9a1ec37" dependencies = [ "backtrace", "derive_more", @@ -5013,9 +4917,9 @@ dependencies = [ [[package]] name = "tor-guardmgr" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58efe45c0ccdbcfbab5912faa7c0ab550bdcc8a25553d68c31bebff28a9bb912" +checksum = "e5dfa3fb64dcfedec532b64d908cc82bca90f464bd5f7c33134cf39b1098590e" dependencies = [ "amplify", "base64ct", @@ -5054,9 +4958,9 @@ dependencies = [ [[package]] name = "tor-hsclient" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40668cea7d86ebcff26a07ed728f6006f9a89f320e32b659990d12602ae9c980" +checksum = "2f1dab25ffb362623aa88797fef88773923266e097f49a83b4b52164ed1f2e69" dependencies = [ "async-trait", "derive-deftly", @@ -5095,9 +4999,9 @@ dependencies = [ [[package]] name = "tor-hscrypto" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6045a6105e8159e86a73d9e925c67d7ef85dec1cbf160230c02fd94430ea7192" +checksum = "8f0c27b58747f3fc84e7b966a8cefaf6e9e99ebac5c7847e6512649dc666c3fb" dependencies = [ "data-encoding", "derive_more", @@ -5118,9 +5022,9 @@ dependencies = [ [[package]] name = "tor-keymgr" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce378b229df3d957f811c8c330edf4c1cf3da55d3a4b009c61ad95f0be70ed01" +checksum = "716a106ea48bf42637772efada6e1e87bf4744fce554f462a180f97103a0df9b" dependencies = [ "amplify", "arrayvec", @@ -5150,9 +5054,9 @@ dependencies = [ [[package]] name = "tor-linkspec" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d20859d824c68462077a7ad79394348a31d541e170e98caed6c69d4282081347" +checksum = "fbabe4129e25731af3529f2b188127f91da8d3d199ac49f9a07ef7c3e3dd7b7e" dependencies = [ "base64ct", "by_address", @@ -5176,9 +5080,9 @@ dependencies = [ [[package]] name = "tor-llcrypto" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5df07e4a32aab17c8813aa43719a07fae6167212e4506b48f79a035bd2f4e9" +checksum = "903b2fe40c169afdb5d82c4f235e6cefc4413ea4b786580f5dd4caad6d390008" dependencies = [ "aes", "base64ct", @@ -5207,9 +5111,9 @@ dependencies = [ [[package]] name = "tor-log-ratelim" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc9d75654f5baa76555fd2577b92c9baf828fb3b724cf41c9741693b00ae597e" +checksum = "884ea729860d6283cc6a9e37053ed19e300ea401dfb873f1ce40ce1c6e42e3f8" dependencies = [ "futures", "humantime", @@ -5223,9 +5127,9 @@ dependencies = [ [[package]] name = "tor-netdir" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b39f8f3dcad5504634b66a4ae209a2d0dd9936752f6e5a3722c8ff6831ab5e" +checksum = "c8c382ef5af3632fd534f33953282046649155287e97bbf2469f2a8d25aaab17" dependencies = [ "bitflags 2.6.0", "derive_more", @@ -5255,9 +5159,9 @@ dependencies = [ [[package]] name = "tor-netdoc" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d742d50881e12014880daf2b6c82deb74a00bda97582ab0a2a8ad55ae2ffa5cb" +checksum = "25a1d54c3d922798d1e64d989c574f63306ec6fa0de1d3094b58642edfc5bbc7" dependencies = [ "amplify", "base64ct", @@ -5298,31 +5202,34 @@ dependencies = [ [[package]] name = "tor-persist" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c114ebe5597c0e6c5e692130f9343a46673e821f3318b69791a84076628c4e2" +checksum = "115ecf2214ee6187a435c34f62f9ccbc648bc17c2ed71cfed6a15b3c1b300421" dependencies = [ "derive-deftly", "derive_more", "filetime", "fs-mistrust", "fslock", + "futures", "itertools 0.13.0", "paste", "sanitize-filename", "serde", "serde_json", "thiserror", + "tor-async-utils", "tor-basic-utils", "tor-error", "tracing", + "void", ] [[package]] name = "tor-proto" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0fa03f66ac9bd02c1893ba054733e18e556c8b78b3c20f72d3eb3534d5a98ee" +checksum = "b5a4c0767336e8473b11a2b7e2fc6c9acdfc1ea773fb64aeec472f34d3c6e963" dependencies = [ "asynchronous-codec", "bitvec", @@ -5368,9 +5275,9 @@ dependencies = [ [[package]] name = "tor-protover" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e600bd6da80c68389337bd1e407617e510534087571790b79289de6aed4ee52" +checksum = "48c8e197673623de48822e5c1bd3490a80b111b2c77f5645c68ecd325ff8c4ae" dependencies = [ "caret", "thiserror", @@ -5378,9 +5285,9 @@ dependencies = [ [[package]] name = "tor-relay-selection" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ffcf6469084ac835e5cbc416a3536f5305b8072d9ae56d16d02839f31a2478" +checksum = "931da6c638af01f2a177343c222a0b19a76b2b7375ec3b1672cf2c3a30f52776" dependencies = [ "rand", "serde", @@ -5392,32 +5299,33 @@ dependencies = [ [[package]] name = "tor-rtcompat" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fae92628eb8967bbd33754b24b95d43161d4c0ef7bf9eaaab111f5efd53afb40" +checksum = "46171d63c376aa62109c95e870233650bca2c014ac4f72153e49f3b116d6d75c" dependencies = [ - "async-native-tls", "async-trait", "async_executors", "coarsetime", "derive_more", "educe", "futures", - "native-tls", + "futures-rustls", "paste", "pin-project", + "rustls-pki-types", "thiserror", "tokio", "tokio-util", "tor-error", "tracing", + "x509-signature", ] [[package]] name = "tor-rtmock" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054701378b4f5e7c29cc819ca3034e8e1a69418d485d10b4ac790a8936974c95" +checksum = "7c0a1752e7c85a43b15c784d1f317fe2efd025d720bb3e680bf34db5ea4e5f64" dependencies = [ "amplify", "async-trait", @@ -5443,9 +5351,9 @@ dependencies = [ [[package]] name = "tor-socksproto" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "649e5f4b48f966adaa4934ab73086c94aa26356a01b2b51748db006d09484197" +checksum = "ff8639f64c9567571a0e309c922191df947572d28f3ffd79e3c7833d50e5facf" dependencies = [ "caret", "subtle", @@ -5456,9 +5364,9 @@ dependencies = [ [[package]] name = "tor-units" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dae1da9b62c697ba9924f26051ed346ae3b8b57eab7b4d367cb2f5462e05902a" +checksum = "c2432e20a3ceea2b30292bd77727feeeab1b2af0e446208889ca5a351400afbb" dependencies = [ "derive_more", "thiserror", @@ -5798,6 +5706,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + [[package]] name = "untrusted" version = "0.9.0" @@ -6314,6 +6228,16 @@ dependencies = [ "zeroize", ] +[[package]] +name = "x509-signature" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb2bc2a902d992cd5f471ee3ab0ffd6603047a4207384562755b9d6de977518" +dependencies = [ + "ring 0.16.20", + "untrusted 0.7.1", +] + [[package]] name = "xz2" version = "0.1.7" diff --git a/crates/nostr-relay-pool/Cargo.toml b/crates/nostr-relay-pool/Cargo.toml index 614eea2a4..eb0c17c17 100644 --- a/crates/nostr-relay-pool/Cargo.toml +++ b/crates/nostr-relay-pool/Cargo.toml @@ -18,7 +18,7 @@ nip11 = ["nostr/nip11"] [dependencies] async-utility.workspace = true -async-wsocket = { version = "0.6", features = ["socks"] } +async-wsocket = { version = "0.7", features = ["socks"] } atomic-destructor = { workspace = true, features = ["tracing"] } nostr = { workspace = true, features = ["std"] } nostr-database.workspace = true