diff --git a/.gitmodules b/.gitmodules index 3ca683f4..131cd1a5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "node"] - path = node - url = https://code.gri.mw/ardocrat/node [submodule "wallet"] path = wallet url = https://code.gri.mw/ardocrat/wallet diff --git a/Cargo.lock b/Cargo.lock index 7b77cee8..5865ae47 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -156,17 +156,18 @@ dependencies = [ [[package]] name = "age" -version = "0.7.2" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "815e87cc8c39227cfff259f9550bd9f1c1a082370eccf4e9a176327fb7f906c9" +checksum = "caf6575916925dce67e5cc5588066ec50db90be641b5de10e2495d1a4045d55c" dependencies = [ "age-core", "base64 0.13.1", "bech32 0.8.1", "chacha20poly1305 0.9.1", + "cipher 0.4.4", "cookie-factory", - "hkdf 0.11.0", - "hmac 0.11.0", + "hkdf", + "hmac 0.12.1", "i18n-embed", "i18n-embed-fl", "lazy_static", @@ -175,7 +176,8 @@ dependencies = [ "rand 0.7.3", "rand 0.8.6", "rust-embed", - "scrypt 0.8.1", + "scrypt 0.9.0", + "sha2 0.10.9", "sha2 0.9.9", "subtle", "x25519-dalek 1.1.1", @@ -184,18 +186,19 @@ dependencies = [ [[package]] name = "age-core" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70afa630ef12a4fc666277713efbe6da2bc87bb3f3af0f1149415b701362c615" +checksum = "00a5c8d8a33abc74ad393896a6305351dd159d0e184788f4729e3c80e397fa45" dependencies = [ "base64 0.13.1", "chacha20poly1305 0.9.1", "cookie-factory", - "hkdf 0.11.0", + "hkdf", + "io_tee", "nom 7.1.3", "rand 0.8.6", - "secrecy 0.8.0", - "sha2 0.9.9", + "secrecy", + "sha2 0.10.9", ] [[package]] @@ -300,8 +303,8 @@ dependencies = [ "bitflags 2.13.0", "cc", "cesu8", - "jni", - "jni-sys", + "jni 0.21.1", + "jni-sys 0.3.0", "libc", "log", "ndk", @@ -419,7 +422,7 @@ dependencies = [ "objc2-core-foundation", "objc2-core-graphics", "objc2-foundation 0.3.2", - "parking_lot 0.12.5", + "parking_lot", "percent-encoding", "windows-sys 0.60.2", "x11rb", @@ -478,8 +481,8 @@ dependencies = [ "derive_builder_fork_arti", "derive_more", "educe", - "fs-mistrust", - "futures 0.3.31", + "fs-mistrust 0.14.2", + "futures 0.3.32", "hostname-validator", "humantime", "humantime-serde", @@ -487,36 +490,91 @@ dependencies = [ "once_cell", "postage", "rand 0.10.1", - "safelog", + "safelog 0.8.2", "serde", "tempfile", "thiserror 2.0.18", "time", - "tor-async-utils", - "tor-basic-utils", - "tor-chanmgr", - "tor-circmgr", - "tor-config", - "tor-config-path", - "tor-dircommon", - "tor-dirmgr", - "tor-error", - "tor-guardmgr", - "tor-hsclient", - "tor-hscrypto", - "tor-keymgr", - "tor-linkspec", - "tor-llcrypto", - "tor-memquota", - "tor-netdir", - "tor-netdoc", - "tor-persist", - "tor-proto", - "tor-protover", - "tor-rtcompat", + "tor-async-utils 0.43.0", + "tor-basic-utils 0.43.0", + "tor-chanmgr 0.43.0", + "tor-circmgr 0.43.0", + "tor-config 0.43.0", + "tor-config-path 0.43.0", + "tor-dircommon 0.43.0", + "tor-dirmgr 0.43.0", + "tor-error 0.43.0", + "tor-guardmgr 0.43.0", + "tor-hsclient 0.43.0", + "tor-hscrypto 0.43.0", + "tor-keymgr 0.43.0", + "tor-linkspec 0.43.0", + "tor-llcrypto 0.43.0", + "tor-memquota 0.43.0", + "tor-netdir 0.43.0", + "tor-netdoc 0.43.0", + "tor-persist 0.43.0", + "tor-proto 0.43.0", + "tor-protover 0.43.0", + "tor-rtcompat 0.43.0", "tracing", "void", - "web-time-compat", + "web-time-compat 0.1.0", +] + +[[package]] +name = "arti-client" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841d54b6c87059a9b6562bfe585f3a637b72f90cddaa327ac29b5ddf082a54b4" +dependencies = [ + "async-trait", + "cfg-if 1.0.4", + "derive-deftly", + "derive_builder_fork_arti", + "derive_more", + "educe", + "fs-mistrust 0.15.0", + "futures 0.3.32", + "hostname-validator", + "humantime", + "humantime-serde", + "libc", + "once_cell", + "postage", + "rand 0.10.1", + "safelog 0.9.0", + "serde", + "tempfile", + "thiserror 2.0.18", + "time", + "tor-async-utils 0.44.0", + "tor-basic-utils 0.44.0", + "tor-chanmgr 0.44.0", + "tor-circmgr 0.44.0", + "tor-config 0.44.0", + "tor-config-path 0.44.0", + "tor-dircommon 0.44.0", + "tor-dirmgr 0.44.0", + "tor-error 0.44.0", + "tor-guardmgr 0.44.0", + "tor-hsclient 0.44.0", + "tor-hscrypto 0.44.0", + "tor-hsservice", + "tor-keymgr 0.44.0", + "tor-linkspec 0.44.0", + "tor-llcrypto 0.44.0", + "tor-memquota 0.44.0", + "tor-netdir 0.44.0", + "tor-netdoc 0.44.0", + "tor-persist 0.44.0", + "tor-proto 0.44.0", + "tor-protover 0.44.0", + "tor-ptmgr", + "tor-rtcompat 0.44.0", + "tracing", + "void", + "web-time-compat 0.2.0", ] [[package]] @@ -764,7 +822,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da2537846e16b96d2972ee52a3b355663872a1a687ce6d57a3b6f6b6a181c89" dependencies = [ "thiserror 1.0.69", - "tokio 1.49.0", + "tokio 1.52.3", ] [[package]] @@ -840,7 +898,7 @@ checksum = "a34a3b57207a7a1007832416c3e4862378c8451b4e8e093e436f48c2d3d2c151" dependencies = [ "futures-util", "gloo-timers", - "tokio 1.49.0", + "tokio 1.52.3", "wasm-bindgen-futures", ] @@ -851,12 +909,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c92385c7c8b3eb2de1b78aeca225212e4c9a69a78b802832759b108681a5069" dependencies = [ "async-utility", - "futures 0.3.31", + "futures 0.3.32", "futures-util", "js-sys", - "tokio 1.49.0", - "tokio-rustls 0.26.4", - "tokio-socks 0.5.3", + "tokio 1.52.3", + "tokio-rustls", + "tokio-socks", "tokio-tungstenite", "url", "wasm-bindgen", @@ -875,7 +933,7 @@ dependencies = [ "futures-util", "pin-project", "rustc_version", - "tokio 1.49.0", + "tokio 1.52.3", ] [[package]] @@ -1496,16 +1554,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" -[[package]] -name = "bytes" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "iovec", -] - [[package]] name = "bytes" version = "0.5.6" @@ -1575,6 +1623,12 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "beae2cb9f60bc3f21effaaf9c64e51f6627edd54eedc9199ba07f519ef2a2101" +[[package]] +name = "caret" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bb840a063107846780a14acc022b55bf6c174997a393ffde8b58ff6630c1b56" + [[package]] name = "cbc" version = "0.1.2" @@ -1909,7 +1963,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2" dependencies = [ - "futures 0.3.31", + "futures 0.3.32", ] [[package]] @@ -2194,7 +2248,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938" dependencies = [ "csv-core", - "itoa 1.0.17", + "itoa", "ryu", "serde_core", ] @@ -2223,19 +2277,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f27ae1dd37df86211c42e150270f82743308803d90a6f6e6651cd730d5e1732f" -[[package]] -name = "curve25519-dalek" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a9b85542f99a2dfa2a1b8e192662741c9859a846b296bef1c92ef9b58b5a216" -dependencies = [ - "byteorder", - "digest 0.8.1", - "rand_core 0.5.1", - "subtle", - "zeroize", -] - [[package]] name = "curve25519-dalek" version = "3.2.0" @@ -2259,7 +2300,22 @@ dependencies = [ "cpufeatures 0.2.17", "curve25519-dalek-derive", "digest 0.10.7", - "fiat-crypto", + "fiat-crypto 0.2.9", + "rustc_version", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5eed333089e2e1c1ac8c6c0398e5e2497b4c9926ca6d0365ed1e099afa5bc23" +dependencies = [ + "cfg-if 1.0.4", + "cpufeatures 0.3.0", + "curve25519-dalek-derive", + "fiat-crypto 0.3.0", "rustc_version", "subtle", "zeroize", @@ -2422,9 +2478,9 @@ checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.4", "hashbrown 0.14.5", - "lock_api 0.4.14", + "lock_api", "once_cell", - "parking_lot_core 0.9.12", + "parking_lot_core", ] [[package]] @@ -2833,7 +2889,7 @@ dependencies = [ "digest 0.10.7", "elliptic-curve", "rfc6979", - "signature 2.2.0", + "signature", "spki", ] @@ -2847,15 +2903,6 @@ dependencies = [ "emath", ] -[[package]] -name = "ed25519" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" -dependencies = [ - "signature 1.6.4", -] - [[package]] name = "ed25519" version = "2.2.3" @@ -2863,21 +2910,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8", - "signature 2.2.0", -] - -[[package]] -name = "ed25519-dalek" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -dependencies = [ - "curve25519-dalek 3.2.0", - "ed25519 1.5.3", - "rand 0.7.3", - "serde", - "sha2 0.9.9", - "zeroize", + "signature", ] [[package]] @@ -2887,7 +2920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" dependencies = [ "curve25519-dalek 4.1.3", - "ed25519 2.2.3", + "ed25519", "merlin", "rand_core 0.6.4", "serde", @@ -2930,7 +2963,7 @@ dependencies = [ "objc2 0.5.2", "objc2-app-kit 0.2.2", "objc2-foundation 0.2.2", - "parking_lot 0.12.5", + "parking_lot", "percent-encoding", "pollster", "profiling", @@ -2972,7 +3005,7 @@ dependencies = [ "atomic_float", "bitflags 2.13.0", "egui", - "tokio 1.49.0", + "tokio 1.52.3", "tracing", "wasm-bindgen-futures", ] @@ -3240,7 +3273,7 @@ dependencies = [ "epaint_default_fonts", "log", "nohash-hasher", - "parking_lot 0.12.5", + "parking_lot", "profiling", ] @@ -3406,6 +3439,12 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" +[[package]] +name = "fiat-crypto" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64cd1e32ddd350061ae6edb1b082d7c54915b5c672c389143b9a63403a109f24" + [[package]] name = "figment" version = "0.10.19" @@ -3630,6 +3669,22 @@ dependencies = [ "walkdir", ] +[[package]] +name = "fs-mistrust" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd938e053fbfb6dba36106f4bcf27c53362e6152adc9341700c4bc2264cd4a8f" +dependencies = [ + "derive_builder_fork_arti", + "dirs 6.0.0", + "libc", + "pwd-grp", + "serde", + "thiserror 2.0.18", + "void", + "walkdir", +] + [[package]] name = "fs2" version = "0.4.3" @@ -3657,6 +3712,17 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "fslock-guard" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b63307a37c3d90d55a90eefa5441ec12cbd291ff456b6bf1126656c5bc43b058" +dependencies = [ + "libc", + "thiserror 2.0.18", + "windows-sys 0.61.2", +] + [[package]] name = "fuchsia-cprng" version = "0.1.1" @@ -3693,9 +3759,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d" dependencies = [ "futures-channel", "futures-core", @@ -3708,25 +3774,37 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" dependencies = [ "futures-core", "futures-sink", ] [[package]] -name = "futures-core" -version = "0.3.31" +name = "futures-copy" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" +checksum = "fcad91f8ba72542347d5cc8ee43891abe4698429fa7b3de56f17f4bb6fa514c4" +dependencies = [ + "futures 0.3.32", + "libc", + "pin-project", + "windows-sys 0.61.2", +] + +[[package]] +name = "futures-core" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" [[package]] name = "futures-executor" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" dependencies = [ "futures-core", "futures-task", @@ -3735,9 +3813,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" +checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" [[package]] name = "futures-lite" @@ -3754,9 +3832,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" dependencies = [ "proc-macro2 1.0.106", "quote 1.0.44", @@ -3765,21 +3843,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" +checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" [[package]] name = "futures-task" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" +checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" [[package]] name = "futures-util" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ "futures-channel", "futures-core", @@ -3789,7 +3867,6 @@ dependencies = [ "futures-task", "memchr", "pin-project-lite 0.2.16", - "pin-utils", "slab", ] @@ -4142,7 +4219,7 @@ dependencies = [ "android_logger", "anyhow", "arboard", - "arti-client", + "arti-client 0.43.0", "async-std", "async-wsocket", "backtrace", @@ -4156,7 +4233,7 @@ dependencies = [ "egui-async", "egui_extras", "env_logger", - "futures 0.3.31", + "futures 0.3.32", "gif", "grin_api", "grin_chain", @@ -4173,14 +4250,14 @@ dependencies = [ "grin_wallet_util", "hex", "http-body-util", - "hyper 1.8.1", + "hyper", "hyper-proxy2", "hyper-socks2", - "hyper-tls 0.6.0", + "hyper-tls", "hyper-util", "image", "interprocess", - "jni", + "jni 0.21.1", "lazy_static", "local-ip-address", "log", @@ -4192,7 +4269,7 @@ dependencies = [ "num-bigint 0.4.6", "objc", "openssl", - "parking_lot 0.12.5", + "parking_lot", "pin-project", "qrcode", "qrcodegen", @@ -4203,7 +4280,7 @@ dependencies = [ "rkv", "rqrr", "rust-i18n", - "rustls 0.23.40", + "rustls", "secp256k1 0.31.1", "serde", "serde_derive", @@ -4213,17 +4290,17 @@ dependencies = [ "sys-locale", "thiserror 2.0.18", "tokio 0.2.25", - "tokio 1.49.0", - "tokio-rustls 0.26.4", - "tokio-socks 0.5.3", + "tokio 1.52.3", + "tokio-rustls", + "tokio-socks", "tokio-tungstenite", "tokio-util 0.2.0", "toml 0.9.11+spec-1.1.0", - "tor-rtcompat", + "tor-rtcompat 0.43.0", "ur", "url", "usvg", - "uuid 0.8.2", + "uuid", "webpki-roots 1.0.7", "wgpu", "winit", @@ -4233,40 +4310,39 @@ dependencies = [ [[package]] name = "grin_api" -version = "5.4.1" +version = "5.5.1-alpha.0" dependencies = [ - "async-stream", "bytes 1.11.1", "easy-jsonrpc-mw", - "futures 0.3.31", + "futures 0.3.32", "grin_chain", "grin_core", "grin_p2p", "grin_pool", - "grin_store", "grin_util", - "http 0.2.12", - "hyper 0.14.32", - "hyper-rustls 0.23.2", + "http-body-util", + "hyper", + "hyper-rustls", "hyper-timeout", + "hyper-util", "lazy_static", "log", "regex", - "ring 0.16.20", - "rustls 0.20.9", + "rustls", "rustls-pemfile", "serde", "serde_derive", "serde_json", + "subtle", "thiserror 1.0.69", - "tokio 1.49.0", - "tokio-rustls 0.23.4", + "tokio 1.52.3", + "tokio-rustls", "url", ] [[package]] name = "grin_chain" -version = "5.4.1" +version = "5.5.1-alpha.0" dependencies = [ "bit-vec 0.6.3", "bitflags 1.3.2", @@ -4288,7 +4364,7 @@ dependencies = [ [[package]] name = "grin_config" -version = "5.4.1" +version = "5.5.1-alpha.0" dependencies = [ "dirs 2.0.2", "grin_core", @@ -4303,7 +4379,7 @@ dependencies = [ [[package]] name = "grin_core" -version = "5.4.1" +version = "5.5.1-alpha.0" dependencies = [ "blake2-rfc", "byteorder", @@ -4328,7 +4404,7 @@ dependencies = [ [[package]] name = "grin_keychain" -version = "5.4.1" +version = "5.5.1-alpha.0" dependencies = [ "blake2-rfc", "byteorder", @@ -4349,7 +4425,7 @@ dependencies = [ [[package]] name = "grin_p2p" -version = "5.4.1" +version = "5.5.1-alpha.0" dependencies = [ "bitflags 1.3.2", "built", @@ -4371,7 +4447,7 @@ dependencies = [ [[package]] name = "grin_pool" -version = "5.4.1" +version = "5.5.1-alpha.0" dependencies = [ "blake2-rfc", "chrono", @@ -4402,12 +4478,12 @@ dependencies = [ [[package]] name = "grin_servers" -version = "5.4.1" +version = "5.5.1-alpha.0" dependencies = [ "async-stream", "chrono", "fs2", - "futures 0.3.31", + "futures 0.3.32", "grin_api", "grin_chain", "grin_core", @@ -4416,23 +4492,23 @@ dependencies = [ "grin_pool", "grin_store", "grin_util", - "http 0.2.12", - "hyper 0.14.32", - "hyper-rustls 0.23.2", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", "log", "rand 0.6.5", - "rustls 0.20.9", "serde", "serde_derive", "serde_json", - "tokio 1.49.0", + "tokio 1.52.3", "tokio-util 0.7.18", "walkdir", ] [[package]] name = "grin_store" -version = "5.4.1" +version = "5.5.1-alpha.0" dependencies = [ "byteorder", "croaring", @@ -4450,17 +4526,16 @@ dependencies = [ [[package]] name = "grin_util" -version = "5.4.1" +version = "5.5.1-alpha.0" dependencies = [ "anyhow", "backtrace", "base64 0.12.3", - "byteorder", "grin_secp256k1zkp", "lazy_static", "log", "log4rs", - "parking_lot 0.10.2", + "parking_lot", "rand 0.6.5", "serde", "serde_derive", @@ -4471,12 +4546,12 @@ dependencies = [ [[package]] name = "grin_wallet_api" -version = "5.4.0-alpha.1" +version = "5.4.1" dependencies = [ "base64 0.12.3", "chrono", "easy-jsonrpc-mw", - "ed25519-dalek 1.0.1", + "ed25519-dalek", "grin_core", "grin_keychain", "grin_util", @@ -4486,21 +4561,20 @@ dependencies = [ "grin_wallet_util", "log", "rand 0.6.5", - "ring 0.16.20", + "ring 0.17.14", "serde", "serde_derive", "serde_json", - "uuid 0.8.2", + "uuid", ] [[package]] name = "grin_wallet_config" -version = "5.4.0-alpha.1" +version = "5.4.1" dependencies = [ "dirs 2.0.2", "grin_core", "grin_util", - "grin_wallet_util", "rand 0.6.5", "serde", "serde_derive", @@ -4509,11 +4583,9 @@ dependencies = [ [[package]] name = "grin_wallet_controller" -version = "5.4.0-alpha.1" +version = "5.4.1" dependencies = [ - "chrono", "easy-jsonrpc-mw", - "futures 0.3.31", "grin_api", "grin_chain", "grin_core", @@ -4524,64 +4596,70 @@ dependencies = [ "grin_wallet_impls", "grin_wallet_libwallet", "grin_wallet_util", - "hyper 0.14.32", + "http-body-util", + "hyper", "lazy_static", "log", "prettytable-rs", "qr_code", "rand 0.7.3", - "ring 0.16.20", "serde", - "serde_derive", "serde_json", "term 0.6.1", "thiserror 1.0.69", - "tokio 0.2.25", - "url", - "uuid 0.8.2", + "tokio 1.52.3", + "uuid", ] [[package]] name = "grin_wallet_impls" -version = "5.4.0-alpha.1" +version = "5.4.1" dependencies = [ + "arti-client 0.44.0", "base64 0.12.3", "blake2-rfc", - "byteorder", + "bytes 1.11.1", "chrono", - "data-encoding", - "ed25519-dalek 1.0.1", - "futures 0.3.31", + "ed25519-dalek", + "fs-mistrust 0.15.0", + "futures 0.3.32", "grin_api", "grin_chain", "grin_core", "grin_keychain", - "grin_store", "grin_util", "grin_wallet_config", "grin_wallet_libwallet", "grin_wallet_util", + "http-body-util", + "hyper", + "hyper-util", "lazy_static", "log", "rand 0.6.5", "regex", "reqwest", - "ring 0.16.20", + "ring 0.17.14", "serde", "serde_derive", "serde_json", + "sha2 0.10.9", "sysinfo 0.29.11", "thiserror 1.0.69", "timer", - "tokio 0.2.25", + "tokio 1.52.3", + "tor-hscrypto 0.44.0", + "tor-hsrproxy", + "tor-hsservice", + "tor-keymgr 0.44.0", + "tor-llcrypto 0.44.0", + "tor-rtcompat 0.44.0", "url", - "uuid 0.8.2", - "x25519-dalek 0.6.0", ] [[package]] name = "grin_wallet_libwallet" -version = "5.4.0-alpha.1" +version = "5.4.1" dependencies = [ "age", "base64 0.9.3", @@ -4591,8 +4669,8 @@ dependencies = [ "byteorder", "chacha20 0.8.2", "chrono", - "curve25519-dalek 2.1.3", - "ed25519-dalek 1.0.1", + "curve25519-dalek 5.0.0", + "ed25519-dalek", "grin_core", "grin_keychain", "grin_store", @@ -4605,7 +4683,6 @@ dependencies = [ "num-bigint 0.2.6", "rand 0.6.5", "regex", - "secrecy 0.6.0", "serde", "serde_derive", "serde_json", @@ -4613,18 +4690,17 @@ dependencies = [ "strum 0.18.0", "strum_macros 0.18.0", "thiserror 1.0.69", - "uuid 0.8.2", - "x25519-dalek 0.6.0", + "uuid", + "x25519-dalek 2.0.1", ] [[package]] name = "grin_wallet_util" -version = "5.4.0-alpha.1" +version = "5.4.1" dependencies = [ "data-encoding", - "ed25519-dalek 1.0.1", + "ed25519-dalek", "grin_util", - "rand 0.6.5", "serde", "serde_derive", "sha3 0.8.2", @@ -4643,59 +4719,32 @@ dependencies = [ ] [[package]] -name = "h2" -version = "0.2.7" +name = "growable-bloom-filter" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" +checksum = "d174ccb4ba660d431329e7f0797870d0a4281e36353ec4b4a3c5eab6c2cfb6f1" dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap 1.9.3", - "slab", - "tokio 0.2.25", - "tokio-util 0.3.1", - "tracing", - "tracing-futures", + "serde", + "serde_bytes", + "serde_derive", + "xxhash-rust", ] [[package]] name = "h2" -version = "0.3.27" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d" -dependencies = [ - "bytes 1.11.1", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap 2.13.0", - "slab", - "tokio 1.49.0", - "tokio-util 0.7.18", - "tracing", -] - -[[package]] -name = "h2" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54" +checksum = "6cb093c84e8bd9b188d4c4a8cb6579fc016968d14c99882163cd3ff402a4f155" dependencies = [ "atomic-waker", "bytes 1.11.1", "fnv", "futures-core", "futures-sink", - "http 1.4.0", + "http", "indexmap 2.13.0", "slab", - "tokio 1.49.0", + "tokio 1.52.3", "tokio-util 0.7.18", "tracing", ] @@ -4762,8 +4811,8 @@ dependencies = [ "base64 0.22.1", "bytes 1.11.1", "headers-core", - "http 1.4.0", - "httpdate 1.0.3", + "http", + "httpdate", "mime", "sha1", ] @@ -4774,7 +4823,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" dependencies = [ - "http 1.4.0", + "http", ] [[package]] @@ -4857,16 +4906,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" -[[package]] -name = "hkdf" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b" -dependencies = [ - "digest 0.9.0", - "hmac 0.11.0", -] - [[package]] name = "hkdf" version = "0.12.4" @@ -4910,17 +4949,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f558a64ac9af88b5ba400d99b579451af0d39c6d360980045b91aac966d705e2" -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes 1.11.1", - "fnv", - "itoa 1.0.17", -] - [[package]] name = "http" version = "1.4.0" @@ -4928,28 +4956,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" dependencies = [ "bytes 1.11.1", - "itoa 1.0.17", -] - -[[package]] -name = "http-body" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" -dependencies = [ - "bytes 0.5.6", - "http 0.2.12", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes 1.11.1", - "http 0.2.12", - "pin-project-lite 0.2.16", + "itoa", ] [[package]] @@ -4959,7 +4966,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes 1.11.1", - "http 1.4.0", + "http", ] [[package]] @@ -4970,8 +4977,8 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes 1.11.1", "futures-core", - "http 1.4.0", - "http-body 1.0.1", + "http", + "http-body", "pin-project-lite 0.2.16", ] @@ -4981,12 +4988,6 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" -[[package]] -name = "httpdate" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" - [[package]] name = "httpdate" version = "1.0.3" @@ -5020,72 +5021,23 @@ dependencies = [ [[package]] name = "hyper" -version = "0.13.10" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" -dependencies = [ - "bytes 0.5.6", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.2.7", - "http 0.2.12", - "http-body 0.3.1", - "httparse", - "httpdate 0.3.2", - "itoa 0.4.8", - "pin-project", - "socket2 0.3.19", - "tokio 0.2.25", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper" -version = "0.14.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" -dependencies = [ - "bytes 1.11.1", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.27", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate 1.0.3", - "itoa 1.0.17", - "pin-project-lite 0.2.16", - "socket2 0.5.10", - "tokio 1.49.0", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" +checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498" dependencies = [ "atomic-waker", "bytes 1.11.1", "futures-channel", "futures-core", - "h2 0.4.13", - "http 1.4.0", - "http-body 1.0.1", + "h2", + "http", + "http-body", "httparse", - "httpdate 1.0.3", - "itoa 1.0.17", + "httpdate", + "itoa", "pin-project-lite 0.2.16", - "pin-utils", "smallvec", - "tokio 1.49.0", + "tokio 1.52.3", "want", ] @@ -5098,46 +5050,32 @@ dependencies = [ "bytes 1.11.1", "futures-util", "headers", - "http 1.4.0", - "hyper 1.8.1", - "hyper-tls 0.6.0", + "http", + "hyper", + "hyper-tls", "hyper-util", "native-tls", "pin-project-lite 0.2.16", - "tokio 1.49.0", + "tokio 1.52.3", "tokio-native-tls", "tower-service", ] [[package]] name = "hyper-rustls" -version = "0.21.0" +version = "0.27.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6" +checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" dependencies = [ - "bytes 0.5.6", - "futures-util", - "hyper 0.13.10", + "http", + "hyper", + "hyper-util", "log", - "rustls 0.18.1", - "tokio 0.2.25", - "tokio-rustls 0.14.1", - "webpki 0.21.4", -] - -[[package]] -name = "hyper-rustls" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" -dependencies = [ - "http 0.2.12", - "hyper 0.14.32", - "log", - "rustls 0.20.9", + "rustls", "rustls-native-certs", - "tokio 1.49.0", - "tokio-rustls 0.23.4", + "tokio 1.52.3", + "tokio-rustls", + "tower-service", ] [[package]] @@ -5147,38 +5085,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51c227614c208f7e7c2e040526912604a1a957fe467c9c2f5b06c5d032337dab" dependencies = [ "async-socks5", - "http 1.4.0", - "hyper 1.8.1", - "hyper-tls 0.6.0", + "http", + "hyper", + "hyper-tls", "hyper-util", "thiserror 1.0.69", - "tokio 1.49.0", + "tokio 1.52.3", "tower-service", ] [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "hyper 0.14.32", + "hyper", + "hyper-util", "pin-project-lite 0.2.16", - "tokio 1.49.0", - "tokio-io-timeout", -] - -[[package]] -name = "hyper-tls" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" -dependencies = [ - "bytes 0.5.6", - "hyper 0.13.10", - "native-tls", - "tokio 0.2.25", - "tokio-tls", + "tokio 1.52.3", + "tower-service", ] [[package]] @@ -5189,10 +5115,10 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes 1.11.1", "http-body-util", - "hyper 1.8.1", + "hyper", "hyper-util", "native-tls", - "tokio 1.49.0", + "tokio 1.52.3", "tokio-native-tls", "tower-service", ] @@ -5203,18 +5129,23 @@ version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" dependencies = [ + "base64 0.22.1", "bytes 1.11.1", "futures-channel", "futures-util", - "http 1.4.0", - "http-body 1.0.1", - "hyper 1.8.1", + "http", + "http-body", + "hyper", + "ipnet", "libc", + "percent-encoding", "pin-project-lite 0.2.16", - "socket2 0.6.2", - "tokio 1.49.0", + "socket2 0.5.10", + "system-configuration", + "tokio 1.52.3", "tower-service", "tracing", + "windows-registry", ] [[package]] @@ -5245,7 +5176,7 @@ dependencies = [ "intl-memoizer", "lazy_static", "log", - "parking_lot 0.12.5", + "parking_lot", "rust-embed", "thiserror 1.0.69", "unic-langid", @@ -5582,7 +5513,7 @@ dependencies = [ "futures-core", "libc", "recvmsg", - "tokio 1.49.0", + "tokio 1.52.3", "widestring", "windows-sys 0.52.0", ] @@ -5615,6 +5546,12 @@ dependencies = [ "rustversion", ] +[[package]] +name = "io_tee" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b3f7cef34251886990511df1c61443aa928499d598a9473929ab5a90a527304" + [[package]] name = "iovec" version = "0.1.4" @@ -5665,12 +5602,6 @@ dependencies = [ "either", ] -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - [[package]] name = "itoa" version = "1.0.17" @@ -5710,19 +5641,68 @@ dependencies = [ "cesu8", "cfg-if 1.0.4", "combine", - "jni-sys", + "jni-sys 0.3.0", "log", "thiserror 1.0.69", "walkdir", "windows-sys 0.45.0", ] +[[package]] +name = "jni" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498" +dependencies = [ + "cfg-if 1.0.4", + "combine", + "jni-macros", + "jni-sys 0.4.1", + "log", + "simd_cesu8", + "thiserror 2.0.18", + "walkdir", + "windows-link 0.2.1", +] + +[[package]] +name = "jni-macros" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3" +dependencies = [ + "proc-macro2 1.0.106", + "quote 1.0.44", + "rustc_version", + "simd_cesu8", + "syn 2.0.114", +] + [[package]] name = "jni-sys" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" +[[package]] +name = "jni-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2" +dependencies = [ + "jni-sys-macros", +] + +[[package]] +name = "jni-sys-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" +dependencies = [ + "quote 1.0.44", + "syn 2.0.114", +] + [[package]] name = "jobserver" version = "0.1.34" @@ -5756,6 +5736,16 @@ dependencies = [ "serde_json", ] +[[package]] +name = "k12" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4dc5fdb62af2f520116927304f15d25b3c2667b4817b90efdc045194c912c54" +dependencies = [ + "digest 0.10.7", + "sha3 0.10.9", +] + [[package]] name = "keccak" version = "0.1.5" @@ -5871,9 +5861,9 @@ checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8" [[package]] name = "libc" -version = "0.2.181" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "459427e2af2b9c839b132acb702a1c654d95e10f8c326bfc2ad11310e458b1c5" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "libfuzzer-sys" @@ -6019,15 +6009,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] - [[package]] name = "lock_api" version = "0.4.14" @@ -6070,7 +6051,7 @@ dependencies = [ "log", "log-mdc", "mock_instant", - "parking_lot 0.12.5", + "parking_lot", "rand 0.9.2", "serde", "serde-value", @@ -6110,6 +6091,12 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "lru-slab" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" + [[package]] name = "malloc_buf" version = "0.0.6" @@ -6220,16 +6207,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "mime_guess" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" -dependencies = [ - "mime", - "unicase", -] - [[package]] name = "mime_guess2" version = "2.3.1" @@ -6299,9 +6276,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.1.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" +checksum = "30d65c71f1ce40ab09135ce117d742b9f8a19ff91a41a8b57ed50bc2de59c427" dependencies = [ "libc", "log", @@ -6413,10 +6390,10 @@ dependencies = [ "libc", "log", "openssl", - "openssl-probe", + "openssl-probe 0.1.6", "openssl-sys", "schannel", - "security-framework", + "security-framework 2.11.1", "security-framework-sys", "tempfile", ] @@ -6428,7 +6405,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ "bitflags 2.13.0", - "jni-sys", + "jni-sys 0.3.0", "log", "ndk-sys", "num_enum", @@ -6448,7 +6425,7 @@ version = "0.6.0+11769913" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" dependencies = [ - "jni-sys", + "jni-sys 0.3.0", ] [[package]] @@ -6470,7 +6447,7 @@ dependencies = [ "libc", "log", "neli-proc-macros", - "parking_lot 0.12.5", + "parking_lot", ] [[package]] @@ -6512,7 +6489,7 @@ dependencies = [ "base64 0.22.1", "chacha20 0.9.1", "constant_time_eq 0.4.2", - "hkdf 0.12.4", + "hkdf", "hmac 0.12.1", "rand_core 0.9.5", "secp256k1 0.31.1", @@ -6544,7 +6521,7 @@ dependencies = [ "nokhwa-bindings-macos", "nokhwa-bindings-windows", "nokhwa-core", - "parking_lot 0.12.5", + "parking_lot", "paste", "thiserror 2.0.18", ] @@ -6670,7 +6647,7 @@ checksum = "7462c9d8ae5ef6a28d66a192d399ad2530f1f2130b13186296dbb11bdef5b3d1" dependencies = [ "lru", "nostr", - "tokio 1.49.0", + "tokio 1.52.3", ] [[package]] @@ -6696,7 +6673,7 @@ dependencies = [ "negentropy", "nostr", "nostr-database", - "tokio 1.49.0", + "tokio 1.52.3", "tracing", ] @@ -6711,7 +6688,7 @@ dependencies = [ "nostr-database", "nostr-gossip", "nostr-relay-pool", - "tokio 1.49.0", + "tokio 1.52.3", "tracing", ] @@ -6726,7 +6703,7 @@ dependencies = [ "kqueue", "libc", "log", - "mio 1.1.1", + "mio 1.2.2", "notify-types", "walkdir", "windows-sys 0.60.2", @@ -7259,7 +7236,16 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17b52d0e4a06a4c7eb8d2943c0015fa628cf4ccc409429cebc0f5bed6d33a82" dependencies = [ - "futures 0.3.31", + "futures 0.3.32", +] + +[[package]] +name = "oneshot-fused-workaround" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60d6f8f565703c8a15f98b7782e39526490f8c291910d80c9be54a753a822f6f" +dependencies = [ + "futures 0.3.32", ] [[package]] @@ -7306,6 +7292,12 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" +[[package]] +name = "openssl-probe" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" + [[package]] name = "openssl-src" version = "300.6.1+3.6.3" @@ -7453,38 +7445,14 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" -[[package]] -name = "parking_lot" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.7.3", -] - [[package]] name = "parking_lot" version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" dependencies = [ - "lock_api 0.4.14", - "parking_lot_core 0.9.12", -] - -[[package]] -name = "parking_lot_core" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93f386bb233083c799e6e642a9d73db98c24a5deeb95ffc85bf281255dffc98" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.57", - "smallvec", - "winapi 0.3.9", + "lock_api", + "parking_lot_core", ] [[package]] @@ -7847,8 +7815,8 @@ checksum = "af3fb618632874fb76937c2361a7f22afd393c982a2165595407edc75b06d3c1" dependencies = [ "atomic 0.5.3", "crossbeam-queue", - "futures 0.3.31", - "parking_lot 0.12.5", + "futures 0.3.32", + "parking_lot", "pin-project", "static_assertions", "thiserror 1.0.69", @@ -8087,6 +8055,63 @@ dependencies = [ "serde", ] +[[package]] +name = "quinn" +version = "0.11.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c1a41e437b6bbd489372cd4971de128e85c855f56c57f283d20ff016cf7c0a8" +dependencies = [ + "bytes 1.11.1", + "cfg_aliases", + "pin-project-lite 0.2.16", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.1.1", + "rustls", + "socket2 0.5.10", + "thiserror 2.0.18", + "tokio 1.52.3", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-proto" +version = "0.11.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f4bfc015262b9df63c8845072ce59068853ff5872180c2ce2f13038b970e560" +dependencies = [ + "aws-lc-rs", + "bytes 1.11.1", + "getrandom 0.4.1", + "lru-slab", + "rand 0.10.1", + "rand_pcg 0.10.2", + "ring 0.17.14", + "rustc-hash 2.1.1", + "rustls", + "rustls-pki-types", + "slab", + "thiserror 2.0.18", + "tinyvec", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-udp" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35a133f956daabe89a61a685c2649f13d82d5aa4bd5d12d1277e1072a21c0694" +dependencies = [ + "cfg_aliases", + "libc", + "once_cell", + "socket2 0.5.10", + "tracing", + "windows-sys 0.61.2", +] + [[package]] name = "quote" version = "0.6.13" @@ -8144,7 +8169,7 @@ dependencies = [ "rand_isaac", "rand_jitter 0.1.4", "rand_os", - "rand_pcg", + "rand_pcg 0.1.2", "rand_xorshift", "winapi 0.3.9", ] @@ -8365,6 +8390,15 @@ dependencies = [ "rand_core 0.4.2", ] +[[package]] +name = "rand_pcg" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a" +dependencies = [ + "rand_core 0.10.1", +] + [[package]] name = "rand_xorshift" version = "0.1.1" @@ -8389,6 +8423,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d6831663a5098ea164f89cff59c6284e95f4e3c76ce9848d4529f5ccca9bde" +[[package]] +name = "rangemap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "973443cf09a9c8656b574a866ab68dfa19f0867d0340648c7d2f6a71b8a8ea68" + [[package]] name = "rav1e" version = "0.8.1" @@ -8489,12 +8529,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175" -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - [[package]] name = "redox_syscall" version = "0.4.1" @@ -8601,42 +8635,40 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "reqwest" -version = "0.10.10" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" +checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3" dependencies = [ - "base64 0.13.1", - "bytes 0.5.6", + "base64 0.22.1", + "bytes 1.11.1", "encoding_rs", "futures-core", - "futures-util", - "http 0.2.12", - "http-body 0.3.1", - "hyper 0.13.10", - "hyper-rustls 0.21.0", - "hyper-tls 0.4.3", - "ipnet", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", "js-sys", - "lazy_static", "log", "mime", - "mime_guess", - "native-tls", "percent-encoding", "pin-project-lite 0.2.16", - "rustls 0.18.1", - "serde", - "serde_urlencoded", - "tokio 0.2.25", - "tokio-rustls 0.14.1", - "tokio-socks 0.3.0", - "tokio-tls", + "quinn", + "rustls", + "rustls-pki-types", + "rustls-platform-verifier", + "sync_wrapper", + "tokio 1.52.3", + "tokio-rustls", + "tower", + "tower-http", + "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.20.0", - "winreg", ] [[package]] @@ -8672,6 +8704,16 @@ dependencies = [ "web-time", ] +[[package]] +name = "retry-error" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c0e06f9b501df8600ad8bd073f4990f703f36e0f48e574b431f4a15d69b449" +dependencies = [ + "humantime", + "web-time", +] + [[package]] name = "rfc6979" version = "0.4.0" @@ -8775,7 +8817,7 @@ dependencies = [ "serde_derive", "thiserror 2.0.18", "url", - "uuid 1.20.0", + "uuid", ] [[package]] @@ -8810,7 +8852,7 @@ dependencies = [ "pkcs8", "rand_core 0.6.4", "sha2 0.10.9", - "signature 2.2.0", + "signature", "spki", "subtle", "zeroize", @@ -8994,34 +9036,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.18.1" +version = "0.23.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" -dependencies = [ - "base64 0.12.3", - "log", - "ring 0.16.20", - "sct 0.6.1", - "webpki 0.21.4", -] - -[[package]] -name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring 0.16.20", - "sct 0.7.1", - "webpki 0.22.4", -] - -[[package]] -name = "rustls" -version = "0.23.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" +checksum = "3c54fcab019b409d04215d3a17cb438fd7fbf192ee61461f20f4fe18704bc138" dependencies = [ "aws-lc-rs", "log", @@ -9035,14 +9052,14 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.6.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d" dependencies = [ - "openssl-probe", - "rustls-pemfile", + "openssl-probe 0.2.1", + "rustls-pki-types", "schannel", - "security-framework", + "security-framework 3.5.1", ] [[package]] @@ -9060,9 +9077,37 @@ version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" dependencies = [ + "web-time", "zeroize", ] +[[package]] +name = "rustls-platform-verifier" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0" +dependencies = [ + "core-foundation 0.10.1", + "core-foundation-sys 0.8.7", + "jni 0.22.4", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki", + "security-framework 3.5.1", + "security-framework-sys", + "webpki-root-certs", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + [[package]] name = "rustls-webpki" version = "0.103.13" @@ -9118,21 +9163,25 @@ dependencies = [ "thiserror 2.0.18", ] +[[package]] +name = "safelog" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c0812d386a9992c036500b92565c41f84c28fd2e48fe853a395c393261b730b" +dependencies = [ + "derive_more", + "educe", + "either", + "fluid-let", + "thiserror 2.0.18", +] + [[package]] name = "safemem" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" -[[package]] -name = "salsa20" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0fbb5f676da676c260ba276a8f43a8dc67cf02d1438423aeb1c677a7212686" -dependencies = [ - "cipher 0.3.0", -] - [[package]] name = "salsa20" version = "0.10.2" @@ -9166,6 +9215,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b63583a1dd0647d1484228529ab4ecaa874048d2956f117362aa5f5826456230" +[[package]] +name = "saturating-time" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "802bdbfcca9a239cb46eeaaedea507e37bb13ba1a673762d2e2ef7a9dac63144" + [[package]] name = "schannel" version = "0.1.28" @@ -9213,13 +9268,13 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scrypt" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e73d6d7c6311ebdbd9184ad6c4447b2f36337e327bda107d3ba9e3c374f9d325" +checksum = "ba0aaf3911fff0d942c10a49779de7754699810fc7dbe3df515613b2ecc8195a" dependencies = [ "hmac 0.12.1", "pbkdf2 0.10.1", - "salsa20 0.9.0", + "salsa20", "sha2 0.10.9", ] @@ -9231,30 +9286,10 @@ checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" dependencies = [ "password-hash 0.5.0", "pbkdf2 0.12.2", - "salsa20 0.10.2", + "salsa20", "sha2 0.10.9", ] -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring 0.17.14", - "untrusted 0.9.0", -] - [[package]] name = "sctk-adwaita" version = "0.10.1" @@ -9322,15 +9357,6 @@ dependencies = [ "cc", ] -[[package]] -name = "secrecy" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9182278ed645df3477a9c27bfee0621c621aa16f6972635f7f795dae3d81070f" -dependencies = [ - "zeroize", -] - [[package]] name = "secrecy" version = "0.8.0" @@ -9353,6 +9379,19 @@ dependencies = [ "security-framework-sys", ] +[[package]] +name = "security-framework" +version = "3.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" +dependencies = [ + "bitflags 2.13.0", + "core-foundation 0.10.1", + "core-foundation-sys 0.8.7", + "libc", + "security-framework-sys", +] + [[package]] name = "security-framework-sys" version = "2.15.0" @@ -9404,6 +9443,16 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_bytes" +version = "0.11.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8" +dependencies = [ + "serde", + "serde_core", +] + [[package]] name = "serde_core" version = "1.0.228" @@ -9440,7 +9489,7 @@ version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ - "itoa 1.0.17", + "itoa", "memchr", "serde", "serde_core", @@ -9476,18 +9525,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa 1.0.17", - "ryu", - "serde", -] - [[package]] name = "serde_with" version = "3.21.0" @@ -9527,7 +9564,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ "indexmap 2.13.0", - "itoa 1.0.17", + "itoa", "ryu", "serde", "unsafe-libyaml", @@ -9637,12 +9674,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" - [[package]] name = "signature" version = "2.2.0" @@ -9659,6 +9690,16 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" +[[package]] +name = "simd_cesu8" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11031e251abf8611c80f460e19dbdeb54a66db918e49c65a7065b46ac7aec520" +dependencies = [ + "rustc_version", + "simdutf8", +] + [[package]] name = "simd_helpers" version = "0.1.0" @@ -9668,6 +9709,12 @@ dependencies = [ "quote 1.0.44", ] +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + [[package]] name = "simplecss" version = "0.2.2" @@ -9718,6 +9765,19 @@ dependencies = [ "void", ] +[[package]] +name = "slotmap-careful" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7cd5208f878dce99cfbefa73c692c67edf946ac53e0cc4455e2dabe43d54af7" +dependencies = [ + "paste", + "serde", + "slotmap", + "thiserror 2.0.18", + "void", +] + [[package]] name = "smallvec" version = "1.15.1" @@ -9796,17 +9856,6 @@ dependencies = [ "serde", ] -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.4", - "libc", - "winapi 0.3.9", -] - [[package]] name = "socket2" version = "0.5.10" @@ -9819,12 +9868,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.6.2" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0" +checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -9839,7 +9888,7 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ - "lock_api 0.4.14", + "lock_api", ] [[package]] @@ -9908,7 +9957,7 @@ dependencies = [ "rsa", "sec1", "sha2 0.10.9", - "signature 2.2.0", + "signature", "ssh-cipher-fork-arti", "ssh-encoding-fork-arti", "subtle", @@ -10041,6 +10090,9 @@ name = "sync_wrapper" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] [[package]] name = "synchronoise" @@ -10100,6 +10152,27 @@ dependencies = [ "windows 0.62.2", ] +[[package]] +name = "system-configuration" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b" +dependencies = [ + "bitflags 2.13.0", + "core-foundation 0.9.4", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys 0.8.7", + "libc", +] + [[package]] name = "tap" version = "1.0.1" @@ -10340,31 +10413,21 @@ dependencies = [ [[package]] name = "tokio" -version = "1.49.0" +version = "1.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" +checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" dependencies = [ "bytes 1.11.1", "libc", - "mio 1.1.1", - "parking_lot 0.12.5", + "mio 1.2.2", + "parking_lot", "pin-project-lite 0.2.16", "signal-hook-registry", - "socket2 0.6.2", - "tokio-macros 2.6.0", + "socket2 0.6.5", + "tokio-macros 2.7.0", "windows-sys 0.61.2", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd86198d9ee903fedd2f9a2e72014287c0d9167e4ae43b5853007205dda1b76" -dependencies = [ - "pin-project-lite 0.2.16", - "tokio 1.49.0", -] - [[package]] name = "tokio-macros" version = "0.2.6" @@ -10378,9 +10441,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" +checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" dependencies = [ "proc-macro2 1.0.106", "quote 1.0.44", @@ -10394,30 +10457,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", - "tokio 1.49.0", -] - -[[package]] -name = "tokio-rustls" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" -dependencies = [ - "futures-core", - "rustls 0.18.1", - "tokio 0.2.25", - "webpki 0.21.4", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio 1.49.0", - "webpki 0.22.4", + "tokio 1.52.3", ] [[package]] @@ -10426,21 +10466,8 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ - "rustls 0.23.40", - "tokio 1.49.0", -] - -[[package]] -name = "tokio-socks" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d611fd5d241872372d52a0a3d309c52d0b95a6a67671a6c8f7ab2c4a37fb2539" -dependencies = [ - "bytes 0.4.12", - "either", - "futures 0.3.31", - "thiserror 1.0.69", - "tokio 0.2.25", + "rustls", + "tokio 1.52.3", ] [[package]] @@ -10452,17 +10479,7 @@ dependencies = [ "either", "futures-util", "thiserror 1.0.69", - "tokio 1.49.0", -] - -[[package]] -name = "tokio-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" -dependencies = [ - "native-tls", - "tokio 0.2.25", + "tokio 1.52.3", ] [[package]] @@ -10473,10 +10490,10 @@ checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084" dependencies = [ "futures-util", "log", - "rustls 0.23.40", + "rustls", "rustls-pki-types", - "tokio 1.49.0", - "tokio-rustls 0.26.4", + "tokio 1.52.3", + "tokio-rustls", "tungstenite", "webpki-roots 0.26.11", ] @@ -10495,20 +10512,6 @@ dependencies = [ "tokio 0.2.25", ] -[[package]] -name = "tokio-util" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" -dependencies = [ - "bytes 0.5.6", - "futures-core", - "futures-sink", - "log", - "pin-project-lite 0.1.12", - "tokio 0.2.25", -] - [[package]] name = "tokio-util" version = "0.7.18" @@ -10520,7 +10523,7 @@ dependencies = [ "futures-io", "futures-sink", "pin-project-lite 0.2.16", - "tokio 1.49.0", + "tokio 1.52.3", ] [[package]] @@ -10656,14 +10659,38 @@ checksum = "27fc83e7539ac5f717b722456df991ca8819782d04f7ae2ee28eefacca030eef" dependencies = [ "derive-deftly", "educe", - "futures 0.3.31", - "oneshot-fused-workaround", + "futures 0.3.32", + "oneshot-fused-workaround 0.6.0", "pin-project", "postage", "thiserror 2.0.18", "void", ] +[[package]] +name = "tor-async-utils" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58580b41636378f79500bca6a178787e0e434207e0880dd90698ae3f686f24d6" +dependencies = [ + "cfg-if 1.0.4", + "derive-deftly", + "educe", + "futures 0.3.32", + "oneshot-fused-workaround 0.7.0", + "pin-project", + "postage", + "sync_wrapper", + "thiserror 2.0.18", + "tokio 1.52.3", + "tokio-util 0.7.18", + "tor-basic-utils 0.44.0", + "tor-rtcompat 0.44.0", + "tracing", + "void", + "web-time-compat 0.2.0", +] + [[package]] name = "tor-basic-utils" version = "0.43.0" @@ -10683,7 +10710,31 @@ dependencies = [ "smallvec", "thiserror 2.0.18", "weak-table", - "web-time-compat", + "web-time-compat 0.1.0", +] + +[[package]] +name = "tor-basic-utils" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd3046aa299df67da91b45c02c24d48d40ae1845f9b91e27f9c8adbde78315ba" +dependencies = [ + "derive-deftly", + "derive_more", + "getrandom 0.4.1", + "hex", + "itertools 0.14.0", + "libc", + "paste", + "rand 0.10.1", + "rand_chacha 0.10.0", + "serde", + "slab", + "smallvec", + "thiserror 2.0.18", + "tracing", + "weak-table", + "web-time-compat 0.2.0", ] [[package]] @@ -10697,10 +10748,28 @@ dependencies = [ "digest 0.10.7", "educe", "getrandom 0.4.1", - "safelog", + "safelog 0.8.2", "thiserror 2.0.18", - "tor-error", - "tor-llcrypto", + "tor-error 0.43.0", + "tor-llcrypto 0.43.0", + "zeroize", +] + +[[package]] +name = "tor-bytes" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4833cc8ab3fca79eabc06f3ca97db102a3b7db861d77848d39932a6f0ed598" +dependencies = [ + "bytes 1.11.1", + "derive-deftly", + "digest 0.10.7", + "educe", + "getrandom 0.4.1", + "safelog 0.9.0", + "thiserror 2.0.18", + "tor-error 0.44.0", + "tor-llcrypto 0.44.0", "zeroize", ] @@ -10713,7 +10782,7 @@ dependencies = [ "amplify", "bitflags 2.13.0", "bytes 1.11.1", - "caret", + "caret 0.9.0", "derive-deftly", "derive_more", "educe", @@ -10722,16 +10791,47 @@ dependencies = [ "rand 0.10.1", "smallvec", "thiserror 2.0.18", - "tor-basic-utils", - "tor-bytes", - "tor-cert", - "tor-error", - "tor-hscrypto", - "tor-linkspec", - "tor-llcrypto", - "tor-memquota", - "tor-protover", - "tor-units", + "tor-basic-utils 0.43.0", + "tor-bytes 0.43.0", + "tor-cert 0.43.0", + "tor-error 0.43.0", + "tor-hscrypto 0.43.0", + "tor-linkspec 0.43.0", + "tor-llcrypto 0.43.0", + "tor-memquota 0.43.0", + "tor-protover 0.43.0", + "tor-units 0.43.0", + "void", +] + +[[package]] +name = "tor-cell" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73a01cb2ac6697c12b647729d3d7db404e306d1e08a7a3aacdbee08e35170ebd" +dependencies = [ + "amplify", + "bitflags 2.13.0", + "bytes 1.11.1", + "caret 0.10.0", + "derive-deftly", + "derive_more", + "educe", + "itertools 0.14.0", + "paste", + "rand 0.10.1", + "smallvec", + "thiserror 2.0.18", + "tor-basic-utils 0.44.0", + "tor-bytes 0.44.0", + "tor-cert 0.44.0", + "tor-error 0.44.0", + "tor-hscrypto 0.44.0", + "tor-linkspec 0.44.0", + "tor-llcrypto 0.44.0", + "tor-memquota 0.44.0", + "tor-protover 0.44.0", + "tor-units 0.44.0", "void", ] @@ -10741,16 +10841,35 @@ version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "474e732207b1be44f9ae4ddf295fba3644cd3c09494d131846ff9c9a624ab263" dependencies = [ - "caret", + "caret 0.9.0", "derive_builder_fork_arti", "derive_more", "digest 0.10.7", "thiserror 2.0.18", - "tor-bytes", - "tor-checkable", - "tor-error", - "tor-llcrypto", - "web-time-compat", + "tor-bytes 0.43.0", + "tor-checkable 0.43.0", + "tor-error 0.43.0", + "tor-llcrypto 0.43.0", + "web-time-compat 0.1.0", +] + +[[package]] +name = "tor-cert" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162d44b975e445de099b3a495710689652bbd0a9a3a0e4946341acbb3138b22b" +dependencies = [ + "caret 0.10.0", + "derive_builder_fork_arti", + "derive_more", + "digest 0.10.7", + "saturating-time 0.4.0", + "thiserror 2.0.18", + "tor-bytes 0.44.0", + "tor-checkable 0.44.0", + "tor-error 0.44.0", + "tor-llcrypto 0.44.0", + "web-time-compat 0.2.0", ] [[package]] @@ -10761,39 +10880,82 @@ checksum = "b2bb088804f54de320ee97dd2a48ae319f0df9d9d0e37eef050d65488194a768" dependencies = [ "async-trait", "base64ct", - "caret", + "caret 0.9.0", "cfg-if 1.0.4", "derive-deftly", "derive_more", "educe", - "futures 0.3.31", + "futures 0.3.32", "httparse", - "oneshot-fused-workaround", + "oneshot-fused-workaround 0.6.0", "percent-encoding", "postage", "rand 0.10.1", - "safelog", + "safelog 0.8.2", "serde", "serde_with", "thiserror 2.0.18", - "tor-async-utils", - "tor-basic-utils", - "tor-cell", - "tor-config", - "tor-error", - "tor-keymgr", - "tor-linkspec", - "tor-llcrypto", - "tor-memquota", - "tor-netdir", - "tor-proto", - "tor-rtcompat", - "tor-socksproto", - "tor-units", + "tor-async-utils 0.43.0", + "tor-basic-utils 0.43.0", + "tor-cell 0.43.0", + "tor-config 0.43.0", + "tor-error 0.43.0", + "tor-keymgr 0.43.0", + "tor-linkspec 0.43.0", + "tor-llcrypto 0.43.0", + "tor-memquota 0.43.0", + "tor-netdir 0.43.0", + "tor-proto 0.43.0", + "tor-rtcompat 0.43.0", + "tor-socksproto 0.43.0", + "tor-units 0.43.0", "tracing", "url", "void", - "web-time-compat", + "web-time-compat 0.1.0", +] + +[[package]] +name = "tor-chanmgr" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf15c4cbafa5745def4fced9e8e59148533a2bfc8d938e9fad7a0d6d16757712" +dependencies = [ + "async-trait", + "base64ct", + "caret 0.10.0", + "cfg-if 1.0.4", + "derive-deftly", + "derive_more", + "educe", + "futures 0.3.32", + "httparse", + "oneshot-fused-workaround 0.7.0", + "percent-encoding", + "postage", + "rand 0.10.1", + "safelog 0.9.0", + "serde", + "serde_with", + "thiserror 2.0.18", + "tor-async-utils 0.44.0", + "tor-basic-utils 0.44.0", + "tor-cell 0.44.0", + "tor-config 0.44.0", + "tor-error 0.44.0", + "tor-keymgr 0.44.0", + "tor-linkspec 0.44.0", + "tor-llcrypto 0.44.0", + "tor-memquota 0.44.0", + "tor-netdir 0.44.0", + "tor-proto 0.44.0", + "tor-rtcompat 0.44.0", + "tor-socksproto 0.44.0", + "tor-units 0.44.0", + "tracing", + "url", + "void", + "web-time-compat 0.2.0", ] [[package]] @@ -10803,10 +10965,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9505791bac25b31b8de88c0e2b02e1690e10ff1308583c6f61c320bab2677959" dependencies = [ "humantime", - "signature 2.2.0", + "signature", "thiserror 2.0.18", - "tor-llcrypto", - "web-time-compat", + "tor-llcrypto 0.43.0", + "web-time-compat 0.1.0", +] + +[[package]] +name = "tor-checkable" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef81835cb0b2db460c694678eae8c4cbad5f31847e473aac42605f9b945fb31a" +dependencies = [ + "humantime", + "signature", + "thiserror 2.0.18", + "tor-llcrypto 0.44.0", + "web-time-compat 0.2.0", ] [[package]] @@ -10824,39 +10999,89 @@ dependencies = [ "downcast-rs 2.0.2", "dyn-clone", "educe", - "futures 0.3.31", + "futures 0.3.32", "humantime-serde", "itertools 0.14.0", "once_cell", - "oneshot-fused-workaround", + "oneshot-fused-workaround 0.6.0", "pin-project", "rand 0.10.1", - "retry-error", - "safelog", + "retry-error 0.12.0", + "safelog 0.8.2", "serde", "thiserror 2.0.18", - "tor-async-utils", - "tor-basic-utils", - "tor-cell", - "tor-chanmgr", - "tor-config", - "tor-dircommon", - "tor-error", - "tor-guardmgr", - "tor-linkspec", - "tor-memquota", - "tor-netdir", - "tor-netdoc", - "tor-persist", - "tor-proto", - "tor-protover", - "tor-relay-selection", - "tor-rtcompat", - "tor-units", + "tor-async-utils 0.43.0", + "tor-basic-utils 0.43.0", + "tor-cell 0.43.0", + "tor-chanmgr 0.43.0", + "tor-config 0.43.0", + "tor-dircommon 0.43.0", + "tor-error 0.43.0", + "tor-guardmgr 0.43.0", + "tor-linkspec 0.43.0", + "tor-memquota 0.43.0", + "tor-netdir 0.43.0", + "tor-netdoc 0.43.0", + "tor-persist 0.43.0", + "tor-proto 0.43.0", + "tor-protover 0.43.0", + "tor-relay-selection 0.43.0", + "tor-rtcompat 0.43.0", + "tor-units 0.43.0", "tracing", "void", "weak-table", - "web-time-compat", + "web-time-compat 0.1.0", +] + +[[package]] +name = "tor-circmgr" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b63cca1f18282f82b905b6a8c20c6f247787bc010d1b317d9eb98503e4352bf" +dependencies = [ + "amplify", + "async-trait", + "cfg-if 1.0.4", + "derive-deftly", + "derive_builder_fork_arti", + "derive_more", + "downcast-rs 2.0.2", + "dyn-clone", + "educe", + "futures 0.3.32", + "humantime-serde", + "itertools 0.14.0", + "once_cell", + "oneshot-fused-workaround 0.7.0", + "pin-project", + "rand 0.10.1", + "retry-error 0.13.0", + "safelog 0.9.0", + "serde", + "thiserror 2.0.18", + "tor-async-utils 0.44.0", + "tor-basic-utils 0.44.0", + "tor-cell 0.44.0", + "tor-chanmgr 0.44.0", + "tor-config 0.44.0", + "tor-dircommon 0.44.0", + "tor-error 0.44.0", + "tor-guardmgr 0.44.0", + "tor-linkspec 0.44.0", + "tor-memquota 0.44.0", + "tor-netdir 0.44.0", + "tor-netdoc 0.44.0", + "tor-persist 0.44.0", + "tor-proto 0.44.0", + "tor-protover 0.44.0", + "tor-relay-selection 0.44.0", + "tor-rtcompat 0.44.0", + "tor-units 0.44.0", + "tracing", + "void", + "weak-table", + "web-time-compat 0.2.0", ] [[package]] @@ -10872,8 +11097,8 @@ dependencies = [ "educe", "either", "figment", - "fs-mistrust", - "futures 0.3.31", + "fs-mistrust 0.14.2", + "futures 0.3.32", "humantime-serde", "itertools 0.14.0", "notify", @@ -10886,9 +11111,43 @@ dependencies = [ "strum 0.28.0", "thiserror 2.0.18", "toml 1.0.6+spec-1.1.0", - "tor-basic-utils", - "tor-error", - "tor-rtcompat", + "tor-basic-utils 0.43.0", + "tor-error 0.43.0", + "tor-rtcompat 0.43.0", + "tracing", + "void", +] + +[[package]] +name = "tor-config" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a699adfb8bdb34699afcca7cbbd9d26329246940bc9dbc32f380c87578017350" +dependencies = [ + "amplify", + "cfg-if 1.0.4", + "derive-deftly", + "derive_builder_fork_arti", + "educe", + "either", + "figment", + "fs-mistrust 0.15.0", + "futures 0.3.32", + "humantime-serde", + "itertools 0.14.0", + "notify", + "paste", + "postage", + "regex", + "serde", + "serde-value", + "serde_ignored", + "strum 0.28.0", + "thiserror 2.0.18", + "toml 1.0.6+spec-1.1.0", + "tor-basic-utils 0.44.0", + "tor-error 0.44.0", + "tor-rtcompat 0.44.0", "tracing", "void", ] @@ -10903,8 +11162,22 @@ dependencies = [ "serde", "shellexpand", "thiserror 2.0.18", - "tor-error", - "tor-general-addr", + "tor-error 0.43.0", + "tor-general-addr 0.43.0", +] + +[[package]] +name = "tor-config-path" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d38001695121fc778e67ac7a1c733d3158ee8942a55cfa343981b50d90f5daa" +dependencies = [ + "directories", + "serde", + "shellexpand", + "thiserror 2.0.18", + "tor-error 0.44.0", + "tor-general-addr 0.44.0", ] [[package]] @@ -10919,9 +11192,26 @@ dependencies = [ "imara-diff", "static_assertions", "thiserror 2.0.18", - "tor-error", - "tor-llcrypto", - "tor-netdoc", + "tor-error 0.43.0", + "tor-llcrypto 0.43.0", + "tor-netdoc 0.43.0", +] + +[[package]] +name = "tor-consdiff" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e9e3eb11e91ea4c1affe5e1f73628726c283942715739850546acb94bbe028" +dependencies = [ + "derive_more", + "digest 0.10.7", + "hex", + "imara-diff", + "static_assertions", + "thiserror 2.0.18", + "tor-error 0.44.0", + "tor-llcrypto 0.44.0", + "tor-netdoc 0.44.0", ] [[package]] @@ -10933,24 +11223,53 @@ dependencies = [ "async-compression", "base64ct", "derive_more", - "futures 0.3.31", + "futures 0.3.32", "hex", - "http 1.4.0", + "http", "httparse", - "httpdate 1.0.3", + "httpdate", "itertools 0.14.0", "memchr", "thiserror 2.0.18", - "tor-circmgr", - "tor-error", - "tor-hscrypto", - "tor-linkspec", - "tor-llcrypto", - "tor-netdoc", - "tor-proto", - "tor-rtcompat", + "tor-circmgr 0.43.0", + "tor-error 0.43.0", + "tor-hscrypto 0.43.0", + "tor-linkspec 0.43.0", + "tor-llcrypto 0.43.0", + "tor-netdoc 0.43.0", + "tor-proto 0.43.0", + "tor-rtcompat 0.43.0", "tracing", - "web-time-compat", + "web-time-compat 0.1.0", +] + +[[package]] +name = "tor-dirclient" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0027cd2a58abab9ebaf61c3c1da9b0fa9e6cbc914b88fedb7b3102bd4f4dd656" +dependencies = [ + "async-compression", + "base64ct", + "derive_more", + "futures 0.3.32", + "hex", + "http", + "httparse", + "httpdate", + "itertools 0.14.0", + "memchr", + "thiserror 2.0.18", + "tor-circmgr 0.44.0", + "tor-error 0.44.0", + "tor-hscrypto 0.44.0", + "tor-linkspec 0.44.0", + "tor-llcrypto 0.44.0", + "tor-netdoc 0.44.0", + "tor-proto 0.44.0", + "tor-rtcompat 0.44.0", + "tracing", + "web-time-compat 0.2.0", ] [[package]] @@ -10965,12 +11284,33 @@ dependencies = [ "humantime", "humantime-serde", "serde", - "tor-basic-utils", - "tor-checkable", - "tor-config", - "tor-linkspec", - "tor-llcrypto", - "tor-netdoc", + "tor-basic-utils 0.43.0", + "tor-checkable 0.43.0", + "tor-config 0.43.0", + "tor-linkspec 0.43.0", + "tor-llcrypto 0.43.0", + "tor-netdoc 0.43.0", + "tracing", +] + +[[package]] +name = "tor-dircommon" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d2047b2f1ad3453c1060e5e39203bd87ead266e6873707bd7333b1d6bdac768" +dependencies = [ + "base64ct", + "derive-deftly", + "getset", + "humantime", + "humantime-serde", + "serde", + "tor-basic-utils 0.44.0", + "tor-checkable 0.44.0", + "tor-config 0.44.0", + "tor-linkspec 0.44.0", + "tor-llcrypto 0.44.0", + "tor-netdoc 0.44.0", "tracing", ] @@ -10987,48 +11327,105 @@ dependencies = [ "digest 0.10.7", "educe", "event-listener 5.4.1", - "fs-mistrust", - "fslock-guard", - "futures 0.3.31", + "fs-mistrust 0.14.2", + "fslock-guard 0.7.0", + "futures 0.3.32", "hex", "humantime", "humantime-serde", "itertools 0.14.0", "memmap2", - "oneshot-fused-workaround", + "oneshot-fused-workaround 0.6.0", "paste", "postage", "rand 0.10.1", "rusqlite", - "safelog", + "safelog 0.8.2", "scopeguard", "serde", "serde_json", - "signature 2.2.0", + "signature", "static_assertions", "strum 0.28.0", "thiserror 2.0.18", "time", - "tor-async-utils", - "tor-basic-utils", - "tor-checkable", - "tor-circmgr", - "tor-config", - "tor-consdiff", - "tor-dirclient", - "tor-dircommon", - "tor-error", - "tor-guardmgr", - "tor-llcrypto", - "tor-netdir", - "tor-netdoc", - "tor-persist", - "tor-proto", - "tor-protover", - "tor-rtcompat", + "tor-async-utils 0.43.0", + "tor-basic-utils 0.43.0", + "tor-checkable 0.43.0", + "tor-circmgr 0.43.0", + "tor-config 0.43.0", + "tor-consdiff 0.43.0", + "tor-dirclient 0.43.0", + "tor-dircommon 0.43.0", + "tor-error 0.43.0", + "tor-guardmgr 0.43.0", + "tor-llcrypto 0.43.0", + "tor-netdir 0.43.0", + "tor-netdoc 0.43.0", + "tor-persist 0.43.0", + "tor-proto 0.43.0", + "tor-protover 0.43.0", + "tor-rtcompat 0.43.0", "tracing", "void", - "web-time-compat", + "web-time-compat 0.1.0", +] + +[[package]] +name = "tor-dirmgr" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57ebc162ccd628ef8e96912a9e42e848cd7305eb2a5a455a6002f54ad6826422" +dependencies = [ + "async-trait", + "base64ct", + "derive_builder_fork_arti", + "derive_more", + "digest 0.10.7", + "educe", + "event-listener 5.4.1", + "fs-mistrust 0.15.0", + "fslock-guard 0.8.0", + "futures 0.3.32", + "hex", + "humantime", + "humantime-serde", + "itertools 0.14.0", + "memmap2", + "oneshot-fused-workaround 0.7.0", + "paste", + "postage", + "rand 0.10.1", + "rusqlite", + "safelog 0.9.0", + "scopeguard", + "serde", + "serde_json", + "signature", + "static_assertions", + "strum 0.28.0", + "thiserror 2.0.18", + "time", + "tor-async-utils 0.44.0", + "tor-basic-utils 0.44.0", + "tor-checkable 0.44.0", + "tor-circmgr 0.44.0", + "tor-config 0.44.0", + "tor-consdiff 0.44.0", + "tor-dirclient 0.44.0", + "tor-dircommon 0.44.0", + "tor-error 0.44.0", + "tor-guardmgr 0.44.0", + "tor-llcrypto 0.44.0", + "tor-netdir 0.44.0", + "tor-netdoc 0.44.0", + "tor-persist 0.44.0", + "tor-proto 0.44.0", + "tor-protover 0.44.0", + "tor-rtcompat 0.44.0", + "tracing", + "void", + "web-time-compat 0.2.0", ] [[package]] @@ -11038,15 +11435,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1409b1a9085502c7797405a01fe3f3292a9827c9ed6a3f7c34fbb222572db5ac" dependencies = [ "derive_more", - "futures 0.3.31", + "futures 0.3.32", "paste", - "retry-error", + "retry-error 0.12.0", "static_assertions", "strum 0.28.0", "thiserror 2.0.18", "tracing", "void", - "web-time-compat", + "web-time-compat 0.1.0", +] + +[[package]] +name = "tor-error" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6a7ed4aee3e0613a75d420032116dac82d7702594e28566befdfa6707a8fd0e" +dependencies = [ + "derive_more", + "futures 0.3.32", + "paste", + "retry-error 0.13.0", + "static_assertions", + "strum 0.28.0", + "thiserror 2.0.18", + "tracing", + "void", + "web-time-compat 0.2.0", ] [[package]] @@ -11060,6 +11475,17 @@ dependencies = [ "void", ] +[[package]] +name = "tor-general-addr" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfee544a33dd3e67e0311cc46ef8f667cbf9c02c7c00ef4f25098a25b2b6e1cf" +dependencies = [ + "derive_more", + "thiserror 2.0.18", + "void", +] + [[package]] name = "tor-guardmgr" version = "0.43.0" @@ -11073,35 +11499,80 @@ dependencies = [ "derive_more", "dyn-clone", "educe", - "futures 0.3.31", + "futures 0.3.32", "humantime", "humantime-serde", "itertools 0.14.0", "num_enum", - "oneshot-fused-workaround", + "oneshot-fused-workaround 0.6.0", "pin-project", "postage", "rand 0.10.1", - "safelog", + "safelog 0.8.2", "serde", "strum 0.28.0", "thiserror 2.0.18", - "tor-async-utils", - "tor-basic-utils", - "tor-config", - "tor-dircommon", - "tor-error", - "tor-linkspec", - "tor-llcrypto", - "tor-netdir", - "tor-netdoc", - "tor-persist", - "tor-proto", - "tor-relay-selection", - "tor-rtcompat", - "tor-units", + "tor-async-utils 0.43.0", + "tor-basic-utils 0.43.0", + "tor-config 0.43.0", + "tor-dircommon 0.43.0", + "tor-error 0.43.0", + "tor-linkspec 0.43.0", + "tor-llcrypto 0.43.0", + "tor-netdir 0.43.0", + "tor-netdoc 0.43.0", + "tor-persist 0.43.0", + "tor-proto 0.43.0", + "tor-relay-selection 0.43.0", + "tor-rtcompat 0.43.0", + "tor-units 0.43.0", "tracing", - "web-time-compat", + "web-time-compat 0.1.0", +] + +[[package]] +name = "tor-guardmgr" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1e8f52e4b1b08ba58970a9b9879b0b72c35dcba48bad389935f2778ed432d05" +dependencies = [ + "amplify", + "base64ct", + "derive-deftly", + "derive_builder_fork_arti", + "derive_more", + "dyn-clone", + "educe", + "futures 0.3.32", + "humantime", + "humantime-serde", + "itertools 0.14.0", + "num_enum", + "oneshot-fused-workaround 0.7.0", + "pin-project", + "postage", + "rand 0.10.1", + "safelog 0.9.0", + "serde", + "strum 0.28.0", + "thiserror 2.0.18", + "tor-async-utils 0.44.0", + "tor-basic-utils 0.44.0", + "tor-config 0.44.0", + "tor-dircommon 0.44.0", + "tor-error 0.44.0", + "tor-linkspec 0.44.0", + "tor-llcrypto 0.44.0", + "tor-netdir 0.44.0", + "tor-netdoc 0.44.0", + "tor-persist 0.44.0", + "tor-proto 0.44.0", + "tor-protover 0.44.0", + "tor-relay-selection 0.44.0", + "tor-rtcompat 0.44.0", + "tor-units 0.44.0", + "tracing", + "web-time-compat 0.2.0", ] [[package]] @@ -11115,38 +11586,83 @@ dependencies = [ "derive_more", "educe", "either", - "futures 0.3.31", + "futures 0.3.32", "itertools 0.14.0", - "oneshot-fused-workaround", + "oneshot-fused-workaround 0.6.0", "postage", "rand 0.10.1", - "retry-error", - "safelog", - "slotmap-careful", + "retry-error 0.12.0", + "safelog 0.8.2", + "slotmap-careful 0.7.0", "strum 0.28.0", "thiserror 2.0.18", - "tor-async-utils", - "tor-basic-utils", - "tor-bytes", - "tor-cell", - "tor-checkable", - "tor-circmgr", - "tor-config", - "tor-dirclient", - "tor-error", - "tor-hscrypto", - "tor-keymgr", - "tor-linkspec", - "tor-llcrypto", - "tor-memquota", - "tor-netdir", - "tor-netdoc", - "tor-persist", - "tor-proto", - "tor-protover", - "tor-rtcompat", + "tor-async-utils 0.43.0", + "tor-basic-utils 0.43.0", + "tor-bytes 0.43.0", + "tor-cell 0.43.0", + "tor-checkable 0.43.0", + "tor-circmgr 0.43.0", + "tor-config 0.43.0", + "tor-dirclient 0.43.0", + "tor-error 0.43.0", + "tor-hscrypto 0.43.0", + "tor-keymgr 0.43.0", + "tor-linkspec 0.43.0", + "tor-llcrypto 0.43.0", + "tor-memquota 0.43.0", + "tor-netdir 0.43.0", + "tor-netdoc 0.43.0", + "tor-persist 0.43.0", + "tor-proto 0.43.0", + "tor-protover 0.43.0", + "tor-rtcompat 0.43.0", "tracing", - "web-time-compat", + "web-time-compat 0.1.0", +] + +[[package]] +name = "tor-hsclient" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dc813f71e63fd324c4b1b1647ddc2fcc4b6e77c45091e6769ae80e591726ec" +dependencies = [ + "async-trait", + "derive-deftly", + "derive_more", + "educe", + "either", + "futures 0.3.32", + "itertools 0.14.0", + "oneshot-fused-workaround 0.7.0", + "postage", + "rand 0.10.1", + "retry-error 0.13.0", + "safelog 0.9.0", + "slotmap-careful 0.8.0", + "strum 0.28.0", + "thiserror 2.0.18", + "tor-async-utils 0.44.0", + "tor-basic-utils 0.44.0", + "tor-bytes 0.44.0", + "tor-cell 0.44.0", + "tor-checkable 0.44.0", + "tor-circmgr 0.44.0", + "tor-config 0.44.0", + "tor-dirclient 0.44.0", + "tor-error 0.44.0", + "tor-hscrypto 0.44.0", + "tor-keymgr 0.44.0", + "tor-linkspec 0.44.0", + "tor-llcrypto 0.44.0", + "tor-memquota 0.44.0", + "tor-netdir 0.44.0", + "tor-netdoc 0.44.0", + "tor-persist 0.44.0", + "tor-proto 0.44.0", + "tor-protover 0.44.0", + "tor-rtcompat 0.44.0", + "tracing", + "web-time-compat 0.2.0", ] [[package]] @@ -11164,20 +11680,141 @@ dependencies = [ "itertools 0.14.0", "paste", "rand 0.10.1", - "safelog", + "safelog 0.8.2", "serde", - "signature 2.2.0", + "signature", "subtle", "thiserror 2.0.18", - "tor-basic-utils", - "tor-bytes", - "tor-error", - "tor-key-forge", - "tor-llcrypto", - "tor-memquota", - "tor-units", + "tor-basic-utils 0.43.0", + "tor-bytes 0.43.0", + "tor-error 0.43.0", + "tor-key-forge 0.43.0", + "tor-llcrypto 0.43.0", + "tor-memquota 0.43.0", + "tor-units 0.43.0", "void", - "web-time-compat", + "web-time-compat 0.1.0", +] + +[[package]] +name = "tor-hscrypto" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f82fd6a5a6ede5ece5e7f52708bdf0a007e8f975f9825689b376f038845f1e88" +dependencies = [ + "cipher 0.4.4", + "data-encoding", + "derive-deftly", + "derive_more", + "digest 0.10.7", + "hex", + "humantime", + "itertools 0.14.0", + "paste", + "rand 0.10.1", + "safelog 0.9.0", + "serde", + "signature", + "subtle", + "thiserror 2.0.18", + "tor-basic-utils 0.44.0", + "tor-bytes 0.44.0", + "tor-error 0.44.0", + "tor-key-forge 0.44.0", + "tor-llcrypto 0.44.0", + "tor-memquota 0.44.0", + "tor-units 0.44.0", + "void", + "web-time-compat 0.2.0", + "zeroize", +] + +[[package]] +name = "tor-hsrproxy" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b4231a55048af49ae2a8fcb2d41ea0df986b68c26bf6128f97f7f1324d47498" +dependencies = [ + "derive-deftly", + "futures 0.3.32", + "futures-copy", + "itertools 0.14.0", + "oneshot-fused-workaround 0.7.0", + "rangemap", + "safelog 0.9.0", + "serde", + "serde_with", + "strum 0.28.0", + "thiserror 2.0.18", + "tor-async-utils 0.44.0", + "tor-cell 0.44.0", + "tor-config 0.44.0", + "tor-error 0.44.0", + "tor-hsservice", + "tor-log-ratelim 0.44.0", + "tor-proto 0.44.0", + "tor-rtcompat 0.44.0", + "tracing", + "void", +] + +[[package]] +name = "tor-hsservice" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "170b66c977d3b16a5ff79ec344c06392076f0326d2d65146a58c450c50395dae" +dependencies = [ + "amplify", + "async-trait", + "base64ct", + "cfg-if 1.0.4", + "derive-deftly", + "derive_builder_fork_arti", + "derive_more", + "digest 0.10.7", + "educe", + "fs-mistrust 0.15.0", + "futures 0.3.32", + "growable-bloom-filter", + "hex", + "humantime", + "itertools 0.14.0", + "k12", + "once_cell", + "oneshot-fused-workaround 0.7.0", + "postage", + "rand 0.10.1", + "rand_core 0.10.1", + "retry-error 0.13.0", + "safelog 0.9.0", + "serde", + "serde_with", + "strum 0.28.0", + "thiserror 2.0.18", + "tor-async-utils 0.44.0", + "tor-basic-utils 0.44.0", + "tor-bytes 0.44.0", + "tor-cell 0.44.0", + "tor-circmgr 0.44.0", + "tor-config 0.44.0", + "tor-config-path 0.44.0", + "tor-dirclient 0.44.0", + "tor-error 0.44.0", + "tor-hscrypto 0.44.0", + "tor-keymgr 0.44.0", + "tor-linkspec 0.44.0", + "tor-llcrypto 0.44.0", + "tor-log-ratelim 0.44.0", + "tor-netdir 0.44.0", + "tor-netdoc 0.44.0", + "tor-persist 0.44.0", + "tor-proto 0.44.0", + "tor-protover 0.44.0", + "tor-relay-selection 0.44.0", + "tor-rtcompat 0.44.0", + "tracing", + "void", + "web-time-compat 0.2.0", ] [[package]] @@ -11192,14 +11829,36 @@ dependencies = [ "paste", "rand 0.10.1", "rsa", - "signature 2.2.0", + "signature", "ssh-key-fork-arti", "thiserror 2.0.18", - "tor-bytes", - "tor-cert", - "tor-checkable", - "tor-error", - "tor-llcrypto", + "tor-bytes 0.43.0", + "tor-cert 0.43.0", + "tor-checkable 0.43.0", + "tor-error 0.43.0", + "tor-llcrypto 0.43.0", +] + +[[package]] +name = "tor-key-forge" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30f83389917e9908c43457c80d0b982ba6dcd3e6ea36a37b29167b7619d9eaa3" +dependencies = [ + "derive-deftly", + "derive_more", + "downcast-rs 2.0.2", + "paste", + "rand 0.10.1", + "rsa", + "signature", + "ssh-key-fork-arti", + "thiserror 2.0.18", + "tor-bytes 0.44.0", + "tor-cert 0.44.0", + "tor-checkable 0.44.0", + "tor-error 0.44.0", + "tor-llcrypto 0.44.0", ] [[package]] @@ -11216,30 +11875,71 @@ dependencies = [ "derive_more", "downcast-rs 2.0.2", "dyn-clone", - "fs-mistrust", + "fs-mistrust 0.14.2", "glob-match", "humantime", "inventory", "itertools 0.14.0", "rand 0.10.1", - "safelog", + "safelog 0.8.2", "serde", - "signature 2.2.0", + "signature", "ssh-key-fork-arti", "thiserror 2.0.18", - "tor-basic-utils", - "tor-bytes", - "tor-config", - "tor-config-path", - "tor-error", - "tor-hscrypto", - "tor-key-forge", - "tor-llcrypto", - "tor-persist", + "tor-basic-utils 0.43.0", + "tor-bytes 0.43.0", + "tor-config 0.43.0", + "tor-config-path 0.43.0", + "tor-error 0.43.0", + "tor-hscrypto 0.43.0", + "tor-key-forge 0.43.0", + "tor-llcrypto 0.43.0", + "tor-persist 0.43.0", "tracing", "visibility", "walkdir", - "web-time-compat", + "web-time-compat 0.1.0", + "zeroize", +] + +[[package]] +name = "tor-keymgr" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7c18fb26d112c6022b7d1de558a4045b574fecfa1c504045145d8e1a9dc01a" +dependencies = [ + "amplify", + "arrayvec 0.7.6", + "cfg-if 1.0.4", + "derive-deftly", + "derive_builder_fork_arti", + "derive_more", + "downcast-rs 2.0.2", + "dyn-clone", + "fs-mistrust 0.15.0", + "glob-match", + "humantime", + "inventory", + "itertools 0.14.0", + "rand 0.10.1", + "safelog 0.9.0", + "serde", + "signature", + "ssh-key-fork-arti", + "thiserror 2.0.18", + "tor-basic-utils 0.44.0", + "tor-bytes 0.44.0", + "tor-config 0.44.0", + "tor-config-path 0.44.0", + "tor-error 0.44.0", + "tor-hscrypto 0.44.0", + "tor-key-forge 0.44.0", + "tor-llcrypto 0.44.0", + "tor-persist 0.44.0", + "tracing", + "visibility", + "walkdir", + "web-time-compat 0.2.0", "zeroize", ] @@ -11251,23 +11951,50 @@ checksum = "0e1cc8d5469c324d1e0761066d868363d3fdccb723b14cdc983a5aef9b67981b" dependencies = [ "base64ct", "by_address", - "caret", + "caret 0.9.0", "derive-deftly", "derive_builder_fork_arti", "derive_more", "hex", "itertools 0.14.0", - "safelog", + "safelog 0.8.2", "serde", "serde_with", "strum 0.28.0", "thiserror 2.0.18", - "tor-basic-utils", - "tor-bytes", - "tor-config", - "tor-llcrypto", - "tor-memquota", - "tor-protover", + "tor-basic-utils 0.43.0", + "tor-bytes 0.43.0", + "tor-config 0.43.0", + "tor-llcrypto 0.43.0", + "tor-memquota 0.43.0", + "tor-protover 0.43.0", +] + +[[package]] +name = "tor-linkspec" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "638a849a5d65d4e37adb6a2fa597a5a5c0decb749c17e76d3c44c4aefd696270" +dependencies = [ + "base64ct", + "by_address", + "caret 0.10.0", + "derive-deftly", + "derive_builder_fork_arti", + "derive_more", + "hex", + "itertools 0.14.0", + "safelog 0.9.0", + "serde", + "serde_with", + "strum 0.28.0", + "thiserror 2.0.18", + "tor-basic-utils 0.44.0", + "tor-bytes 0.44.0", + "tor-config 0.44.0", + "tor-llcrypto 0.44.0", + "tor-memquota 0.44.0", + "tor-protover 0.44.0", ] [[package]] @@ -11284,7 +12011,7 @@ dependencies = [ "derive-deftly", "derive_more", "digest 0.10.7", - "ed25519-dalek 2.2.0", + "ed25519-dalek", "educe", "getrandom 0.2.17", "getrandom 0.3.3", @@ -11298,16 +12025,59 @@ dependencies = [ "rdrand 0.8.3", "reseeding_rng", "rsa", - "safelog", + "safelog 0.8.2", "serde", "sha1", "sha2 0.10.9", "sha3 0.10.9", - "signature 2.2.0", + "signature", "subtle", "thiserror 2.0.18", - "tor-error", - "tor-memquota-cost", + "tor-error 0.43.0", + "tor-memquota-cost 0.43.0", + "visibility", + "x25519-dalek 2.0.1", + "zeroize", +] + +[[package]] +name = "tor-llcrypto" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ef0e63e805e9c1da61511a93eca502dc29bcb0b8635e9668ec750b63a1e53a1" +dependencies = [ + "aes", + "base64ct", + "ctr", + "curve25519-dalek 4.1.3", + "der-parser", + "derive-deftly", + "derive_more", + "digest 0.10.7", + "ed25519-dalek", + "educe", + "getrandom 0.2.17", + "getrandom 0.3.3", + "getrandom 0.4.1", + "hex", + "rand 0.10.1", + "rand_chacha 0.10.0", + "rand_core 0.10.1", + "rand_core 0.6.4", + "rand_jitter 0.6.1", + "rdrand 0.8.3", + "reseeding_rng", + "rsa", + "safelog 0.9.0", + "serde", + "sha1", + "sha2 0.10.9", + "sha3 0.10.9", + "signature", + "subtle", + "thiserror 2.0.18", + "tor-error 0.44.0", + "tor-memquota-cost 0.44.0", "visibility", "x25519-dalek 2.0.1", "zeroize", @@ -11319,14 +12089,30 @@ version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d16152b21f2e7b309dfbdcbe587c5adba9547d3119f2933b453d6edbce7e8e0" dependencies = [ - "futures 0.3.31", + "futures 0.3.32", "humantime", "thiserror 2.0.18", - "tor-error", - "tor-rtcompat", + "tor-error 0.43.0", + "tor-rtcompat 0.43.0", "tracing", "weak-table", - "web-time-compat", + "web-time-compat 0.1.0", +] + +[[package]] +name = "tor-log-ratelim" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d0f759a875b6f9b6f3657a2626a70e2474e698a4404501033babe63ad888a6" +dependencies = [ + "futures 0.3.32", + "humantime", + "thiserror 2.0.18", + "tor-error 0.44.0", + "tor-rtcompat 0.44.0", + "tracing", + "weak-table", + "web-time-compat 0.2.0", ] [[package]] @@ -11340,22 +12126,53 @@ dependencies = [ "derive_more", "dyn-clone", "educe", - "futures 0.3.31", + "futures 0.3.32", "itertools 0.14.0", "paste", "pin-project", "serde", - "slotmap-careful", + "slotmap-careful 0.7.0", "static_assertions", "sysinfo 0.38.4", "thiserror 2.0.18", - "tor-async-utils", - "tor-basic-utils", - "tor-config", - "tor-error", - "tor-log-ratelim", - "tor-memquota-cost", - "tor-rtcompat", + "tor-async-utils 0.43.0", + "tor-basic-utils 0.43.0", + "tor-config 0.43.0", + "tor-error 0.43.0", + "tor-log-ratelim 0.43.0", + "tor-memquota-cost 0.43.0", + "tor-rtcompat 0.43.0", + "tracing", + "void", +] + +[[package]] +name = "tor-memquota" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c06f2e981120a4c1da1e361573cee4af618d05fa3c7ec37c139d766f1b8d47f" +dependencies = [ + "cfg-if 1.0.4", + "derive-deftly", + "derive_more", + "dyn-clone", + "educe", + "futures 0.3.32", + "itertools 0.14.0", + "paste", + "pin-project", + "serde", + "slotmap-careful 0.8.0", + "static_assertions", + "sysinfo 0.38.4", + "thiserror 2.0.18", + "tor-async-utils 0.44.0", + "tor-basic-utils 0.44.0", + "tor-config 0.44.0", + "tor-error 0.44.0", + "tor-log-ratelim 0.44.0", + "tor-memquota-cost 0.44.0", + "tor-rtcompat 0.44.0", "tracing", "void", ] @@ -11372,6 +12189,18 @@ dependencies = [ "void", ] +[[package]] +name = "tor-memquota-cost" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b86eb903fee638e9211daddaddc146f0c5e4f5605d79983548fce6fec596325c" +dependencies = [ + "derive-deftly", + "itertools 0.14.0", + "paste", + "void", +] + [[package]] name = "tor-netdir" version = "0.43.0" @@ -11382,7 +12211,7 @@ dependencies = [ "bitflags 2.13.0", "derive_more", "digest 0.10.7", - "futures 0.3.31", + "futures 0.3.32", "hex", "humantime", "itertools 0.14.0", @@ -11392,17 +12221,50 @@ dependencies = [ "strum 0.28.0", "thiserror 2.0.18", "time", - "tor-basic-utils", - "tor-error", - "tor-hscrypto", - "tor-linkspec", - "tor-llcrypto", - "tor-netdoc", - "tor-protover", - "tor-units", + "tor-basic-utils 0.43.0", + "tor-error 0.43.0", + "tor-hscrypto 0.43.0", + "tor-linkspec 0.43.0", + "tor-llcrypto 0.43.0", + "tor-netdoc 0.43.0", + "tor-protover 0.43.0", + "tor-units 0.43.0", "tracing", "typed-index-collections", - "web-time-compat", + "web-time-compat 0.1.0", +] + +[[package]] +name = "tor-netdir" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8160580273eec3576158c3e833ff198870665dacebb373585892dde93cf9803" +dependencies = [ + "async-trait", + "bitflags 2.13.0", + "derive_more", + "digest 0.10.7", + "futures 0.3.32", + "hex", + "humantime", + "itertools 0.14.0", + "num_enum", + "rand 0.10.1", + "serde", + "strum 0.28.0", + "thiserror 2.0.18", + "time", + "tor-basic-utils 0.44.0", + "tor-error 0.44.0", + "tor-hscrypto 0.44.0", + "tor-linkspec 0.44.0", + "tor-llcrypto 0.44.0", + "tor-netdoc 0.44.0", + "tor-protover 0.44.0", + "tor-units 0.44.0", + "tracing", + "typed-index-collections", + "web-time-compat 0.2.0", ] [[package]] @@ -11428,29 +12290,79 @@ dependencies = [ "paste", "phf 0.13.1", "rand 0.10.1", - "saturating-time", + "saturating-time 0.3.0", "serde", "serde_with", - "signature 2.2.0", + "signature", "smallvec", "strum 0.28.0", "subtle", "thiserror 2.0.18", "time", "tinystr", - "tor-basic-utils", - "tor-bytes", - "tor-cell", - "tor-cert", - "tor-checkable", - "tor-error", - "tor-hscrypto", - "tor-linkspec", - "tor-llcrypto", - "tor-protover", - "tor-units", + "tor-basic-utils 0.43.0", + "tor-bytes 0.43.0", + "tor-cell 0.43.0", + "tor-cert 0.43.0", + "tor-checkable 0.43.0", + "tor-error 0.43.0", + "tor-hscrypto 0.43.0", + "tor-linkspec 0.43.0", + "tor-llcrypto 0.43.0", + "tor-protover 0.43.0", + "tor-units 0.43.0", "void", - "web-time-compat", + "web-time-compat 0.1.0", + "zeroize", +] + +[[package]] +name = "tor-netdoc" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51598bfd24866de2c51e0de7a6e2418f86c6278cfeba2f85295ce45367fd8e06" +dependencies = [ + "amplify", + "base64ct", + "cipher 0.4.4", + "derive-deftly", + "derive_builder_fork_arti", + "derive_more", + "digest 0.10.7", + "educe", + "enumset", + "hex", + "hostname-validator", + "humantime", + "ipnet", + "itertools 0.14.0", + "memchr", + "paste", + "phf 0.13.1", + "rand 0.10.1", + "saturating-time 0.4.0", + "serde", + "serde_with", + "signature", + "smallvec", + "strum 0.28.0", + "subtle", + "thiserror 2.0.18", + "time", + "tinystr", + "tor-basic-utils 0.44.0", + "tor-bytes 0.44.0", + "tor-cell 0.44.0", + "tor-cert 0.44.0", + "tor-checkable 0.44.0", + "tor-error 0.44.0", + "tor-hscrypto 0.44.0", + "tor-linkspec 0.44.0", + "tor-llcrypto 0.44.0", + "tor-protover 0.44.0", + "tor-units 0.44.0", + "void", + "web-time-compat 0.2.0", "zeroize", ] @@ -11463,23 +12375,52 @@ dependencies = [ "derive-deftly", "derive_more", "filetime", - "fs-mistrust", - "fslock-guard", - "futures 0.3.31", + "fs-mistrust 0.14.2", + "fslock-guard 0.7.0", + "futures 0.3.32", "itertools 0.14.0", - "oneshot-fused-workaround", + "oneshot-fused-workaround 0.6.0", "paste", "sanitize-filename", "serde", "serde_json", "thiserror 2.0.18", "time", - "tor-async-utils", - "tor-basic-utils", - "tor-error", + "tor-async-utils 0.43.0", + "tor-basic-utils 0.43.0", + "tor-error 0.43.0", "tracing", "void", - "web-time-compat", + "web-time-compat 0.1.0", +] + +[[package]] +name = "tor-persist" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2ff75e20adb6a1a7ad07e16b55e56d5376706cc0090ab8831f008f1a89243f2" +dependencies = [ + "amplify", + "derive-deftly", + "derive_more", + "filetime", + "fs-mistrust 0.15.0", + "fslock-guard 0.8.0", + "futures 0.3.32", + "itertools 0.14.0", + "oneshot-fused-workaround 0.7.0", + "paste", + "sanitize-filename", + "serde", + "serde_json", + "thiserror 2.0.18", + "time", + "tor-async-utils 0.44.0", + "tor-basic-utils 0.44.0", + "tor-error 0.44.0", + "tracing", + "void", + "web-time-compat 0.2.0", ] [[package]] @@ -11493,7 +12434,7 @@ dependencies = [ "asynchronous-codec", "bitvec", "bytes 1.11.1", - "caret", + "caret 0.9.0", "cfg-if 1.0.4", "cipher 0.4.4", "coarsetime", @@ -11503,49 +12444,115 @@ dependencies = [ "digest 0.10.7", "educe", "enum_dispatch", - "futures 0.3.31", + "futures 0.3.32", "futures-util", - "hkdf 0.12.4", + "hkdf", "hmac 0.12.1", "itertools 0.14.0", "nonany", - "oneshot-fused-workaround", + "oneshot-fused-workaround 0.6.0", "pin-project", "postage", "rand 0.10.1", "rand_core 0.10.1", - "safelog", - "slotmap-careful", + "safelog 0.8.2", + "slotmap-careful 0.7.0", "smallvec", "static_assertions", "strum 0.28.0", "subtle", "sync_wrapper", "thiserror 2.0.18", - "tokio 1.49.0", + "tokio 1.52.3", "tokio-util 0.7.18", - "tor-async-utils", - "tor-basic-utils", - "tor-bytes", - "tor-cell", - "tor-cert", - "tor-checkable", - "tor-config", - "tor-error", - "tor-hscrypto", - "tor-linkspec", - "tor-llcrypto", - "tor-log-ratelim", - "tor-memquota", - "tor-protover", - "tor-rtcompat", - "tor-rtmock", - "tor-units", + "tor-async-utils 0.43.0", + "tor-basic-utils 0.43.0", + "tor-bytes 0.43.0", + "tor-cell 0.43.0", + "tor-cert 0.43.0", + "tor-checkable 0.43.0", + "tor-config 0.43.0", + "tor-error 0.43.0", + "tor-hscrypto 0.43.0", + "tor-linkspec 0.43.0", + "tor-llcrypto 0.43.0", + "tor-log-ratelim 0.43.0", + "tor-memquota 0.43.0", + "tor-protover 0.43.0", + "tor-rtcompat 0.43.0", + "tor-rtmock 0.43.0", + "tor-units 0.43.0", "tracing", "typenum", "visibility", "void", - "web-time-compat", + "web-time-compat 0.1.0", + "zeroize", +] + +[[package]] +name = "tor-proto" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "666b602da8ba5a4189d6ff551f5dd9db949b503780140d175435658970a1ea54" +dependencies = [ + "amplify", + "async-trait", + "asynchronous-codec", + "bitvec", + "bytes 1.11.1", + "caret 0.10.0", + "cfg-if 1.0.4", + "cipher 0.4.4", + "coarsetime", + "derive-deftly", + "derive_builder_fork_arti", + "derive_more", + "digest 0.10.7", + "educe", + "enum_dispatch", + "futures 0.3.32", + "futures-util", + "hkdf", + "hmac 0.12.1", + "itertools 0.14.0", + "nonany", + "oneshot-fused-workaround 0.7.0", + "pin-project", + "postage", + "rand 0.10.1", + "rand_core 0.10.1", + "safelog 0.9.0", + "slotmap-careful 0.8.0", + "smallvec", + "static_assertions", + "strum 0.28.0", + "subtle", + "thiserror 2.0.18", + "tokio 1.52.3", + "tokio-util 0.7.18", + "tor-async-utils 0.44.0", + "tor-basic-utils 0.44.0", + "tor-bytes 0.44.0", + "tor-cell 0.44.0", + "tor-cert 0.44.0", + "tor-checkable 0.44.0", + "tor-config 0.44.0", + "tor-error 0.44.0", + "tor-hscrypto 0.44.0", + "tor-linkspec 0.44.0", + "tor-llcrypto 0.44.0", + "tor-log-ratelim 0.44.0", + "tor-memquota 0.44.0", + "tor-protover 0.44.0", + "tor-rtcompat 0.44.0", + "tor-rtmock 0.44.0", + "tor-units 0.44.0", + "tracing", + "typenum", + "visibility", + "void", + "web-time-compat 0.2.0", "zeroize", ] @@ -11555,12 +12562,56 @@ version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4f7f4ee15c9bfa0b700ae06e85fa52abddf17a35531cd3d3833412900e8da5c" dependencies = [ - "caret", + "caret 0.9.0", "paste", "serde_with", "thiserror 2.0.18", - "tor-basic-utils", - "tor-bytes", + "tor-basic-utils 0.43.0", + "tor-bytes 0.43.0", +] + +[[package]] +name = "tor-protover" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ef84569d020c36eb322976f9a5dec1d3fa992db9739237ad1ae923b0ddeb298" +dependencies = [ + "caret 0.10.0", + "paste", + "serde_with", + "thiserror 2.0.18", + "tor-basic-utils 0.44.0", + "tor-bytes 0.44.0", +] + +[[package]] +name = "tor-ptmgr" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66db88ee6c5ba60a077b592b7e566d465220de61ccfd473fba6567c577cad475" +dependencies = [ + "async-trait", + "cfg-if 1.0.4", + "derive-deftly", + "derive_builder_fork_arti", + "fs-mistrust 0.15.0", + "futures 0.3.32", + "itertools 0.14.0", + "oneshot-fused-workaround 0.7.0", + "serde", + "thiserror 2.0.18", + "tor-async-utils 0.44.0", + "tor-basic-utils 0.44.0", + "tor-chanmgr 0.44.0", + "tor-config 0.44.0", + "tor-config-path 0.44.0", + "tor-error 0.44.0", + "tor-linkspec 0.44.0", + "tor-proto 0.44.0", + "tor-rtcompat 0.44.0", + "tor-socksproto 0.44.0", + "tracing", + "web-time-compat 0.2.0", ] [[package]] @@ -11571,10 +12622,24 @@ checksum = "5b565b6dec2e3edb7b033203a3662edb7b586e486d53e02af4295e05e7562870" dependencies = [ "rand 0.10.1", "serde", - "tor-basic-utils", - "tor-linkspec", - "tor-netdir", - "tor-netdoc", + "tor-basic-utils 0.43.0", + "tor-linkspec 0.43.0", + "tor-netdir 0.43.0", + "tor-netdoc 0.43.0", +] + +[[package]] +name = "tor-relay-selection" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09778e3a45fdf49ca335fa16a0032abc5d4e1cacff9f46c3ed3e2a416d088aa6" +dependencies = [ + "rand 0.10.1", + "serde", + "tor-basic-utils 0.44.0", + "tor-linkspec 0.44.0", + "tor-netdir 0.44.0", + "tor-netdoc 0.44.0", ] [[package]] @@ -11594,21 +12659,56 @@ dependencies = [ "derive_more", "dyn-clone", "educe", - "futures 0.3.31", + "futures 0.3.32", "hex", "libc", "native-tls", "paste", "pin-project", - "socket2 0.6.2", + "socket2 0.6.5", "thiserror 2.0.18", - "tokio 1.49.0", + "tokio 1.52.3", "tokio-util 0.7.18", - "tor-error", - "tor-general-addr", + "tor-error 0.43.0", + "tor-general-addr 0.43.0", "tracing", "void", - "web-time-compat", + "web-time-compat 0.1.0", + "zeroize", +] + +[[package]] +name = "tor-rtcompat" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "981279291476ad7ec309c874fa99b8d31250432a48ff6eea3f7405edbbd254e1" +dependencies = [ + "amplify", + "async-native-tls", + "async-trait", + "async_executors", + "asynchronous-codec", + "cfg-if 1.0.4", + "coarsetime", + "derive_builder_fork_arti", + "derive_more", + "dyn-clone", + "educe", + "futures 0.3.32", + "hex", + "libc", + "native-tls", + "paste", + "pin-project", + "socket2 0.6.5", + "thiserror 2.0.18", + "tokio 1.52.3", + "tokio-util 0.7.18", + "tor-error 0.44.0", + "tor-general-addr 0.44.0", + "tracing", + "void", + "web-time-compat 0.2.0", "zeroize", ] @@ -11624,22 +12724,52 @@ dependencies = [ "derive-deftly", "derive_more", "educe", - "futures 0.3.31", + "futures 0.3.32", "humantime", "itertools 0.14.0", - "oneshot-fused-workaround", + "oneshot-fused-workaround 0.6.0", "pin-project", "priority-queue", - "slotmap-careful", + "slotmap-careful 0.7.0", "strum 0.28.0", "thiserror 2.0.18", - "tor-error", - "tor-general-addr", - "tor-rtcompat", + "tor-error 0.43.0", + "tor-general-addr 0.43.0", + "tor-rtcompat 0.43.0", "tracing", "tracing-test", "void", - "web-time-compat", + "web-time-compat 0.1.0", +] + +[[package]] +name = "tor-rtmock" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a3ee9695304cc44cc0de1dc673c9a71419318e214dc04ed7883a058d050654d" +dependencies = [ + "amplify", + "assert_matches", + "async-trait", + "derive-deftly", + "derive_more", + "educe", + "futures 0.3.32", + "humantime", + "itertools 0.14.0", + "oneshot-fused-workaround 0.7.0", + "pin-project", + "priority-queue", + "slotmap-careful 0.8.0", + "strum 0.28.0", + "thiserror 2.0.18", + "tor-error 0.44.0", + "tor-general-addr 0.44.0", + "tor-rtcompat 0.44.0", + "tracing", + "tracing-test", + "void", + "web-time-compat 0.2.0", ] [[package]] @@ -11649,14 +12779,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55f432eda94343bdadd73995f0b3082d96637dadb0e20c3f9a1bf2349f623d3c" dependencies = [ "amplify", - "caret", + "caret 0.9.0", "derive-deftly", "educe", - "safelog", + "safelog 0.8.2", "subtle", "thiserror 2.0.18", - "tor-bytes", - "tor-error", + "tor-bytes 0.43.0", + "tor-error 0.43.0", +] + +[[package]] +name = "tor-socksproto" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbf78ef55dbfccb5a95cd75eb433621947923653cb91c9941d5a0a5116e510ee" +dependencies = [ + "amplify", + "caret 0.10.0", + "derive-deftly", + "educe", + "safelog 0.9.0", + "subtle", + "thiserror 2.0.18", + "tor-bytes 0.44.0", + "tor-error 0.44.0", ] [[package]] @@ -11669,9 +12816,61 @@ dependencies = [ "derive_more", "serde", "thiserror 2.0.18", - "tor-memquota", + "tor-memquota 0.43.0", ] +[[package]] +name = "tor-units" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0325a93f3b35c5a9bda74705ce89b753e1c8e183af6945826188cef16687d80" +dependencies = [ + "derive-deftly", + "derive_more", + "serde", + "thiserror 2.0.18", + "tor-memquota 0.44.0", +] + +[[package]] +name = "tower" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite 0.2.16", + "sync_wrapper", + "tokio 1.52.3", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" +dependencies = [ + "bitflags 2.13.0", + "bytes 1.11.1", + "futures-util", + "http", + "http-body", + "pin-project-lite 0.2.16", + "tower", + "tower-layer", + "tower-service", + "url", +] + +[[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" @@ -11711,16 +12910,6 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -11805,11 +12994,11 @@ checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13" dependencies = [ "bytes 1.11.1", "data-encoding", - "http 1.4.0", + "http", "httparse", "log", "rand 0.9.2", - "rustls 0.23.40", + "rustls", "rustls-pki-types", "sha1", "thiserror 2.0.18", @@ -12102,20 +13291,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "0.8.2" +version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.17", - "serde", -] - -[[package]] -name = "uuid" -version = "1.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f" +checksum = "bf3923a6f5c4c6382e0b653c4117f48d631ea17f38ed86e2a828e6f7412f5239" dependencies = [ + "getrandom 0.4.1", "js-sys", "serde_core", "wasm-bindgen", @@ -12269,8 +13449,6 @@ dependencies = [ "cfg-if 1.0.4", "once_cell", "rustversion", - "serde", - "serde_json", "wasm-bindgen-macro", "wasm-bindgen-shared", ] @@ -12525,6 +13703,15 @@ dependencies = [ "web-time", ] +[[package]] +name = "web-time-compat" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af46dad42aa37be3b4a116fe613365f991b8bdae6cd6ce82d84fa9f9e8f70ae4" +dependencies = [ + "web-time", +] + [[package]] name = "webbrowser" version = "1.1.0" @@ -12532,7 +13719,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f00bb839c1cf1e3036066614cbdcd035ecf215206691ea646aa3c60a24f68f2" dependencies = [ "core-foundation 0.10.1", - "jni", + "jni 0.21.1", "log", "ndk-context", "objc2 0.6.3", @@ -12542,32 +13729,12 @@ dependencies = [ ] [[package]] -name = "webpki" -version = "0.21.4" +name = "webpki-root-certs" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +checksum = "0d46a5a140e6f7afeccd8eae97eff335163939eac8b929834875168b29b3d267" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.14", - "untrusted 0.9.0", -] - -[[package]] -name = "webpki-roots" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f" -dependencies = [ - "webpki 0.21.4", + "rustls-pki-types", ] [[package]] @@ -12609,7 +13776,7 @@ dependencies = [ "js-sys", "log", "naga", - "parking_lot 0.12.5", + "parking_lot", "portable-atomic", "profiling", "raw-window-handle", @@ -12641,7 +13808,7 @@ dependencies = [ "log", "naga", "once_cell", - "parking_lot 0.12.5", + "parking_lot", "portable-atomic", "profiling", "raw-window-handle", @@ -12715,7 +13882,7 @@ dependencies = [ "objc", "once_cell", "ordered-float 5.1.0", - "parking_lot 0.12.5", + "parking_lot", "portable-atomic", "portable-atomic-util", "profiling", @@ -12996,6 +14163,17 @@ dependencies = [ "windows-link 0.2.1", ] +[[package]] +name = "windows-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" +dependencies = [ + "windows-link 0.2.1", + "windows-result 0.4.1", + "windows-strings 0.5.1", +] + [[package]] name = "windows-result" version = "0.2.0" @@ -13367,15 +14545,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5" -[[package]] -name = "winreg" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "winresource" version = "0.1.31" @@ -13531,17 +14700,6 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd" -[[package]] -name = "x25519-dalek" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "637ff90c9540fa3073bb577e65033069e4bae7c79d49d74aa3ffdf5342a53217" -dependencies = [ - "curve25519-dalek 2.1.3", - "rand_core 0.5.1", - "zeroize", -] - [[package]] name = "x25519-dalek" version = "1.1.1" @@ -13602,6 +14760,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" +[[package]] +name = "xxhash-rust" +version = "0.8.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "985eec839aaf2a1270af8f4ebcf63cf9401cfd90f0902f97c28d9f104ffbde72" + [[package]] name = "y4m" version = "0.8.0" @@ -13658,7 +14822,7 @@ dependencies = [ "serde_repr", "tracing", "uds_windows", - "uuid 1.20.0", + "uuid", "windows-sys 0.61.2", "winnow 0.7.14", "zbus_macros", diff --git a/Cargo.toml b/Cargo.toml index e226e625..9957d693 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,14 +42,14 @@ e2e-internal = [] log = "0.4.27" # node -grin_api = { path = "node/api" } -grin_chain = { path = "node/chain" } -grin_config = { path = "node/config" } -grin_core = { path = "node/core" } -grin_p2p = { path = "node/p2p" } -grin_servers = { path = "node/servers" } -grin_keychain = { path = "node/keychain" } -grin_util = { path = "node/util" } +grin_api = { path = "wallet/grin/api" } +grin_chain = { path = "wallet/grin/chain" } +grin_config = { path = "wallet/grin/config" } +grin_core = { path = "wallet/grin/core" } +grin_p2p = { path = "wallet/grin/p2p" } +grin_servers = { path = "wallet/grin/servers" } +grin_keychain = { path = "wallet/grin/keychain" } +grin_util = { path = "wallet/grin/util" } # wallet grin_wallet_impls = { path = "wallet/impls" } @@ -105,7 +105,7 @@ hyper-tls = "0.6.0" # Version already present transitively (async-socks5 tree) — no new download. tokio-socks = "0.5" async-std = "1.13.2" -uuid = { version = "0.8.2", features = ["v4"] } +uuid = { version = "1.23.4", features = ["serde", "v4"] } num-bigint = "0.4.6" ## nostr diff --git a/node b/node deleted file mode 160000 index bce5a714..00000000 --- a/node +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bce5a7144be4085dc9f4bcbb66d860ffeef9b4ca diff --git a/src/node/node.rs b/src/node/node.rs index 343a2a7e..78ee9361 100644 --- a/src/node/node.rs +++ b/src/node/node.rs @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -use futures::channel::oneshot; use lazy_static::lazy_static; use parking_lot::RwLock; use std::path::{Path, PathBuf}; @@ -680,8 +679,7 @@ fn start_node_server() -> Result { } // Start integrated node server. - let api_chan: &'static mut (oneshot::Sender<()>, oneshot::Receiver<()>) = - Box::leak(Box::new(oneshot::channel::<()>())); + let api_chan = tokio::sync::mpsc::channel::<()>(1); let server_result = Server::new(server_config, None, None, api_chan); server_result } diff --git a/src/wallet/wallet.rs b/src/wallet/wallet.rs index 4127864c..df72b357 100644 --- a/src/wallet/wallet.rs +++ b/src/wallet/wallet.rs @@ -26,7 +26,6 @@ use crate::wallet::types::{ use crate::wallet::{ConnectionsConfig, Mnemonic, WalletConfig}; use chrono::Utc; -use futures::channel::oneshot; use grin_api::{ApiServer, Router}; use grin_chain::SyncStatus; use grin_keychain::{ExtKeychain, Keychain}; @@ -319,6 +318,7 @@ impl Wallet { /// Create [`HTTPNodeClient`] from provided config. fn create_node_client(config: &WalletConfig) -> Result { let (node_api_url, node_secret) = Self::node_url_secret(config); + let timeout = Duration::from_secs(60); let client = if AppConfig::use_proxy() { let socks = AppConfig::use_socks_proxy(); let url = if socks { @@ -347,14 +347,19 @@ impl Wallet { }; match addr_res { - None => HTTPNodeClient::new(&node_api_url, node_secret)?, + None => HTTPNodeClient::new(&node_api_url, node_secret, timeout)?, Some(addr) => { let scheme = if socks { "socks5://" } else { "http://" }; - HTTPNodeClient::new_proxy(&node_api_url, node_secret, Some((addr, scheme)))? + HTTPNodeClient::new_proxy( + &node_api_url, + node_secret, + Some((addr, scheme)), + timeout, + )? } } } else { - HTTPNodeClient::new(&node_api_url, node_secret)? + HTTPNodeClient::new(&node_api_url, node_secret, timeout)? }; Ok(client) } @@ -3938,11 +3943,9 @@ fn start_api_server(wallet: &Wallet) -> Result<(ApiServer, u16), Error> { .add_route("/v2/foreign", Arc::new(api_handler_v2)) .map_err(|_| Error::GenericError("Router failed to add route".to_string()))?; - let api_chan: &'static mut (oneshot::Sender<()>, oneshot::Receiver<()>) = - Box::leak(Box::new(oneshot::channel::<()>())); - let mut apis = ApiServer::new(); let socket_addr: SocketAddr = api_addr.parse().unwrap(); + let api_chan = tokio::sync::mpsc::channel::<()>(1); let _ = apis .start(socket_addr, router, None, api_chan) .map_err(|_| Error::GenericError("API thread failed to start".to_string()))?; diff --git a/wallet b/wallet index c2db7545..32e132a4 160000 --- a/wallet +++ b/wallet @@ -1 +1 @@ -Subproject commit c2db754552b9e5c57c4a843c68744df0cc744ff8 +Subproject commit 32e132a45470d01a105fcab263e4970bc8eaff40