From ada3492487c0a54bcdeed73455de2940d57fbbf6 Mon Sep 17 00:00:00 2001 From: xeruf <27jf@pm.me> Date: Tue, 20 Aug 2024 13:00:36 +0300 Subject: [PATCH] feat: upgrade to nostr sdk 0.34 --- Cargo.lock | 133 +++++++++++++-------------------------------------- Cargo.toml | 2 +- src/tasks.rs | 2 +- 3 files changed, 34 insertions(+), 103 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e3a1915..69c1a68 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -166,31 +166,22 @@ dependencies = [ [[package]] name = "async-wsocket" -version = "0.5.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3445f8f330db8e5f3be7912f170f32e43fec90d995c71ced1ec3b8394b4a873c" +checksum = "5725a0615e4eb98e82e9cb963529398114e3fccfbf0e8b9111d605e2ac443e46" dependencies = [ "async-utility", + "futures", "futures-util", + "js-sys", "thiserror", "tokio", "tokio-rustls 0.26.0", "tokio-socks", "tokio-tungstenite", "url", - "wasm-ws", - "webpki-roots", -] - -[[package]] -name = "async_io_stream" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" -dependencies = [ - "futures", - "pharos", - "rustc_version", + "wasm-bindgen", + "web-sys", ] [[package]] @@ -669,7 +660,6 @@ checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", - "futures-executor", "futures-io", "futures-sink", "futures-task", @@ -692,34 +682,12 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - [[package]] name = "futures-io" version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "futures-sink" version = "0.3.30" @@ -741,7 +709,6 @@ dependencies = [ "futures-channel", "futures-core", "futures-io", - "futures-macro", "futures-sink", "futures-task", "memchr", @@ -1285,9 +1252,9 @@ dependencies = [ [[package]] name = "nostr" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f08db214560a34bf7c4c1fea09a8461b9412bae58ba06e99ce3177d89fa1e0a6" +checksum = "5897e4142fcc33c4f1d58ad17f665e87dcba70de7e370c0bda1aa0fb73212c2a" dependencies = [ "aes", "base64 0.21.7", @@ -1315,9 +1282,9 @@ dependencies = [ [[package]] name = "nostr-database" -version = "0.33.1" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50eebf5020d70891e3c229128de5fc73af632b651d02742383b314d3d0c7e953" +checksum = "1926ef55392f3eea1bbe4a1358b64bbf12dd6eb554f40f483941a102c6263fc6" dependencies = [ "async-trait", "lru", @@ -1329,9 +1296,9 @@ dependencies = [ [[package]] name = "nostr-relay-pool" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa5502a3df456790ca16d90cc688a677117d57ab56b079dcfa091390ac9f202" +checksum = "c6480cf60564957a2a64bd050d047ee0717e08dced7a389e22ef4e9fc104edd2" dependencies = [ "async-utility", "async-wsocket", @@ -1340,14 +1307,15 @@ dependencies = [ "nostr-database", "thiserror", "tokio", + "tokio-stream", "tracing", ] [[package]] name = "nostr-sdk" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b427dceefbbb49a9dd98abb8c4e40d25fdd467e99821aaad88615252bdb915bd" +checksum = "ca0c0c5f8ddbdfc064ea71883191ec53de6ed52b5dca10ab07f0810b99e91acc" dependencies = [ "async-utility", "atomic-destructor", @@ -1365,9 +1333,9 @@ dependencies = [ [[package]] name = "nostr-signer" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "665268b316f41cd8fa791be54b6c7935c5a239461708c380a699d6677be9af38" +checksum = "5c30294a7be7d9d5ac777954812f5c7b4ae2a1e583a62e33537f87d98ab23729" dependencies = [ "async-utility", "nostr", @@ -1379,9 +1347,9 @@ dependencies = [ [[package]] name = "nostr-zapper" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69922e74f8eab1f9d287008c0c06acdec87277a2d8f44bd9d38e003422aea0ab" +checksum = "dcf3ba30e807145e9cb924faf8fb0719e460f613088e99c753b67c2a9929c5b7" dependencies = [ "async-trait", "nostr", @@ -1409,9 +1377,9 @@ dependencies = [ [[package]] name = "nwc" -version = "0.33.0" +version = "0.34.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2e04b3edb5e9572e95b62842430625f1718e8a4a3596a30aeb04e6734764ea" +checksum = "9a16ac06bc273fcd4ead47c0c5a58b6cc7db2247fc7a64dd9bc11cf18e3efeb4" dependencies = [ "async-utility", "nostr", @@ -1479,16 +1447,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pharos" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" -dependencies = [ - "futures", - "rustc_version", -] - [[package]] name = "phf" version = "0.11.2" @@ -1766,15 +1724,6 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - [[package]] name = "rustix" version = "0.38.34" @@ -1919,18 +1868,6 @@ dependencies = [ "cc", ] -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - -[[package]] -name = "send_wrapper" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" - [[package]] name = "serde" version = "1.0.199" @@ -2176,6 +2113,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-stream" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + [[package]] name = "tokio-tungstenite" version = "0.23.1" @@ -2450,23 +2398,6 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" -[[package]] -name = "wasm-ws" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c5806d1b06b4f3d90d015e23364dc5d3af412ee64abba6dde8fdc01637e33" -dependencies = [ - "async_io_stream", - "futures", - "js-sys", - "pharos", - "send_wrapper", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "web-sys" version = "0.3.69" diff --git a/Cargo.toml b/Cargo.toml index ca9d971..a8c052d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ colog = "1.3" colored = "2.1" parse_datetime = "0.5.0" interim = { version = "0.1", features = ["chrono"] } -nostr-sdk = "0.33" # { git = "https://github.com/rust-nostr/nostr" } +nostr-sdk = "0.34" # { git = "https://github.com/rust-nostr/nostr" } tokio = { version = "1.37", features = ["rt", "rt-multi-thread", "macros"] } regex = "1.10.5" diff --git a/src/tasks.rs b/src/tasks.rs index 08ce899..6b10c2f 100644 --- a/src/tasks.rs +++ b/src/tasks.rs @@ -765,7 +765,7 @@ impl Tasks { pub(crate) fn add_task(&mut self, event: Event) { if self.tasks.contains_key(&event.id) { - debug!("Did not insert duplicate event {}", event.id); // TODO warn in next sdk version + warn!("Did not insert duplicate event {}", event.id); } else { let id = event.id; let task = Task::new(event);