diff --git a/Cargo.lock b/Cargo.lock index aaf3aec..0456e8e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -157,8 +157,8 @@ dependencies = [ "anyhow", "base64 0.22.1", "clap", - "pubky 0.4.0", - "pubky-common 0.3.0", + "pubky", + "pubky-common", "reqwest", "rpassword", "tokio", @@ -354,15 +354,16 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.5" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" +checksum = "1230237285e3e10cde447185e8975408ae24deaa67205ce684805c25bc0c7937" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", + "memmap2", ] [[package]] @@ -394,9 +395,9 @@ checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" [[package]] name = "cc" -version = "1.2.13" +version = "1.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda" +checksum = "0c3d1b2e905a3a7b00a6141adb0e4c0bb941d11caf55349d863942a1cc44e3c9" dependencies = [ "shlex", ] @@ -426,9 +427,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.29" +version = "4.5.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184" +checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d" dependencies = [ "clap_builder", "clap_derive", @@ -436,9 +437,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.29" +version = "4.5.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9" +checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c" dependencies = [ "anstream", "anstyle", @@ -736,9 +737,9 @@ dependencies = [ [[package]] name = "document-features" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d" dependencies = [ "litrs", ] @@ -777,7 +778,6 @@ checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek", "ed25519", - "rand_core 0.6.4", "serde", "sha2", "subtle", @@ -807,9 +807,9 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" @@ -1071,9 +1071,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" +checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2" dependencies = [ "atomic-waker", "bytes", @@ -1621,9 +1621,9 @@ checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465" [[package]] name = "mainline" -version = "5.2.0" +version = "5.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed4c696a31f9ac71d7a1c7e10945cc041758b9b6a716ea48c18f2372e067e9db" +checksum = "fb915972046c6df12b1292ed24f7382ed21facd440f9f6ca9c38e0b702217009" dependencies = [ "crc", "document-features", @@ -1662,6 +1662,15 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +[[package]] +name = "memmap2" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" +dependencies = [ + "libc", +] + [[package]] name = "mime" version = "0.3.17" @@ -1771,9 +1780,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.70" +version = "0.10.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61cfb4e166a8bb8c9b55c500bc2308550148ece889be90f609377e58140f42c6" +checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd" dependencies = [ "bitflags", "cfg-if", @@ -1803,9 +1812,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" -version = "0.9.105" +version = "0.9.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b22d5b84be05a8d6947c7cb71f7c849aa0f112acd4bf51c2a7c1c988ac0a9dc" +checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd" dependencies = [ "cc", "libc", @@ -1951,9 +1960,40 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkarr" -version = "3.1.1" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "519d78e59fc7884d0009a1e405ab04661c087cbb98ba984e0c010884a36efc0c" +checksum = "fb8be2e97e822e41c6e254706e732e02ca2c49f4da038042c11d5a5e5961a164" +dependencies = [ + "async-compat", + "base32", + "byteorder", + "bytes", + "cfg_aliases", + "document-features", + "dyn-clone", + "ed25519-dalek", + "futures-lite", + "getrandom 0.2.15", + "heed", + "log", + "lru", + "mainline", + "page_size", + "pubky-timestamp", + "self_cell", + "serde", + "sha1_smol", + "simple-dns", + "thiserror 2.0.11", + "tokio", + "tracing", + "wasm-bindgen-futures", +] + +[[package]] +name = "pkarr" +version = "3.3.1" +source = "git+https://github.com/pubky/pkarr?rev=4269e68#4269e689c1782600a603e214eea621230ff04e7d" dependencies = [ "async-compat", "base32", @@ -1966,14 +2006,13 @@ dependencies = [ "futures-buffered", "futures-lite", "genawaiter", - "getrandom 0.3.1", + "getrandom 0.2.15", "heed", "log", "lru", "mainline", "page_size", "pubky-timestamp", - "rand 0.9.0", "reqwest", "rustls", "rustls-webpki", @@ -1990,9 +2029,8 @@ dependencies = [ [[package]] name = "pkarr-relay" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562497bdc2c273da1cbedd536b4ab6b8127db744d8423ce46bc0c63f06d75239" +version = "0.5.6" +source = "git+https://github.com/pubky/pkarr?rev=4269e68#4269e689c1782600a603e214eea621230ff04e7d" dependencies = [ "anyhow", "axum", @@ -2004,7 +2042,7 @@ dependencies = [ "http", "httpdate", "mainline", - "pkarr", + "pkarr 3.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustls", "serde", "thiserror 2.0.11", @@ -2111,9 +2149,9 @@ dependencies = [ "getrandom 0.3.1", "js-sys", "log", - "pkarr", - "pubky-common 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pubky-testnet 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pkarr 3.3.1 (git+https://github.com/pubky/pkarr?rev=4269e68)", + "pubky-common", + "pubky-testnet", "reqwest", "thiserror 2.0.11", "tokio", @@ -2125,38 +2163,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "pubky" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14aaef32224e91e9c48d28b964027bde8117a4d1814367aead651d94b332ee83" -dependencies = [ - "anyhow", - "base64 0.22.1", - "bytes", - "cfg_aliases", - "console_log", - "cookie", - "cookie_store", - "flume", - "futures-lite", - "futures-util", - "getrandom 0.2.15", - "getrandom 0.3.1", - "js-sys", - "log", - "pkarr", - "pubky-common 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "reqwest", - "thiserror 2.0.11", - "tokio", - "tracing", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "pubky-common" version = "0.3.0" @@ -2168,28 +2174,7 @@ dependencies = [ "ed25519-dalek", "js-sys", "once_cell", - "pkarr", - "postcard", - "pubky-timestamp", - "rand 0.9.0", - "serde", - "thiserror 2.0.11", -] - -[[package]] -name = "pubky-common" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77dddc23db4c39c39412fdede996c16e36c93aedfe61226913f389df118a9254" -dependencies = [ - "argon2", - "base32", - "blake3", - "crypto_secretbox", - "ed25519-dalek", - "js-sys", - "once_cell", - "pkarr", + "pkarr 3.3.1 (git+https://github.com/pubky/pkarr?rev=4269e68)", "postcard", "pubky-timestamp", "rand 0.9.0", @@ -2215,43 +2200,9 @@ dependencies = [ "hex", "httpdate", "page_size", - "pkarr", + "pkarr 3.3.1 (git+https://github.com/pubky/pkarr?rev=4269e68)", "postcard", - "pubky-common 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde", - "tokio", - "toml", - "tower 0.5.2", - "tower-cookies", - "tower-http", - "tracing", - "tracing-subscriber", - "url", -] - -[[package]] -name = "pubky-homeserver" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04b7325e71bf07053760c383b6aba420d05f58e748803dcad1be63dc04e167f8" -dependencies = [ - "anyhow", - "axum", - "axum-extra", - "axum-server", - "base32", - "bytes", - "clap", - "dirs-next", - "flume", - "futures-util", - "heed", - "hex", - "httpdate", - "page_size", - "pkarr", - "postcard", - "pubky-common 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pubky-common", "serde", "tokio", "toml", @@ -2271,27 +2222,9 @@ dependencies = [ "http-relay 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "mainline", "pkarr-relay", - "pubky 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pubky-common 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pubky-homeserver 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio", - "tracing-subscriber", - "url", -] - -[[package]] -name = "pubky-testnet" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c758efdca49631891a38a12febf38011591ae437c697e88e51a14206a060d1e1" -dependencies = [ - "anyhow", - "http-relay 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "mainline", - "pkarr-relay", - "pubky 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pubky-common 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pubky-homeserver 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pubky", + "pubky-common", + "pubky-homeserver", "tokio", "tracing-subscriber", "url", @@ -2299,13 +2232,13 @@ dependencies = [ [[package]] name = "pubky-timestamp" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab61f82c6343aecd77364c3c1c4e9e8288adfb11d2775640395344b8078aa315" +checksum = "44aafc63c1eab1905e8a8378d2b085500540c9935b6d028908c8a50a5a246a3d" dependencies = [ "base32", "document-features", - "getrandom 0.3.1", + "getrandom 0.2.15", "httpdate", "js-sys", "once_cell", @@ -2377,9 +2310,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904" +checksum = "e46f3055866785f6b92bc6164b76be02ca8f2eb4b002c0354b28cf4c119e5944" dependencies = [ "cfg_aliases", "libc", @@ -2416,8 +2349,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" dependencies = [ "rand_chacha 0.9.0", - "rand_core 0.9.0", - "zerocopy 0.8.17", + "rand_core 0.9.1", + "zerocopy 0.8.18", ] [[package]] @@ -2437,7 +2370,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core 0.9.0", + "rand_core 0.9.1", ] [[package]] @@ -2451,19 +2384,19 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b08f3c9802962f7e1b25113931d94f43ed9725bebc59db9d0c3e9a23b67e15ff" +checksum = "a88e0da7a2c97baa202165137c158d0a2e824ac465d13d81046727b34cb247d3" dependencies = [ "getrandom 0.3.1", - "zerocopy 0.8.17", + "zerocopy 0.8.18", ] [[package]] name = "raw-cpuid" -version = "11.3.0" +version = "11.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6928fa44c097620b706542d428957635951bade7143269085389d42c8a4927e" +checksum = "529468c1335c1c03919960dfefdb1b3648858c20d7ec2d0663e728e4a717efbc" dependencies = [ "bitflags", ] @@ -2585,15 +2518,14 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.8" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +checksum = "e75ec5e92c4d8aede845126adc388046234541629e76029599ed35a003c7ed24" dependencies = [ "cc", "cfg-if", "getrandom 0.2.15", "libc", - "spin", "untrusted", "windows-sys 0.52.0", ] @@ -2942,9 +2874,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.2" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd" [[package]] name = "socket2" @@ -3065,9 +2997,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.16.0" +version = "3.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91" +checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230" dependencies = [ "cfg-if", "fastrand", @@ -3440,15 +3372,15 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" [[package]] name = "unicode-ident" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" +checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe" [[package]] name = "universal-hash" @@ -3912,11 +3844,11 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.17" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa91407dacce3a68c56de03abe2760159582b846c6a4acd2f456618087f12713" +checksum = "79386d31a42a4996e3336b0919ddb90f81112af416270cff95b5f5af22b839c2" dependencies = [ - "zerocopy-derive 0.8.17", + "zerocopy-derive 0.8.18", ] [[package]] @@ -3932,9 +3864,9 @@ dependencies = [ [[package]] name = "zerocopy-derive" -version = "0.8.17" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06718a168365cad3d5ff0bb133aad346959a2074bd4a85c121255a11304a8626" +checksum = "76331675d372f91bf8d17e13afbd5fe639200b73d01f0fc748bb059f9cca2db7" dependencies = [ "proc-macro2", "quote", diff --git a/pubky-common/Cargo.toml b/pubky-common/Cargo.toml index f818be0..955a933 100644 --- a/pubky-common/Cargo.toml +++ b/pubky-common/Cargo.toml @@ -23,7 +23,9 @@ argon2 = { version = "0.5.3", features = ["std"] } pubky-timestamp = { version = "0.4.0", features = ["full"] } serde = { version = "1.0.217", features = ["derive"] } -pkarr = { version = "3.3.1", default-features = false, features = ["keys"] } +pkarr = { git = "https://github.com/pubky/pkarr", rev = "4269e68", default-features = false, features = [ + "keys", +] } # `main` pkarr a few commits after 3.3.1. [target.'cfg(target_arch = "wasm32")'.dependencies] js-sys = "0.3.77" diff --git a/pubky-homeserver/Cargo.toml b/pubky-homeserver/Cargo.toml index 93964f5..d041fdb 100644 --- a/pubky-homeserver/Cargo.toml +++ b/pubky-homeserver/Cargo.toml @@ -32,8 +32,12 @@ heed = "0.21.0" hex = "0.4.3" httpdate = "1.0.3" postcard = { version = "1.1.1", features = ["alloc"] } -pkarr = { version = "3.3.1", features = ["dht", "lmdb-cache", "tls"] } -pubky-common = "0.3.0" +pkarr = { git = "https://github.com/pubky/pkarr", rev = "4269e68", features = [ + "dht", + "lmdb-cache", + "tls", +] } # `main` pkarr a few commits after 3.3.1. +pubky-common = { path = "../pubky-common" } serde = { version = "1.0.217", features = ["derive"] } tokio = { version = "1.43.0", features = ["full"] } toml = "0.8.20" diff --git a/pubky-testnet/Cargo.toml b/pubky-testnet/Cargo.toml index 7f984b7..18629cc 100644 --- a/pubky-testnet/Cargo.toml +++ b/pubky-testnet/Cargo.toml @@ -14,10 +14,10 @@ categories = ["web-programming", "authentication", "cryptography"] anyhow = "1.0.95" http-relay = "0.2.0" mainline = "5.2.0" -pkarr-relay = "0.5.6" -pubky = { version = "0.4.0", path = "../pubky" } -pubky-common = { version = "0.3.0", path = "../pubky-common" } -pubky-homeserver = { version = "0.1.0", path = "../pubky-homeserver" } +pkarr-relay = { git = "https://github.com/pubky/pkarr", rev = "4269e68" } # a few commits after 0.5.6 release +pubky = { path = "../pubky" } +pubky-common = { path = "../pubky-common" } +pubky-homeserver = { path = "../pubky-homeserver" } tokio = { version = "1.43.0", features = ["full"] } tracing-subscriber = "0.3.19" url = "2.5.4" diff --git a/pubky/Cargo.toml b/pubky/Cargo.toml index 513dcc8..fe58cf1 100644 --- a/pubky/Cargo.toml +++ b/pubky/Cargo.toml @@ -23,14 +23,16 @@ url = "2.5.4" bytes = "^1.10.0" base64 = "0.22.1" -pkarr = { version = "3.3.1", features = ["full"] } +pkarr = { git = "https://github.com/pubky/pkarr", rev = "4269e68", features = [ + "full", +] } # `main` pkarr a few commits after 3.3.1. cookie = "0.18.1" tracing = "0.1.41" cookie_store = { version = "0.21.1", default-features = false } anyhow = "1.0.95" flume = { version = "0.11.1", default-features = false, features = ["async"] } futures-util = "0.3.31" -pubky-common = "0.3.0" +pubky-common = { path = "../pubky-common" } # Native dependencies [target.'cfg(not(target_arch = "wasm32"))'.dependencies] @@ -57,7 +59,7 @@ web-sys = "0.3.77" [dev-dependencies] anyhow = "1.0.95" futures-lite = "2.6.0" -pubky-testnet = "0.1.0" +pubky-testnet = { path = "../pubky-testnet" } tokio = "1.43.0" tracing-subscriber = "0.3.19"