diff --git a/Cargo.lock b/Cargo.lock index 182a2d7..2b6a94c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -108,27 +108,29 @@ dependencies = [ [[package]] name = "async-wsocket" -version = "0.5.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3445f8f330db8e5f3be7912f170f32e43fec90d995c71ced1ec3b8394b4a873c" +checksum = "5c0984bead67f20366bc8dd46018dfbe189b67eeefb0e5b86b9eade18d7c3c3b" dependencies = [ "async-utility", + "futures", "futures-util", + "js-sys", "thiserror", "tokio", "tokio-rustls", "tokio-socks", - "tokio-tungstenite 0.23.1", + "tokio-tungstenite", "url", - "wasm-ws", - "webpki-roots", + "wasm-bindgen", + "web-sys", ] [[package]] name = "async-wsocket" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0984bead67f20366bc8dd46018dfbe189b67eeefb0e5b86b9eade18d7c3c3b" +checksum = "a107e3bdbe61e8e1e1341c57241b4b2d50501127b44bd2eff13b4635ab42d35a" dependencies = [ "async-utility", "futures", @@ -138,23 +140,12 @@ dependencies = [ "tokio", "tokio-rustls", "tokio-socks", - "tokio-tungstenite 0.24.0", + "tokio-tungstenite", "url", "wasm-bindgen", "web-sys", ] -[[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", -] - [[package]] name = "atoi" version = "2.0.0" @@ -200,7 +191,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f" dependencies = [ - "bitcoin-internals 0.3.0", + "bitcoin-internals", "bitcoin_hashes 0.14.0", ] @@ -222,12 +213,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" -[[package]] -name = "bech32" -version = "0.10.0-beta" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98f7eed2b2781a6f0b5c903471d48e15f56fb4e1165df8a9a2337fd1a59d45ea" - [[package]] name = "bech32" version = "0.11.0" @@ -245,21 +230,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "bitcoin" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c85783c2fe40083ea54a33aa2f0ba58831d90fcd190f5bdc47e74e84d2a96ae" -dependencies = [ - "bech32 0.10.0-beta", - "bitcoin-internals 0.2.0", - "bitcoin_hashes 0.13.0", - "hex-conservative 0.1.2", - "hex_lit", - "secp256k1 0.28.2", - "serde", -] - [[package]] name = "bitcoin" version = "0.32.2" @@ -267,23 +237,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea507acc1cd80fc084ace38544bbcf7ced7c2aa65b653b102de0ce718df668f6" dependencies = [ "base58ck", - "bech32 0.11.0", - "bitcoin-internals 0.3.0", + "bech32", + "bitcoin-internals", "bitcoin-io", "bitcoin-units", "bitcoin_hashes 0.14.0", - "hex-conservative 0.2.1", + "hex-conservative", "hex_lit", - "secp256k1 0.29.1", - "serde", -] - -[[package]] -name = "bitcoin-internals" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb" -dependencies = [ + "secp256k1", "serde", ] @@ -308,7 +269,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5285c8bcaa25876d07f37e3d30c303f2609179716e11d688f51e8f1fe70063e2" dependencies = [ - "bitcoin-internals 0.3.0", + "bitcoin-internals", "serde", ] @@ -318,17 +279,6 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4" -[[package]] -name = "bitcoin_hashes" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b" -dependencies = [ - "bitcoin-internals 0.2.0", - "hex-conservative 0.1.2", - "serde", -] - [[package]] name = "bitcoin_hashes" version = "0.14.0" @@ -336,7 +286,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" dependencies = [ "bitcoin-io", - "hex-conservative 0.2.1", + "hex-conservative", "serde", ] @@ -795,7 +745,6 @@ checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", - "futures-executor", "futures-io", "futures-sink", "futures-task", @@ -846,17 +795,6 @@ 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" @@ -878,7 +816,6 @@ dependencies = [ "futures-channel", "futures-core", "futures-io", - "futures-macro", "futures-sink", "futures-task", "memchr", @@ -971,12 +908,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hex-conservative" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212ab92002354b4819390025006c897e8140934349e8635c9b077f47b4dcbd20" - [[package]] name = "hex-conservative" version = "0.2.1" @@ -1281,25 +1212,13 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" -[[package]] -name = "lnurl-pay" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c042191c2e3f27147decfad8182eea2c7dd1c6c1733562e25d3d401369669d" -dependencies = [ - "bech32 0.10.0-beta", - "reqwest", - "serde", - "serde_json", -] - [[package]] name = "lnurl-pay" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "536e7c782167a2d48346ca0b2677fad19eaef20f19a4ab868e4d5b96ca879def" dependencies = [ - "bech32 0.11.0", + "bech32", "reqwest", "serde", "serde_json", @@ -1382,13 +1301,13 @@ dependencies = [ [[package]] name = "mostro-core" -version = "0.6.8" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389a75ea2e08eeeb37b54156559d0e988cfe23d365310a2253cf428008bb4271" +checksum = "3416a4220576cecb437ff5f22df995d296e022ab85ed541c385ba7bfc97d14bc" dependencies = [ "anyhow", "chrono", - "nostr-sdk 0.32.0", + "nostr-sdk 0.36.0", "serde", "serde_json", "uuid", @@ -1453,14 +1372,15 @@ dependencies = [ [[package]] name = "nostr" -version = "0.32.1" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7948938314ee0392f378ab1a5d58b4707f2207550bc410b1629a80a4f28af7d" +checksum = "56db234b2e07901e372f34e9463f91590579cd8e6dbd34ed2ccc7e461e4ba639" dependencies = [ "aes", - "base64 0.21.7", + "base64 0.22.1", + "bech32", "bip39", - "bitcoin 0.31.2", + "bitcoin", "cbc", "chacha20", "chacha20poly1305", @@ -1468,12 +1388,12 @@ dependencies = [ "instant", "js-sys", "negentropy 0.3.1", + "negentropy 0.4.3", "once_cell", "reqwest", "scrypt", "serde", "serde_json", - "tracing", "unicode-normalization", "url", "wasm-bindgen", @@ -1483,15 +1403,16 @@ dependencies = [ [[package]] name = "nostr" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56db234b2e07901e372f34e9463f91590579cd8e6dbd34ed2ccc7e461e4ba639" +checksum = "14ad56c1d9a59f4edc46b17bc64a217b38b99baefddc0080f85ad98a0855336d" dependencies = [ "aes", + "async-trait", "base64 0.22.1", - "bech32 0.11.0", + "bech32", "bip39", - "bitcoin 0.32.2", + "bitcoin", "cbc", "chacha20", "chacha20poly1305", @@ -1512,20 +1433,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "nostr-database" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88a72f92fbd5d2514db36e07a864646f1c1f44931c4a5ea195f6961029af4b3" -dependencies = [ - "async-trait", - "lru", - "nostr 0.32.1", - "thiserror", - "tokio", - "tracing", -] - [[package]] name = "nostr-database" version = "0.35.0" @@ -1541,16 +1448,14 @@ dependencies = [ ] [[package]] -name = "nostr-relay-pool" -version = "0.32.0" +name = "nostr-database" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b7bf72b02a24ccc7cf87033fa5ddfd57001c7d8c2e757321a7ca7a6df39876" +checksum = "1859abebf78d7d9e945b20c8faaf710c9db905adeb148035b803ae45792dbebe" dependencies = [ - "async-utility", - "async-wsocket 0.5.2", - "atomic-destructor", - "nostr 0.32.1", - "nostr-database 0.32.0", + "async-trait", + "lru", + "nostr 0.36.0", "thiserror", "tokio", "tracing", @@ -1576,22 +1481,21 @@ dependencies = [ ] [[package]] -name = "nostr-sdk" -version = "0.32.0" +name = "nostr-relay-pool" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "005915a59ee6401f23ba510c3a9ac4a07b457f80dfe1dc05cd2c8fdbde439246" +checksum = "e39cfcb30cab86b30ca9acba89f5ccb25a4142a5dc5fcfbf3edf34b204ddd7c7" dependencies = [ "async-utility", + "async-wsocket 0.10.0", "atomic-destructor", - "lnurl-pay 0.5.0", - "nostr 0.32.1", - "nostr-database 0.32.0", - "nostr-relay-pool 0.32.0", - "nostr-signer 0.32.1", - "nostr-zapper 0.32.0", - "nwc 0.32.0", + "negentropy 0.3.1", + "negentropy 0.4.3", + "nostr 0.36.0", + "nostr-database 0.36.0", "thiserror", "tokio", + "tokio-stream", "tracing", ] @@ -1603,11 +1507,11 @@ checksum = "d93036bf4c1e35145ca2cd6ee4cb7bb9c74f41cbca9cc4caff1e87b5e192f253" dependencies = [ "async-utility", "atomic-destructor", - "lnurl-pay 0.6.0", + "lnurl-pay", "nostr 0.35.0", "nostr-database 0.35.0", "nostr-relay-pool 0.35.0", - "nostr-signer 0.35.0", + "nostr-signer", "nostr-zapper 0.35.0", "nwc 0.35.0", "thiserror", @@ -1616,14 +1520,19 @@ dependencies = [ ] [[package]] -name = "nostr-signer" -version = "0.32.1" +name = "nostr-sdk" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f99449c2077bef43c02c8f9a9386d01c87e7ad8ece70d7de87a2c59771b4c0fe" +checksum = "e4739ed15ff81a0e474d79b38c3eb481ff5f968c1865f38ba46852daf6f6495e" dependencies = [ "async-utility", - "nostr 0.32.1", - "nostr-relay-pool 0.32.0", + "atomic-destructor", + "lnurl-pay", + "nostr 0.36.0", + "nostr-database 0.36.0", + "nostr-relay-pool 0.36.0", + "nostr-zapper 0.36.0", + "nwc 0.36.0", "thiserror", "tokio", "tracing", @@ -1645,23 +1554,23 @@ dependencies = [ [[package]] name = "nostr-zapper" -version = "0.32.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "430c2527c0efd2e7f1a421b0c7df01a03b334a79c60c39cc7a1ca684f720f2bf" +checksum = "b60e7a3ecc9881ca418e772a6fc4410920653a9f0bf9457b6ddd732d2a3f64f1" dependencies = [ "async-trait", - "nostr 0.32.1", + "nostr 0.35.0", "thiserror", ] [[package]] name = "nostr-zapper" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60e7a3ecc9881ca418e772a6fc4410920653a9f0bf9457b6ddd732d2a3f64f1" +checksum = "9d9709ecf8050bbe4ecf0e5efda2f25b690bb1761fc504e05654621ba9e568a8" dependencies = [ "async-trait", - "nostr 0.35.0", + "nostr 0.36.0", "thiserror", ] @@ -1714,28 +1623,29 @@ dependencies = [ [[package]] name = "nwc" -version = "0.32.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fb91e4be3f6b872fc23c7714bbb500a58a1d59f458eb6eb9dd249fbec42fc2" +checksum = "2e962f52732a6d91c1e76d4de3f1daa186e77a849e98e5abe53ca7fe9796d04e" dependencies = [ "async-utility", - "nostr 0.32.1", - "nostr-relay-pool 0.32.0", - "nostr-zapper 0.32.0", + "nostr 0.35.0", + "nostr-relay-pool 0.35.0", + "nostr-zapper 0.35.0", "thiserror", "tracing", ] [[package]] name = "nwc" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e962f52732a6d91c1e76d4de3f1daa186e77a849e98e5abe53ca7fe9796d04e" +checksum = "1b5f98bcaf232b3ec48e018792ca7bc2b90e7520d001a07b8218a9e76a03fda2" dependencies = [ + "async-trait", "async-utility", - "nostr 0.35.0", - "nostr-relay-pool 0.35.0", - "nostr-zapper 0.35.0", + "nostr 0.36.0", + "nostr-relay-pool 0.36.0", + "nostr-zapper 0.36.0", "thiserror", "tracing", ] @@ -1751,9 +1661,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "opaque-debug" @@ -1937,16 +1847,6 @@ dependencies = [ "sha2", ] -[[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 = "pin-project-lite" version = "0.2.14" @@ -2265,15 +2165,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" -[[package]] -name = "rustc_version" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" -dependencies = [ - "semver", -] - [[package]] name = "rustix" version = "0.38.37" @@ -2376,18 +2267,6 @@ dependencies = [ "sha2", ] -[[package]] -name = "secp256k1" -version = "0.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" -dependencies = [ - "bitcoin_hashes 0.13.0", - "rand", - "secp256k1-sys 0.9.2", - "serde", -] - [[package]] name = "secp256k1" version = "0.29.1" @@ -2396,19 +2275,10 @@ checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ "bitcoin_hashes 0.14.0", "rand", - "secp256k1-sys 0.10.1", + "secp256k1-sys", "serde", ] -[[package]] -name = "secp256k1-sys" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb" -dependencies = [ - "cc", -] - [[package]] name = "secp256k1-sys" version = "0.10.1" @@ -2441,18 +2311,6 @@ dependencies = [ "libc", ] -[[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.213" @@ -3012,22 +2870,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-tungstenite" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" -dependencies = [ - "futures-util", - "log", - "rustls", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tungstenite 0.23.0", - "webpki-roots", -] - [[package]] name = "tokio-tungstenite" version = "0.24.0" @@ -3040,7 +2882,7 @@ dependencies = [ "rustls-pki-types", "tokio", "tokio-rustls", - "tungstenite 0.24.0", + "tungstenite", "webpki-roots", ] @@ -3132,26 +2974,6 @@ dependencies = [ "unicode-width 0.1.14", ] -[[package]] -name = "tungstenite" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand", - "rustls", - "rustls-pki-types", - "sha1", - "thiserror", - "utf-8", -] - [[package]] name = "tungstenite" version = "0.24.0" @@ -3404,23 +3226,6 @@ version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" -[[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.70" diff --git a/Cargo.toml b/Cargo.toml index d949439..6ba776a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ repository = "https://github.com/MostroP2P/mostrui" chrono = { version = "0.4.38", features = ["clock"] } config = "0.14.0" crossterm = { version = "0.28.1", features = ["event-stream"] } -mostro-core = "0.6.8" +mostro-core = "0.6.11" nostr-sdk = "0.35.0" ratatui = "0.29.0" serde = "1.0.213" diff --git a/src/main.rs b/src/main.rs index f7a8530..0efa885 100644 --- a/src/main.rs +++ b/src/main.rs @@ -357,6 +357,7 @@ impl App { } else { self.generate_new_keys(); // Generate new keys for taking a non-range order let take_sell_message = Message::new_order( + None, Some(order.id.unwrap()), Action::TakeSell, None, @@ -512,7 +513,7 @@ impl MostroListWidget { _ => {} } } - Kind::PrivateDirectMessage => !todo!("Handle PrivateDirectMessage"), + Kind::PrivateDirectMessage => todo!("Handle PrivateDirectMessage"), _ => {} }