diff --git a/Cargo.lock b/Cargo.lock index a80056f..b3297bb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -121,9 +121,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "arrayref" @@ -228,9 +228,9 @@ checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "aws-config" -version = "1.1.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297b64446175a73987cedc3c438d79b2a654d0fff96f65ff530fbe039347644c" +checksum = "48730d0b4c3d91c43d0d37168831d9fd0e065ad4a889a2ee9faf8d34c3d2804d" dependencies = [ "aws-credential-types", "aws-runtime", @@ -271,9 +271,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b13dc54b4b49f8288532334bba8f87386a40571c47c37b1304979b556dc613c8" +checksum = "c4ee6903f9d0197510eb6b44c4d86b493011d08b4992938f7b9be0333b6685aa" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -295,9 +295,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.21.0" +version = "1.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc075ffee2a40cb1590bed35d7ec953589a564e768fa91947c565425cd569269" +checksum = "644c5939c1b78097d37f3341708978d68490070d4b0f8fa91f0878678c06a7ef" dependencies = [ "ahash", "aws-credential-types", @@ -330,9 +330,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "019a07902c43b03167ea5df0182f0cb63fae89f9a9682c44d18cf2e4a042cb34" +checksum = "b2be5ba83b077b67a6f7a1927eb6b212bf556e33bd74b5eaa5aa6e421910803a" dependencies = [ "aws-credential-types", "aws-runtime", @@ -352,9 +352,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c46ee08a48a7f4eaa4ad201dcc1dd537b49c50859d14d4510e00ad9d3f9af2" +checksum = "022ca669825f841aef17b12d4354ef2b8651e4664be49f2d9ea13e4062a80c9f" dependencies = [ "aws-credential-types", "aws-runtime", @@ -374,9 +374,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f752ac730125ca6017f72f9db5ec1772c9ecc664f87aa7507a7d81b023c23713" +checksum = "8e4a5f5cb007347c1ab34a6d56456301dfada921fc9e57d687ecb08baddd11ff" dependencies = [ "aws-credential-types", "aws-runtime", @@ -587,9 +587,9 @@ dependencies = [ [[package]] name = "aws-types" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dbf2f3da841a8930f159163175cf6a3d16ddde517c1b0fba7aa776822800f40" +checksum = "afb278e322f16f59630a83b6b2dc992a0b48aa74ed47b4130f193fae0053d713" dependencies = [ "aws-credential-types", "aws-smithy-async", @@ -626,7 +626,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper 1.0.0", + "sync_wrapper 1.0.1", "tokio", "tower", "tower-layer", @@ -683,28 +683,21 @@ dependencies = [ [[package]] name = "bao-tree" -version = "0.11.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdae307defb220bd2698a42495e226ff89e3173f024abfc2182129603e74b5c7" +checksum = "f1f7a89a8ee5889d2593ae422ce6e1bb03e48a0e8a16e4fa0882dfcbe7e182ef" dependencies = [ "bytes", - "futures", + "futures-lite", "genawaiter", "iroh-blake3", - "iroh-io", + "iroh-io 0.6.0", "positioned-io", "range-collections", "self_cell", "smallvec", - "tokio", ] -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - [[package]] name = "base16ct" version = "0.1.1" @@ -795,9 +788,9 @@ checksum = "78a6932c88f1d2c29533a3b8a5f5a2f84cc19c3339b431677c3160c5c2e6ca85" [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -826,9 +819,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.90" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" [[package]] name = "cfg-if" @@ -993,9 +986,9 @@ dependencies = [ [[package]] name = "crc" -version = "3.0.1" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" dependencies = [ "crc-catalog", ] @@ -1144,26 +1137,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" -[[package]] -name = "data-encoding-macro" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c01c06f5f429efdf2bae21eb67c28b3df3cf85b7dd2d8ef09c0838dac5d33e" -dependencies = [ - "data-encoding", - "data-encoding-macro-internal", -] - -[[package]] -name = "data-encoding-macro-internal" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0047d07f2c89b17dd631c80450d69841a6b5d7fb17278cbc43d7e4cfcf2576f3" -dependencies = [ - "data-encoding", - "syn 1.0.109", -] - [[package]] name = "default-net" version = "0.20.0" @@ -1427,9 +1400,9 @@ checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -1645,6 +1618,19 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + [[package]] name = "futures-macro" version = "0.3.30" @@ -1736,9 +1722,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "js-sys", @@ -1830,15 +1816,6 @@ dependencies = [ "allocator-api2", ] -[[package]] -name = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown", -] - [[package]] name = "hashlink" version = "0.9.0" @@ -2223,34 +2200,30 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "iroh" version = "0.13.0" -source = "git+https://github.com/izihawa/iroh?branch=main#f811a0a3366f6701e62d729f5b96b95a4b804621" +source = "git+https://github.com/izihawa/iroh?branch=main#b5e4ce387db4a3265a1112cb80a0856cd61afd32" dependencies = [ "anyhow", "bao-tree", "bytes", - "data-encoding", "derive_more", "flume", "futures", "genawaiter", - "hashlink 0.8.4", "hex", "iroh-base", "iroh-bytes", "iroh-gossip", - "iroh-io", + "iroh-io 0.6.0", "iroh-metrics", "iroh-net", "iroh-sync", "num_cpus", - "once_cell", "parking_lot", "portable-atomic", "postcard", "quic-rpc", "quinn", "rand", - "range-collections", "serde", "strum", "tempfile", @@ -2265,7 +2238,7 @@ dependencies = [ [[package]] name = "iroh-base" version = "0.13.0" -source = "git+https://github.com/izihawa/iroh?branch=main#f811a0a3366f6701e62d729f5b96b95a4b804621" +source = "git+https://github.com/izihawa/iroh?branch=main#b5e4ce387db4a3265a1112cb80a0856cd61afd32" dependencies = [ "aead", "anyhow", @@ -2275,7 +2248,6 @@ dependencies = [ "derive_more", "ed25519-dalek", "hex", - "multibase", "once_cell", "postcard", "rand", @@ -2306,26 +2278,24 @@ dependencies = [ [[package]] name = "iroh-bytes" version = "0.13.0" -source = "git+https://github.com/izihawa/iroh?branch=main#f811a0a3366f6701e62d729f5b96b95a4b804621" +source = "git+https://github.com/izihawa/iroh?branch=main#b5e4ce387db4a3265a1112cb80a0856cd61afd32" dependencies = [ "anyhow", "bao-tree", "bytes", "chrono", - "data-encoding", "derive_more", "flume", "futures", "futures-buffered", "genawaiter", - "hashlink 0.9.0", + "hashlink", "hex", "iroh-base", - "iroh-io", + "iroh-io 0.6.0", "iroh-metrics", "iroh-net", "num_cpus", - "once_cell", "parking_lot", "postcard", "quinn", @@ -2336,7 +2306,6 @@ dependencies = [ "reflink-copy", "self_cell", "serde", - "serde-error", "smallvec", "tempfile", "thiserror", @@ -2349,11 +2318,10 @@ dependencies = [ [[package]] name = "iroh-gossip" version = "0.13.0" -source = "git+https://github.com/izihawa/iroh?branch=main#f811a0a3366f6701e62d729f5b96b95a4b804621" +source = "git+https://github.com/izihawa/iroh?branch=main#b5e4ce387db4a3265a1112cb80a0856cd61afd32" dependencies = [ "anyhow", "bytes", - "data-encoding", "derive_more", "ed25519-dalek", "futures", @@ -2363,7 +2331,6 @@ dependencies = [ "iroh-blake3", "iroh-metrics", "iroh-net", - "once_cell", "postcard", "quinn", "rand", @@ -2387,10 +2354,23 @@ dependencies = [ "tokio", ] +[[package]] +name = "iroh-io" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d1047ad5ca29ab4ff316b6830d86e7ea52cea54325e4d4a849692e1274b498" +dependencies = [ + "bytes", + "futures-lite", + "pin-project", + "smallvec", + "tokio", +] + [[package]] name = "iroh-metrics" version = "0.13.0" -source = "git+https://github.com/izihawa/iroh?branch=main#f811a0a3366f6701e62d729f5b96b95a4b804621" +source = "git+https://github.com/izihawa/iroh?branch=main#b5e4ce387db4a3265a1112cb80a0856cd61afd32" dependencies = [ "anyhow", "erased_set", @@ -2410,14 +2390,12 @@ dependencies = [ [[package]] name = "iroh-net" version = "0.13.0" -source = "git+https://github.com/izihawa/iroh?branch=main#f811a0a3366f6701e62d729f5b96b95a4b804621" +source = "git+https://github.com/izihawa/iroh?branch=main#b5e4ce387db4a3265a1112cb80a0856cd61afd32" dependencies = [ "aead", "anyhow", "backoff", "bytes", - "curve25519-dalek", - "data-encoding", "default-net", "der 0.7.9", "derive_more", @@ -2427,7 +2405,6 @@ dependencies = [ "governor", "hex", "hickory-resolver", - "hostname", "http 1.1.0", "http-body-util", "hyper 1.2.0", @@ -2455,11 +2432,8 @@ dependencies = [ "rustls", "rustls-webpki", "serde", - "serde_bytes", - "serdect", "smallvec", "socket2", - "strum", "stun-rs", "surge-ping", "thiserror", @@ -2480,11 +2454,10 @@ dependencies = [ [[package]] name = "iroh-sync" version = "0.13.0" -source = "git+https://github.com/izihawa/iroh?branch=main#f811a0a3366f6701e62d729f5b96b95a4b804621" +source = "git+https://github.com/izihawa/iroh?branch=main#b5e4ce387db4a3265a1112cb80a0856cd61afd32" dependencies = [ "anyhow", "bytes", - "data-encoding", "derive_more", "ed25519-dalek", "flume", @@ -2494,9 +2467,7 @@ dependencies = [ "iroh-blake3", "iroh-metrics", "iroh-net", - "lru", "num_enum", - "once_cell", "parking_lot", "postcard", "quinn", @@ -2512,7 +2483,6 @@ dependencies = [ "tokio-stream", "tokio-util", "tracing", - "url", ] [[package]] @@ -2688,17 +2658,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "multibase" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b3539ec3c1f04ac9748a260728e855f261b4977f5c3406612c884564f329404" -dependencies = [ - "base-x", - "data-encoding", - "data-encoding-macro", -] - [[package]] name = "nanorand" version = "0.7.0" @@ -3071,11 +3030,11 @@ dependencies = [ [[package]] name = "pem" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" dependencies = [ - "base64 0.21.7", + "base64 0.22.0", "serde", ] @@ -3519,9 +3478,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -3593,7 +3552,7 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52c4f3084aa3bc7dfbba4eff4fab2a54db4324965d8872ab933565e6fbd83bc6" dependencies = [ - "pem 3.0.3", + "pem 3.0.4", "ring 0.16.20", "time", "yasna", @@ -3938,9 +3897,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "ryu" @@ -4072,15 +4031,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_bytes" -version = "0.11.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" -dependencies = [ - "serde", -] - [[package]] name = "serde_derive" version = "1.0.197" @@ -4476,9 +4426,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sync_wrapper" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384595c11a4e2969895cad5a8c4029115f5ab956a9e5ef4de79d11a426e5f20c" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "synstructure" @@ -4557,9 +4507,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -4578,9 +4528,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -4869,7 +4819,7 @@ dependencies = [ "futures", "iroh", "iroh-base", - "iroh-io", + "iroh-io 0.4.0", "lru", "md5", "percent-encoding", @@ -5158,9 +5108,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "widestring" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi"