diff --git a/Cargo.lock b/Cargo.lock index bcd698d..d7ee80b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -135,6 +135,12 @@ version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + [[package]] name = "async-compression" version = "0.4.10" @@ -206,31 +212,22 @@ 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 0.26.0", "tokio-socks", - "tokio-tungstenite 0.23.1", + "tokio-tungstenite 0.24.0", "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]] @@ -324,6 +321,16 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "base58ck" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f" +dependencies = [ + "bitcoin-internals 0.3.0", + "bitcoin_hashes 0.14.0", +] + [[package]] name = "base64" version = "0.21.7" @@ -344,9 +351,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bech32" -version = "0.10.0-beta" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98f7eed2b2781a6f0b5c903471d48e15f56fb4e1165df8a9a2337fd1a59d45ea" +checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d" [[package]] name = "bip39" @@ -361,14 +368,17 @@ dependencies = [ [[package]] name = "bitcoin" -version = "0.31.2" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c85783c2fe40083ea54a33aa2f0ba58831d90fcd190f5bdc47e74e84d2a96ae" +checksum = "ea507acc1cd80fc084ace38544bbcf7ced7c2aa65b653b102de0ce718df668f6" dependencies = [ + "base58ck", "bech32", - "bitcoin-internals", - "bitcoin_hashes 0.13.0", - "hex-conservative", + "bitcoin-internals 0.3.0", + "bitcoin-io", + "bitcoin-units", + "bitcoin_hashes 0.14.0", + "hex-conservative 0.2.1", "hex_lit", "secp256k1", "serde", @@ -379,10 +389,32 @@ name = "bitcoin-internals" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb" + +[[package]] +name = "bitcoin-internals" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30bdbe14aa07b06e6cfeffc529a1f099e5fbe249524f8125358604df99a4bed2" dependencies = [ "serde", ] +[[package]] +name = "bitcoin-io" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "340e09e8399c7bd8912f495af6aa58bea0c9214773417ffaa8f6460f93aaee56" + +[[package]] +name = "bitcoin-units" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5285c8bcaa25876d07f37e3d30c303f2609179716e11d688f51e8f1fe70063e2" +dependencies = [ + "bitcoin-internals 0.3.0", + "serde", +] + [[package]] name = "bitcoin_hashes" version = "0.11.0" @@ -395,8 +427,18 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b" dependencies = [ - "bitcoin-internals", - "hex-conservative", + "bitcoin-internals 0.2.0", + "hex-conservative 0.1.2", +] + +[[package]] +name = "bitcoin_hashes" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" +dependencies = [ + "bitcoin-io", + "hex-conservative 0.2.1", "serde", ] @@ -1122,6 +1164,15 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "212ab92002354b4819390025006c897e8140934349e8635c9b077f47b4dcbd20" +[[package]] +name = "hex-conservative" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd" +dependencies = [ + "arrayvec", +] + [[package]] name = "hex_lit" version = "0.1.1" @@ -1468,9 +1519,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lnurl-pay" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c042191c2e3f27147decfad8182eea2c7dd1c6c1733562e25d3d401369669d" +checksum = "536e7c782167a2d48346ca0b2677fad19eaef20f19a4ab868e4d5b96ca879def" dependencies = [ "bech32", "reqwest", @@ -1636,6 +1687,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e664971378a3987224f7a0e10059782035e89899ae403718ee07de85bec42afe" +[[package]] +name = "negentropy" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a88da9dd148bbcdce323dd6ac47d369b4769d4a3b78c6c52389b9269f77932" + [[package]] name = "nix" version = "0.28.0" @@ -1660,11 +1717,12 @@ dependencies = [ [[package]] name = "nostr" -version = "0.32.0" -source = "git+https://github.com/rust-nostr/nostr.git#d244d10f53bf0ad2a1e84fffdf658c84d7bcce0c" +version = "0.35.0" +source = "git+https://github.com/rust-nostr/nostr.git#b1fdeae5b986373606ea10562d8ca3d54ca11164" dependencies = [ "aes", - "base64 0.21.7", + "base64 0.22.1", + "bech32", "bip39", "bitcoin", "cbc", @@ -1673,13 +1731,13 @@ dependencies = [ "getrandom", "instant", "js-sys", - "negentropy", + "negentropy 0.3.1", + "negentropy 0.4.3", "once_cell", "reqwest", "scrypt", "serde", "serde_json", - "tracing", "unicode-normalization", "url", "wasm-bindgen", @@ -1689,8 +1747,8 @@ dependencies = [ [[package]] name = "nostr-database" -version = "0.32.0" -source = "git+https://github.com/rust-nostr/nostr.git#d244d10f53bf0ad2a1e84fffdf658c84d7bcce0c" +version = "0.35.0" +source = "git+https://github.com/rust-nostr/nostr.git#b1fdeae5b986373606ea10562d8ca3d54ca11164" dependencies = [ "async-trait", "lru", @@ -1702,23 +1760,26 @@ dependencies = [ [[package]] name = "nostr-relay-pool" -version = "0.32.0" -source = "git+https://github.com/rust-nostr/nostr.git#d244d10f53bf0ad2a1e84fffdf658c84d7bcce0c" +version = "0.35.0" +source = "git+https://github.com/rust-nostr/nostr.git#b1fdeae5b986373606ea10562d8ca3d54ca11164" dependencies = [ "async-utility", "async-wsocket", "atomic-destructor", + "negentropy 0.3.1", + "negentropy 0.4.3", "nostr", "nostr-database", "thiserror", "tokio", + "tokio-stream", "tracing", ] [[package]] name = "nostr-sdk" -version = "0.32.0" -source = "git+https://github.com/rust-nostr/nostr.git#d244d10f53bf0ad2a1e84fffdf658c84d7bcce0c" +version = "0.35.0" +source = "git+https://github.com/rust-nostr/nostr.git#b1fdeae5b986373606ea10562d8ca3d54ca11164" dependencies = [ "async-utility", "atomic-destructor", @@ -1736,8 +1797,8 @@ dependencies = [ [[package]] name = "nostr-signer" -version = "0.32.0" -source = "git+https://github.com/rust-nostr/nostr.git#d244d10f53bf0ad2a1e84fffdf658c84d7bcce0c" +version = "0.35.0" +source = "git+https://github.com/rust-nostr/nostr.git#b1fdeae5b986373606ea10562d8ca3d54ca11164" dependencies = [ "async-utility", "nostr", @@ -1749,8 +1810,8 @@ dependencies = [ [[package]] name = "nostr-zapper" -version = "0.32.0" -source = "git+https://github.com/rust-nostr/nostr.git#d244d10f53bf0ad2a1e84fffdf658c84d7bcce0c" +version = "0.35.0" +source = "git+https://github.com/rust-nostr/nostr.git#b1fdeae5b986373606ea10562d8ca3d54ca11164" dependencies = [ "async-trait", "nostr", @@ -1813,8 +1874,8 @@ dependencies = [ [[package]] name = "nwc" -version = "0.32.0" -source = "git+https://github.com/rust-nostr/nostr.git#d244d10f53bf0ad2a1e84fffdf658c84d7bcce0c" +version = "0.35.0" +source = "git+https://github.com/rust-nostr/nostr.git#b1fdeae5b986373606ea10562d8ca3d54ca11164" dependencies = [ "async-utility", "nostr", @@ -2016,16 +2077,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" version = "0.4.30" @@ -2524,15 +2575,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[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" @@ -2685,9 +2727,9 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.28.2" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" +checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ "bitcoin_hashes 0.13.0", "rand", @@ -2697,9 +2739,9 @@ dependencies = [ [[package]] name = "secp256k1-sys" -version = "0.9.2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb" +checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" dependencies = [ "cc", ] @@ -2740,18 +2782,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.203" @@ -3289,9 +3319,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" +checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" dependencies = [ "futures-util", "log", @@ -3299,7 +3329,7 @@ dependencies = [ "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", - "tungstenite 0.23.0", + "tungstenite 0.24.0", "webpki-roots", ] @@ -3538,9 +3568,9 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" +checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" dependencies = [ "byteorder", "bytes", @@ -3756,23 +3786,6 @@ dependencies = [ "web-sys", ] -[[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"