diff --git a/Cargo.lock b/Cargo.lock index 0cec74a..fc10e68 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,12 +1,12 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -61,9 +61,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "android-tzdata" @@ -82,9 +82,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -97,43 +97,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.88" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" +checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" [[package]] name = "arrayvec" @@ -143,9 +143,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", @@ -154,9 +154,9 @@ dependencies = [ [[package]] name = "async-utility" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a349201d80b4aa18d17a34a182bdd7f8ddf845e9e57d2ea130a12e10ef1e3a47" +checksum = "a34a3b57207a7a1007832416c3e4862378c8451b4e8e093e436f48c2d3d2c151" dependencies = [ "futures-util", "gloo-timers", @@ -166,15 +166,13 @@ dependencies = [ [[package]] name = "async-wsocket" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a107e3bdbe61e8e1e1341c57241b4b2d50501127b44bd2eff13b4635ab42d35a" +version = "0.11.0" +source = "git+https://github.com/yukibtc/async-wsocket?rev=259c0bc372e7d60d94827b484178bf995afdcbe6#259c0bc372e7d60d94827b484178bf995afdcbe6" dependencies = [ "async-utility", "futures", "futures-util", "js-sys", - "thiserror", "tokio", "tokio-rustls", "tokio-socks", @@ -195,12 +193,9 @@ dependencies = [ [[package]] name = "atomic-destructor" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d919cb60ba95c87ba42777e9e246c4e8d658057299b437b7512531ce0a09a23" -dependencies = [ - "tracing", -] +checksum = "ef49f5882e4b6afaac09ad239a4f8c70a24b8f2b0897edb1f706008efd109cf4" [[package]] name = "atomic-waker" @@ -210,9 +205,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" @@ -302,7 +297,7 @@ dependencies = [ "base58ck", "bech32 0.11.0", "bitcoin-internals 0.3.0", - "bitcoin-io 0.1.2", + "bitcoin-io 0.1.3", "bitcoin-units", "bitcoin_hashes 0.14.0", "hex-conservative 0.2.1", @@ -334,9 +329,9 @@ checksum = "2b854212e29b96c8f0fe04cab11d57586c8f3257de0d146c76cb3b42b3eb9118" [[package]] name = "bitcoin-io" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "340e09e8399c7bd8912f495af6aa58bea0c9214773417ffaa8f6460f93aaee56" +checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf" [[package]] name = "bitcoin-io" @@ -379,7 +374,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" dependencies = [ - "bitcoin-io 0.1.2", + "bitcoin-io 0.1.3", "hex-conservative 0.2.1", "serde", ] @@ -435,9 +430,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cbc" @@ -450,9 +445,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.18" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e" dependencies = [ "shlex", ] @@ -489,9 +484,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -514,9 +509,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.17" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" dependencies = [ "clap_builder", "clap_derive", @@ -524,9 +519,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.17" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" dependencies = [ "anstream", "anstyle", @@ -536,9 +531,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck", "proc-macro2", @@ -548,21 +543,21 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "comfy-table" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" +checksum = "24f165e7b643266ea80cb858aed492ad9280e3e05ce24d4a99d7d7b889b6a4d9" dependencies = [ "crossterm", "strum", @@ -603,9 +598,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -636,29 +631,29 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crossterm" -version = "0.27.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" dependencies = [ "bitflags", "crossterm_winapi", - "libc", "parking_lot", + "rustix", "winapi", ] @@ -732,6 +727,17 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "dotenvy" version = "0.15.7" @@ -758,9 +764,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] @@ -786,12 +792,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -818,15 +824,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -875,9 +881,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -890,9 +896,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -900,15 +906,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -928,15 +934,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", @@ -945,21 +951,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -998,15 +1004,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "gloo-timers" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" dependencies = [ "futures-channel", "futures-core", @@ -1016,9 +1022,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", @@ -1043,13 +1049,19 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + [[package]] name = "hashlink" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -1058,12 +1070,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - [[package]] name = "hermit-abi" version = "0.4.0" @@ -1126,18 +1132,18 @@ dependencies = [ [[package]] name = "home" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "http" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -1169,9 +1175,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "humantime" @@ -1181,9 +1187,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" dependencies = [ "bytes", "futures-channel", @@ -1201,15 +1207,15 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.3" +version = "0.27.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" dependencies = [ "futures-util", "http", "hyper", "hyper-util", - "rustls 0.23.13", + "rustls 0.23.20", "rustls-pki-types", "tokio", "tokio-rustls", @@ -1234,9 +1240,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", @@ -1247,16 +1253,15 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", "tower-service", "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1275,24 +1280,153 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] name = "indexmap" -version = "2.5.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.2", ] [[package]] @@ -1319,9 +1453,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" @@ -1329,7 +1463,7 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi 0.4.0", + "hermit-abi", "libc", "windows-sys 0.52.0", ] @@ -1342,16 +1476,17 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -1366,9 +1501,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.158" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libm" @@ -1426,6 +1561,12 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "litemap" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + [[package]] name = "lnurl-rs" version = "0.9.0" @@ -1462,15 +1603,6 @@ version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" -[[package]] -name = "lru" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" -dependencies = [ - "hashbrown", -] - [[package]] name = "md-5" version = "0.10.6" @@ -1501,20 +1633,19 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" dependencies = [ "adler2", ] [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi 0.3.9", "libc", "wasi", "windows-sys 0.52.0", @@ -1550,9 +1681,8 @@ dependencies = [ [[package]] name = "mostro-core" -version = "0.6.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2707fa1318b15013af06d2314f073353977e56935bb697cb2e462d1cfcade66" +version = "0.6.18" +source = "git+https://github.com/MostroP2P/mostro-core?branch=test-new-sdk#6edf75a4599a7f621f7d47b70bf0a42869a56139" dependencies = [ "anyhow", "bitcoin 0.32.5", @@ -1607,8 +1737,7 @@ dependencies = [ [[package]] name = "nostr" version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aad4b767bbed24ac5eb4465bfb83bc1210522eb99d67cf4e547ec2ec7e47786" +source = "git+https://github.com/rust-nostr/nostr?rev=70db575d51965240aab1e1b3f1edab782c0ef625#70db575d51965240aab1e1b3f1edab782c0ef625" dependencies = [ "async-trait", "base64 0.22.1", @@ -1633,22 +1762,17 @@ dependencies = [ [[package]] name = "nostr-database" version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23696338d51e45cd44e061823847f4b0d1d362eca80d5033facf9c184149f72f" +source = "git+https://github.com/rust-nostr/nostr?rev=70db575d51965240aab1e1b3f1edab782c0ef625#70db575d51965240aab1e1b3f1edab782c0ef625" dependencies = [ "async-trait", - "lru", "nostr", - "thiserror", "tokio", - "tracing", ] [[package]] name = "nostr-relay-pool" version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15fcc6e3f0ca54d0fc779009bc5f2684cea9147be3b6aa68a7d301ea590f95f5" +source = "git+https://github.com/rust-nostr/nostr?rev=70db575d51965240aab1e1b3f1edab782c0ef625#70db575d51965240aab1e1b3f1edab782c0ef625" dependencies = [ "async-utility", "async-wsocket", @@ -1657,24 +1781,19 @@ dependencies = [ "negentropy 0.4.3", "nostr", "nostr-database", - "thiserror", "tokio", - "tokio-stream", "tracing", ] [[package]] name = "nostr-sdk" version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "491221fc89b1aa189a0de640127127d68b4e7c5c1d44371b04d9a6d10694b5af" +source = "git+https://github.com/rust-nostr/nostr?rev=70db575d51965240aab1e1b3f1edab782c0ef625#70db575d51965240aab1e1b3f1edab782c0ef625" dependencies = [ "async-utility", - "atomic-destructor", "nostr", "nostr-database", "nostr-relay-pool", - "thiserror", "tokio", "tracing", ] @@ -1728,9 +1847,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.4" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ "memchr", ] @@ -1781,9 +1900,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.3.2+3.3.2" +version = "300.4.1+3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b" +checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" dependencies = [ "cc", ] @@ -1878,31 +1997,11 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -1933,9 +2032,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "poly1305" @@ -2017,9 +2116,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ "bitflags", ] @@ -2037,9 +2136,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -2049,9 +2148,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -2060,15 +2159,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.12.7" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "base64 0.22.1", "bytes", @@ -2151,15 +2250,15 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" dependencies = [ "bitflags", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2176,9 +2275,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" dependencies = [ "once_cell", "ring", @@ -2190,19 +2289,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" [[package]] name = "rustls-webpki" @@ -2227,9 +2325,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "ryu" @@ -2248,9 +2346,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] @@ -2301,7 +2399,7 @@ checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ "bitcoin_hashes 0.14.0", "rand", - "secp256k1-sys 0.10.0", + "secp256k1-sys 0.10.1", "serde", ] @@ -2316,9 +2414,9 @@ dependencies = [ [[package]] name = "secp256k1-sys" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1433bd67156263443f14d603720b082dd3121779323fce20cba2aa07b874bc1b" +checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" dependencies = [ "cc", ] @@ -2338,9 +2436,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" dependencies = [ "core-foundation-sys", "libc", @@ -2348,18 +2446,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" dependencies = [ "proc-macro2", "quote", @@ -2368,9 +2466,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" dependencies = [ "indexmap", "itoa", @@ -2458,9 +2556,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2537,7 +2635,7 @@ dependencies = [ "futures-intrusive", "futures-io", "futures-util", - "hashbrown", + "hashbrown 0.14.5", "hashlink", "hex", "indexmap", @@ -2701,6 +2799,12 @@ dependencies = [ "url", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "stringprep" version = "0.1.5" @@ -2745,9 +2849,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.89" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -2756,13 +2860,24 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ "futures-core", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "system-configuration" version = "0.6.1" @@ -2786,9 +2901,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", @@ -2808,29 +2923,39 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8" dependencies = [ "tinyvec_macros", ] @@ -2843,9 +2968,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", @@ -2882,12 +3007,11 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" dependencies = [ - "rustls 0.23.13", - "rustls-pki-types", + "rustls 0.23.20", "tokio", ] @@ -2905,9 +3029,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -2922,19 +3046,19 @@ checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" dependencies = [ "futures-util", "log", - "rustls 0.23.13", + "rustls 0.23.20", "rustls-pki-types", "tokio", "tokio-rustls", "tungstenite", - "webpki-roots 0.26.5", + "webpki-roots 0.26.7", ] [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", @@ -2943,27 +3067,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - [[package]] name = "tower-service" version = "0.3.3" @@ -2972,9 +3075,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -2984,9 +3087,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", @@ -2995,9 +3098,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", ] @@ -3021,7 +3124,7 @@ dependencies = [ "httparse", "log", "rand", - "rustls 0.23.13", + "rustls 0.23.20", "rustls-pki-types", "sha1", "thiserror", @@ -3036,15 +3139,15 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" @@ -3057,15 +3160,15 @@ dependencies = [ [[package]] name = "unicode-properties" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" [[package]] name = "unicode_categories" @@ -3110,9 +3213,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -3126,6 +3229,18 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -3134,9 +3249,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "getrandom", "rand", @@ -3147,9 +3262,9 @@ dependencies = [ [[package]] name = "uuid-macro-internal" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee1cd046f83ea2c4e920d6ee9f7c3537ef928d75dce5d84a87c2c5d6b3999a3a" +checksum = "6b91f57fe13a38d0ce9e28a03463d8d3c2468ed03d75375110ec71d93b449a08" dependencies = [ "proc-macro2", "quote", @@ -3191,9 +3306,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ "cfg-if", "once_cell", @@ -3202,13 +3317,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn", @@ -3217,21 +3331,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3239,9 +3354,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", @@ -3252,15 +3367,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" dependencies = [ "js-sys", "wasm-bindgen", @@ -3274,9 +3389,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.26.5" +version = "0.26.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" dependencies = [ "rustls-pki-types", ] @@ -3509,6 +3624,42 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -3530,8 +3681,51 @@ dependencies = [ "syn", ] +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + [[package]] name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/Cargo.toml b/Cargo.toml index 3be54f7..133006f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,8 @@ path = "src/main.rs" [dependencies] anyhow = "1.0.68" clap = { version = "4.0.32", features = ["derive"] } -nostr-sdk = { version = "0.37.0", features = ["nip06", "nip44", "nip59"] } +nostr-sdk = { git = "https://github.com/rust-nostr/nostr", features = ["nip06", "nip44", "nip59"], rev ="70db575d51965240aab1e1b3f1edab782c0ef625"} +# nostr-sdk = { version = "0.37.0", features = ["nip06", "nip44", "nip59"] } serde = "1.0.215" serde_json = "1.0.91" tokio = { version = "1.23.0", features = ["full"] } @@ -39,11 +40,11 @@ uuid = { version = "1.3.0", features = [ dotenvy = "0.15.6" lightning-invoice = "0.23.0" reqwest = { version = "0.12.4", features = ["json"] } -mostro-core = "0.6.17" +mostro-core = { git = "https://github.com/MostroP2P/mostro-core", branch = "test-new-sdk" } bitcoin_hashes = "0.15.0" lnurl-rs = "0.9.0" pretty_env_logger = "0.5.0" openssl = { version = "0.10.68", features = ["vendored"] } sqlx = { version = "0.8.2", features = ["sqlite", "runtime-tokio-native-tls"] } bip39 = { version = "2.1.0", features = ["rand"] } -dirs = "5.0.1" +dirs = "5.0.1" \ No newline at end of file diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..1173a45 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,5 @@ +[toolchain] +channel = "1.82.0" +profile = "minimal" +components = ["clippy", "rust-docs", "rustfmt"] +targets = ["wasm32-unknown-unknown"] \ No newline at end of file diff --git a/src/cli.rs b/src/cli.rs index ad668c7..70d2e6a 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -159,6 +159,9 @@ pub enum Commands { /// Pubkey of the counterpart #[arg(short, long)] pubkey: String, + /// Order id + #[arg(short, long)] + order_id: Uuid, /// Message to send #[arg(short, long)] message: String, @@ -410,24 +413,16 @@ pub async fn run() -> Result<()> { .await? } Commands::Rate { order_id, rating } => { - execute_rate_user( - order_id, - rating, - &identity_keys, - &trade_keys, - mostro_key, - &client, - ) - .await?; + execute_rate_user(order_id, rating, &identity_keys, mostro_key, &client).await?; } Commands::AdmTakeDispute { dispute_id } => { execute_take_dispute(dispute_id, &identity_keys, &trade_keys, mostro_key, &client) .await? } Commands::AdmListDisputes {} => execute_list_disputes(mostro_key, &client).await?, - Commands::SendDm { pubkey, message } => { + Commands::SendDm { pubkey, order_id, message } => { let pubkey = PublicKey::from_str(pubkey)?; - execute_send_dm(&trade_keys, pubkey, &client, message).await? + execute_send_dm(pubkey, &client, order_id, message).await? } }; } diff --git a/src/cli/add_invoice.rs b/src/cli/add_invoice.rs index c58613a..f0bd1e3 100644 --- a/src/cli/add_invoice.rs +++ b/src/cli/add_invoice.rs @@ -21,7 +21,7 @@ pub async fn execute_add_invoice( .await .unwrap(); let trade_keys = order.trade_keys.clone().unwrap(); - let trade_keys = Keys::parse(trade_keys).unwrap(); + let trade_keys = Keys::parse(&trade_keys).unwrap(); println!( "Sending a lightning invoice {} to mostro pubId {}", diff --git a/src/cli/rate_user.rs b/src/cli/rate_user.rs index 7625991..146040f 100644 --- a/src/cli/rate_user.rs +++ b/src/cli/rate_user.rs @@ -3,13 +3,15 @@ use mostro_core::message::{Action, Message, Payload}; use nostr_sdk::prelude::*; use uuid::Uuid; -use crate::util::send_message_sync; +use crate::{ + db::{connect, Order}, + util::send_message_sync, +}; pub async fn execute_rate_user( order_id: &Uuid, rating: &u8, identity_keys: &Keys, - trade_keys: &Keys, mostro_key: PublicKey, client: &Client, ) -> Result<()> { @@ -24,6 +26,21 @@ pub async fn execute_rate_user( std::process::exit(0); } + let pool = connect().await?; + + let trade_keys = if let Ok(order_to_vote) = Order::get_by_id(&pool, &order_id.to_string()).await + { + match order_to_vote.trade_keys.as_ref() { + Some(trade_keys) => Keys::parse(trade_keys)?, + None => { + anyhow::bail!("No trade_keys found for this order"); + } + } + } else { + println!("order {} not found", order_id); + std::process::exit(0) + }; + // Create rating message of counterpart let rate_message = Message::new_order( Some(*order_id), @@ -36,7 +53,7 @@ pub async fn execute_rate_user( send_message_sync( client, Some(identity_keys), - trade_keys, + &trade_keys, mostro_key, rate_message, true, diff --git a/src/cli/send_dm.rs b/src/cli/send_dm.rs index 9c9482d..645e304 100644 --- a/src/cli/send_dm.rs +++ b/src/cli/send_dm.rs @@ -1,12 +1,13 @@ -use crate::util::send_message_sync; +use crate::{db::Order, util::send_message_sync}; use anyhow::Result; use mostro_core::message::{Action, Message, Payload}; use nostr_sdk::prelude::*; +use uuid::Uuid; pub async fn execute_send_dm( - trade_keys: &Keys, receiver: PublicKey, client: &Client, + order_id: &Uuid, message: &str, ) -> Result<()> { let message = Message::new_dm( @@ -15,7 +16,24 @@ pub async fn execute_send_dm( Action::SendDm, Some(Payload::TextMessage(message.to_string())), ); - send_message_sync(client, None, trade_keys, receiver, message, true, true).await?; + + let pool = crate::db::connect().await?; + + let trade_keys = if let Ok(order_to_vote) = Order::get_by_id(&pool, &order_id.to_string()).await + { + match order_to_vote.trade_keys.as_ref() { + Some(trade_keys) => Keys::parse(trade_keys)?, + None => { + anyhow::bail!("No trade_keys found for this order"); + } + } + } else { + println!("order {} not found", order_id); + std::process::exit(0) + }; + + + send_message_sync(client, None, &trade_keys, receiver, message, true, true).await?; Ok(()) } diff --git a/src/cli/send_msg.rs b/src/cli/send_msg.rs index f29551a..a628cd3 100644 --- a/src/cli/send_msg.rs +++ b/src/cli/send_msg.rs @@ -52,7 +52,7 @@ pub async fn execute_send_msg( match order { Ok(order) => { if let Some(trade_keys_str) = order.trade_keys { - let trade_keys = Keys::parse(trade_keys_str)?; + let trade_keys = Keys::parse(&trade_keys_str)?; send_message_sync( client, identity_keys, diff --git a/src/db.rs b/src/db.rs index 2c1437a..1519d12 100644 --- a/src/db.rs +++ b/src/db.rs @@ -1,4 +1,5 @@ use crate::util::get_mcli_path; +use anyhow::Result; use mostro_core::order::SmallOrder; use mostro_core::NOSTR_REPLACEABLE_EVENT_KIND; use nip06::FromMnemonic; @@ -9,7 +10,7 @@ use sqlx::SqlitePool; use std::fs::File; use std::path::Path; -pub async fn connect() -> Result, sqlx::Error> { +pub async fn connect() -> Result> { let mcli_dir = get_mcli_path(); let mcli_db_path = format!("{}/mcli.db", mcli_dir); let db_url = format!("sqlite://{}", mcli_db_path); @@ -17,7 +18,7 @@ pub async fn connect() -> Result, sqlx::Error> { if !Path::exists(Path::new(&mcli_db_path)) { if let Err(res) = File::create(&mcli_db_path) { println!("Error in creating db file: {}", res); - return Err(sqlx::Error::Io(res)); + return Err(res.into()); } pool = SqlitePool::connect(&db_url).await?; println!("Creating database file with orders table..."); @@ -59,10 +60,10 @@ pub async fn connect() -> Result, sqlx::Error> { Ok(m) => m.to_string(), Err(e) => { println!("Error generating mnemonic: {}", e); - return Err(sqlx::Error::Decode(Box::new(e))); + return Err(e.into()); } }; - let user = User::new(mnemonic, &pool).await.unwrap(); + let user = User::new(mnemonic, &pool).await?; println!("User created with pubkey: {}", user.i0_pubkey); } else { pool = SqlitePool::connect(&db_url).await?; @@ -81,10 +82,7 @@ pub struct User { } impl User { - pub async fn new( - mnemonic: String, - pool: &SqlitePool, - ) -> Result> { + pub async fn new(mnemonic: String, pool: &SqlitePool) -> Result { let mut user = User::default(); let account = NOSTR_REPLACEABLE_EVENT_KIND as u32; let i0_keys = @@ -118,7 +116,7 @@ impl User { } // Applying changes to the database - pub async fn save(&self, pool: &SqlitePool) -> Result<(), Box> { + pub async fn save(&self, pool: &SqlitePool) -> Result<()> { sqlx::query( r#" UPDATE users @@ -140,7 +138,7 @@ impl User { Ok(()) } - pub async fn get(pool: &SqlitePool) -> Result> { + pub async fn get(pool: &SqlitePool) -> Result { let user = sqlx::query_as::<_, User>( r#" SELECT i0_pubkey, mnemonic, last_trade_index, created_at @@ -154,7 +152,7 @@ impl User { Ok(user) } - pub async fn get_next_trade_index(pool: SqlitePool) -> Result> { + pub async fn get_next_trade_index(pool: SqlitePool) -> Result { let user = User::get(&pool).await?; match user.last_trade_index { Some(index) => Ok(index + 1), @@ -162,7 +160,7 @@ impl User { } } - pub async fn get_identity_keys(pool: &SqlitePool) -> Result> { + pub async fn get_identity_keys(pool: &SqlitePool) -> Result { let user = User::get(pool).await?; let account = NOSTR_REPLACEABLE_EVENT_KIND as u32; let keys = @@ -171,10 +169,10 @@ impl User { Ok(keys) } - pub async fn get_next_trade_keys( - pool: &SqlitePool, - ) -> Result<(Keys, i64), Box> { - let trade_index = User::get_next_trade_index(pool.clone()).await?; + pub async fn get_next_trade_keys(pool: &SqlitePool) -> Result<(Keys, i64)> { + let mut trade_index = User::get_next_trade_index(pool.clone()).await?; + trade_index = trade_index - 1; + let user = User::get(pool).await?; let account = NOSTR_REPLACEABLE_EVENT_KIND as u32; match trade_index.try_into() { @@ -225,7 +223,7 @@ impl Order { order: SmallOrder, trade_keys: &Keys, request_id: Option, - ) -> Result> { + ) -> Result { let trade_keys_hex = trade_keys.secret_key().to_secret_hex(); let id = match order.id { Some(id) => id.to_string(), @@ -349,7 +347,7 @@ impl Order { } // Applying changes to the database - pub async fn save(&self, pool: &SqlitePool) -> Result<(), Box> { + pub async fn save(&self, pool: &SqlitePool) -> Result<()> { // Validation if an identity document is present if let Some(ref id) = self.id { sqlx::query( @@ -385,7 +383,7 @@ impl Order { println!("Order with id {} updated in the database.", id); } else { - return Err("Order must have an ID to be updated.".into()); + return Err(anyhow::anyhow!("Order must have an ID to be updated.")); } Ok(()) @@ -412,10 +410,7 @@ impl Order { Ok(rows_affected > 0) } - pub async fn get_by_id( - pool: &SqlitePool, - id: &str, - ) -> Result> { + pub async fn get_by_id(pool: &SqlitePool, id: &str) -> Result { let order = sqlx::query_as::<_, Order>( r#" SELECT * FROM orders WHERE id = ? @@ -429,7 +424,7 @@ impl Order { Ok(order) } - pub async fn get_all(pool: &SqlitePool) -> Result, Box> { + pub async fn get_all(pool: &SqlitePool) -> Result> { let orders = sqlx::query_as::<_, Order>(r#"SELECT * FROM orders"#) .fetch_all(pool) .await?; diff --git a/src/lib.rs b/src/lib.rs index 1cbc0b8..ce39579 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,6 +3,5 @@ pub mod db; pub mod error; pub mod lightning; pub mod nip33; -pub mod nip59; pub mod pretty_table; pub mod util; diff --git a/src/nip59.rs b/src/nip59.rs deleted file mode 100644 index 8a42e6e..0000000 --- a/src/nip59.rs +++ /dev/null @@ -1,160 +0,0 @@ -use base64::engine::{general_purpose, Engine}; -use mostro_core::message::Message; -use nip44::v2::{decrypt_to_bytes, encrypt_to_bytes, ConversationKey}; -use nostr_sdk::event::builder::Error as BuilderError; -use nostr_sdk::prelude::*; - -/// Creates a new nip59 event -/// -/// # Arguments -/// -/// * `identity_keys` - Keys of the sender used to identify the sender by Mostrod -/// * `trade_keys` - The keys of the sender used to trade -/// * `receiver` - The public key of the receiver -/// * `payload` - The message -/// * `expiration` - Time of the expiration of the event -/// -/// # Returns -/// Returns a gift wrap event -/// -pub fn gift_wrap( - identity_keys: &Keys, - trade_keys: &Keys, - receiver: PublicKey, - payload: String, - expiration: Option, - pow: u8, -) -> Result { - // We convert back the string to a message - let message = Message::from_json(&payload).unwrap(); - // We sign the message - let sig = message.get_inner_message_kind().sign(trade_keys); - // We compose the content - let content = (message, sig); - let content = serde_json::to_string(&content).unwrap(); - // We create the rumor - let rumor: UnsignedEvent = EventBuilder::text_note(content).build(trade_keys.public_key()); - // We seal the rumor - let seal: Event = seal(identity_keys, &receiver, rumor)?; - gift_wrap_from_seal(&receiver, &seal, expiration, pow) -} - -pub fn seal( - sender_keys: &Keys, - receiver_pubkey: &PublicKey, - rumor: UnsignedEvent, -) -> Result { - let sender_private_key = sender_keys.secret_key(); - // Derive conversation key - let ck = ConversationKey::derive(sender_private_key, receiver_pubkey); - // Encrypt payload - let encrypted_content = encrypt_to_bytes(&ck, rumor.as_json())?; - // Encode with base64 - let b64decoded_content = general_purpose::STANDARD.encode(encrypted_content); - // Compose builder - let event = EventBuilder::new(Kind::Seal, b64decoded_content) - .custom_created_at(Timestamp::tweaked(nip59::RANGE_RANDOM_TIMESTAMP_TWEAK)) - .build(sender_keys.public_key()) - .sign_with_keys(sender_keys)?; - Ok(event) -} - -pub fn gift_wrap_from_seal( - receiver: &PublicKey, - seal: &Event, - expiration: Option, - pow: u8, -) -> Result { - let ephemeral_keys: Keys = Keys::generate(); - // Derive conversation key - let ck = ConversationKey::derive(ephemeral_keys.secret_key(), receiver); - // Encrypt payload - let encrypted_content = encrypt_to_bytes(&ck, seal.as_json())?; - let mut tags: Vec = Vec::with_capacity(1 + usize::from(expiration.is_some())); - tags.push(Tag::public_key(*receiver)); - - if let Some(timestamp) = expiration { - tags.push(Tag::expiration(timestamp)); - } - let tags = Tags::new(tags); - // Encode with base64 - let b64decoded_content = general_purpose::STANDARD.encode(encrypted_content); - let event = EventBuilder::new(Kind::GiftWrap, b64decoded_content) - .tags(tags) - .custom_created_at(Timestamp::tweaked(nip59::RANGE_RANDOM_TIMESTAMP_TWEAK)) - .pow(pow) - .build(ephemeral_keys.public_key()) - .sign_with_keys(&ephemeral_keys)?; - - Ok(event) -} - -pub fn unwrap_gift_wrap( - keys: Option<&Keys>, - gw_ck: Option, - seal_ck: Option, - gift_wrap: &Event, -) -> Result { - let gw_ck = match keys { - Some(keys) => ConversationKey::derive(keys.secret_key(), &gift_wrap.pubkey), - None => match gw_ck { - Some(ck) => ck, - None => { - return Err(BuilderError::NIP44( - nostr_sdk::nips::nip44::Error::NotFound( - "No keys or conversation key".to_string(), - ), - )) - } - }, - }; - let b64decoded_content = match general_purpose::STANDARD.decode(gift_wrap.content.as_bytes()) { - Ok(b64decoded_content) => b64decoded_content, - Err(e) => { - return Err(BuilderError::NIP44( - nostr_sdk::nips::nip44::Error::NotFound(e.to_string()), - )); - } - }; - // Decrypt and verify seal - let seal = decrypt_to_bytes(&gw_ck, b64decoded_content)?; - let seal = String::from_utf8(seal).expect("Found invalid UTF-8"); - let seal = match Event::from_json(seal) { - Ok(seal) => seal, - Err(e) => { - println!("Error: {:#?}", e); - return Err(BuilderError::NIP44( - nostr_sdk::nips::nip44::Error::NotFound(e.to_string()), - )); - } - }; - let seal_ck = match keys { - Some(keys) => ConversationKey::derive(keys.secret_key(), &seal.pubkey), - None => match seal_ck { - Some(ck) => ck, - None => { - return Err(BuilderError::NIP44( - nostr_sdk::nips::nip44::Error::NotFound( - "No keys or conversation key".to_string(), - ), - )) - } - }, - }; - let b64decoded_content = match general_purpose::STANDARD.decode(seal.content.as_bytes()) { - Ok(b64decoded_content) => b64decoded_content, - Err(e) => { - return Err(BuilderError::NIP44( - nostr_sdk::nips::nip44::Error::NotFound(e.to_string()), - )) - } - }; - // Decrypt rumor - let rumor = decrypt_to_bytes(&seal_ck, b64decoded_content)?; - let rumor = String::from_utf8(rumor).expect("Found invalid UTF-8"); - - Ok(UnwrappedGift { - sender: seal.pubkey, - rumor: UnsignedEvent::from_json(rumor)?, - }) -} diff --git a/src/util.rs b/src/util.rs index f2d4123..f811177 100644 --- a/src/util.rs +++ b/src/util.rs @@ -1,5 +1,4 @@ use crate::nip33::{dispute_from_tags, order_from_tags}; -use crate::nip59::{gift_wrap, unwrap_gift_wrap}; use anyhow::{Error, Result}; use base64::engine::general_purpose; @@ -16,8 +15,6 @@ use nostr_sdk::prelude::*; use std::thread::sleep; use std::time::Duration; use std::{fs, path::Path}; -use tokio::time::timeout; -use uuid::Uuid; pub async fn send_dm( client: &Client, @@ -25,6 +22,7 @@ pub async fn send_dm( trade_keys: &Keys, receiver_pubkey: &PublicKey, payload: String, + expiration: Option, to_user: bool, ) -> Result<()> { let pow: u8 = var("POW").unwrap_or('0'.to_string()).parse().unwrap(); @@ -32,7 +30,7 @@ pub async fn send_dm( // Derive conversation key let ck = ConversationKey::derive(trade_keys.secret_key(), receiver_pubkey); // Encrypt payload - let encrypted_content = encrypt_to_bytes(&ck, payload)?; + let encrypted_content = encrypt_to_bytes(&ck, payload.as_bytes())?; // Encode with base64 let b64decoded_content = general_purpose::STANDARD.encode(encrypted_content); // Compose builder @@ -43,14 +41,26 @@ pub async fn send_dm( } else { let identity_keys = identity_keys .ok_or_else(|| Error::msg("identity_keys required when to_user is false"))?; - gift_wrap( - identity_keys, - trade_keys, - *receiver_pubkey, - payload, - None, - pow, - )? + + let message = Message::from_json(&payload).unwrap(); + // We sign the message + let sig = message.get_inner_message_kind().sign(trade_keys); + // We compose the content + let content = (message, sig); + let content = serde_json::to_string(&content).unwrap(); + // We create the rumor + let rumor = EventBuilder::text_note(content) + .pow(pow) + .build(trade_keys.public_key()); + let mut tags: Vec = Vec::with_capacity(1 + usize::from(expiration.is_some())); + tags.push(Tag::public_key(*receiver_pubkey)); + + if let Some(timestamp) = expiration { + tags.push(Tag::expiration(timestamp)); + } + let tags = Tags::new(tags); + + EventBuilder::gift_wrap(identity_keys, receiver_pubkey, rumor, tags).await? }; info!("Sending event: {event:#?}"); @@ -97,6 +107,7 @@ pub async fn send_message_sync( trade_keys, &receiver_pubkey, message_json, + None, to_user, ) .await?; @@ -112,108 +123,6 @@ pub async fn send_message_sync( Ok(dm) } -pub async fn requests_relay( - client: Client, - relay: (RelayUrl, Relay), - filters: Filter, -) -> Vec { - let relrequest = get_events_of_mostro(&relay.1, vec![filters.clone()], client); - - // Buffer vector - let mut res: Vec = Vec::new(); - - // Using a timeout of 3 seconds to avoid unresponsive relays to block the loop forever. - if let Ok(rx) = timeout(Duration::from_secs(3), relrequest).await { - match rx { - Ok(m) => { - if m.is_empty() { - info!("No requested events found on relay {}", relay.0.to_string()); - } - res = m - } - Err(_e) => println!("Error"), - } - } - - res -} - -pub async fn send_relays_requests(client: &Client, filters: Filter) -> Vec> { - let relays = client.relays().await; - - let relays_requests = relays.len(); - let mut requests: Vec>> = - Vec::with_capacity(relays_requests); - let mut answers_requests = Vec::with_capacity(relays_requests); - - for relay in relays.into_iter() { - info!("Requesting to relay : {}", relay.0.as_str()); - // Spawn futures and join them at the end - requests.push(tokio::spawn(requests_relay( - client.clone(), - relay.clone(), - filters.clone(), - ))); - } - - // Get answers from relay - for req in requests { - answers_requests.push(req.await.unwrap()); - } - - answers_requests -} - -pub async fn get_events_of_mostro( - relay: &Relay, - filters: Vec, - client: Client, -) -> Result, Error> { - let mut events: Vec = Vec::new(); - - // Subscribe - info!( - "Subscribing for all mostro orders to relay : {}", - relay.url().to_string() - ); - let id = SubscriptionId::new(Uuid::new_v4().to_string()); - let msg = ClientMessage::req(id.clone(), filters.clone()); - - info!("Message sent : {:?}", msg); - - // Send msg to relay - relay.send_msg(msg.clone())?; - - // Wait notification from relays - let mut notifications = client.notifications(); - - while let Ok(notification) = notifications.recv().await { - if let RelayPoolNotification::Message { message, .. } = notification { - match message { - RelayMessage::Event { - subscription_id, - event, - } => { - if subscription_id == id { - events.push(event.as_ref().clone()); - } - } - RelayMessage::EndOfStoredEvents(subscription_id) => { - if subscription_id == id { - break; - } - } - _ => (), - }; - } - } - - // Unsubscribe - relay.send_msg(ClientMessage::close(id))?; - - Ok(events) -} - pub async fn get_direct_messages( client: &Client, my_key: &Keys, @@ -247,17 +156,17 @@ pub async fn get_direct_messages( info!("Request events with event kind : {:?} ", filters.kinds); - // Send all requests to relays - let mostro_req = send_relays_requests(client, filters).await; - - // Buffer vector for direct messages let mut direct_messages: Vec<(Message, u64)> = Vec::new(); - // Vector for single order id check - maybe multiple relay could send the same order id? Check unique one... - let mut id_list = Vec::::new(); + if let Ok(mostro_req) = client + .fetch_events(vec![filters], Duration::from_secs(15)) + .await + { + // Buffer vector for direct messages + // Vector for single order id check - maybe multiple relay could send the same order id? Check unique one... + let mut id_list = Vec::::new(); - for dms in mostro_req.iter() { - for dm in dms { + for dm in mostro_req.iter() { if !id_list.contains(&dm.id) { id_list.push(dm.id); let created_at: Timestamp; @@ -272,44 +181,46 @@ pub async fn get_direct_messages( } }; // Decrypt - let unencrypted_content = decrypt_to_bytes(&ck, b64decoded_content).unwrap(); + let unencrypted_content = decrypt_to_bytes(&ck, &b64decoded_content).unwrap(); let message_str = String::from_utf8(unencrypted_content).expect("Found invalid UTF-8"); message = Message::from_json(&message_str).unwrap(); created_at = dm.created_at; } else { - let unwrapped_gift = match unwrap_gift_wrap(Some(my_key), None, None, dm) { + let unwrapped_gift = match nip59::extract_rumor(my_key, dm).await { Ok(u) => u, Err(_) => { + println!("Error unwrapping gift"); continue; } }; - let (mmessage, sig): (Message, nostr_sdk::secp256k1::schnorr::Signature) = + let (rumor_message, sig): (Message, nostr_sdk::secp256k1::schnorr::Signature) = serde_json::from_str(&unwrapped_gift.rumor.content).unwrap(); - if !mmessage + if !rumor_message .get_inner_message_kind() .verify_signature(unwrapped_gift.rumor.pubkey, sig) { + println!("Signature verification failed"); continue; } - message = mmessage; + message = rumor_message; created_at = unwrapped_gift.rumor.created_at; } // Here we discard messages older than the real since parameter let since_time = chrono::Utc::now() - .checked_sub_signed(chrono::Duration::minutes(since)) + .checked_sub_signed(chrono::Duration::minutes(30)) .unwrap() .timestamp() as u64; if created_at.as_u64() < since_time { + println!("Discarding message older than since parameter"); continue; } - direct_messages.push((message, created_at.as_u64())); } } + // Return element sorted by second tuple element ( Timestamp ) + direct_messages.sort_by(|a, b| a.1.cmp(&b.1)); } - // Return element sorted by second tuple element ( Timestamp ) - direct_messages.sort_by(|a, b| a.1.cmp(&b.1)); direct_messages } @@ -328,7 +239,7 @@ pub async fn get_orders_list( let timestamp = Timestamp::from(since_time); - let filter = Filter::new() + let filters = Filter::new() .author(pubkey) .limit(50) .since(timestamp) @@ -337,7 +248,7 @@ pub async fn get_orders_list( info!( "Request to mostro id : {:?} with event kind : {:?} ", - filter.authors, filter.kinds + filters.authors, filters.kinds ); // Extracted Orders List @@ -345,11 +256,13 @@ pub async fn get_orders_list( let mut requested_orders_list = Vec::::new(); // Send all requests to relays - let mostro_req = send_relays_requests(client, filter).await; - // Scan events to extract all orders - for orders_row in mostro_req.iter() { - for ord in orders_row { - let order = order_from_tags(ord.tags.clone()); + if let Ok(mostro_req) = client + .fetch_events(vec![filters], Duration::from_secs(15)) + .await + { + // Scan events to extract all orders + for el in mostro_req.iter() { + let order = order_from_tags(el.tags.clone()); if order.is_err() { error!("{order:?}"); @@ -375,7 +288,7 @@ pub async fn get_orders_list( } // Get created at field from Nostr event - order.created_at = Some(ord.created_at.as_u64() as i64); + order.created_at = Some(el.created_at.as_u64() as i64); complete_events_list.push(order.clone()); @@ -431,10 +344,12 @@ pub async fn get_disputes_list(pubkey: PublicKey, client: &Client) -> Result::new(); // Send all requests to relays - let mostro_req = send_relays_requests(client, filter).await; - // Scan events to extract all disputes - for disputes_row in mostro_req.iter() { - for d in disputes_row { + if let Ok(mostro_req) = client + .fetch_events(vec![filter], Duration::from_secs(15)) + .await + { + // Scan events to extract all disputes + for d in mostro_req.iter() { let dispute = dispute_from_tags(d.tags.clone()); if dispute.is_err() {