From 83a266d0be2084fdb06e4d3711f8fd389ad511a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cramfox=E2=80=9D?= <“kasey@n0.computer”> Date: Wed, 30 Jul 2025 21:28:05 -0400 Subject: [PATCH] chore: release prep for v0.26.0 --- Cargo.lock | 292 +++++++++++++++++++++++++++++++--------------------- Cargo.toml | 8 +- src/main.rs | 9 +- 3 files changed, 178 insertions(+), 131 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9358c0d..82eb91a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -271,12 +271,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597bb81c80a54b6a4381b23faba8d7774b144c94cbd1d6fe3f1329bd776554ab" -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - [[package]] name = "bitflags" version = "2.9.1" @@ -606,7 +600,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b" dependencies = [ "base64", - "bitflags 2.9.1", + "bitflags", "crossterm_winapi", "derive_more 2.0.1", "document-features", @@ -1251,15 +1245,6 @@ dependencies = [ "foldhash", ] -[[package]] -name = "hashlink" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" -dependencies = [ - "hashbrown", -] - [[package]] name = "heapless" version = "0.7.17" @@ -1490,7 +1475,7 @@ dependencies = [ "hyper", "libc", "pin-project-lite", - "socket2", + "socket2 0.5.9", "tokio", "tower-service", "tracing", @@ -1738,7 +1723,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2", + "socket2 0.5.9", "widestring", "windows-sys 0.48.0", "winreg", @@ -1752,8 +1737,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "iroh" -version = "0.90.0" -source = "git+https://github.com/n0-computer/iroh.git?branch=main#9c023bf4d7d1c3c10a9cc3b10df7e1a22c6ab7a4" +version = "0.91.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef05c956df0788a649d65c33fdbbb8fc4442d7716af3d67a1bd6d00a9ee56ead" dependencies = [ "aead", "backon", @@ -1762,7 +1748,7 @@ dependencies = [ "crypto_box", "data-encoding", "der", - "derive_more 1.0.0", + "derive_more 2.0.1", "ed25519-dalek", "futures-buffered", "futures-util", @@ -1771,7 +1757,7 @@ dependencies = [ "http 1.2.0", "igd-next", "instant", - "iroh-base 0.90.0 (git+https://github.com/n0-computer/iroh.git?branch=main)", + "iroh-base", "iroh-metrics", "iroh-quinn", "iroh-quinn-proto", @@ -1812,13 +1798,13 @@ dependencies = [ [[package]] name = "iroh-base" -version = "0.90.0" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e0090050c4055b21e61cbcb856f043a2b24ad22c65d76bab91f121b4c7bece3" +checksum = "f68b5c5e190d8965699b2fd583f301a7e6094a0b89bb4d6c5baa94761fd1b7a3" dependencies = [ "curve25519-dalek", "data-encoding", - "derive_more 1.0.0", + "derive_more 2.0.1", "ed25519-dalek", "n0-snafu", "nested_enum_utils", @@ -1829,27 +1815,11 @@ dependencies = [ "url", ] -[[package]] -name = "iroh-base" -version = "0.90.0" -source = "git+https://github.com/n0-computer/iroh.git?branch=main#9c023bf4d7d1c3c10a9cc3b10df7e1a22c6ab7a4" -dependencies = [ - "curve25519-dalek", - "data-encoding", - "derive_more 1.0.0", - "ed25519-dalek", - "n0-snafu", - "nested_enum_utils", - "rand_core 0.6.4", - "serde", - "snafu", - "url", -] - [[package]] name = "iroh-blobs" -version = "0.90.0" -source = "git+https://github.com/n0-computer/iroh-blobs.git?branch=main#c38c0a149c5f71bafe7b4479528d1265edc1a981" +version = "0.92.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02cf0037a1ad165d92fb7b84340fe7f51f8004d7c5a3eb1f0a906012082fe503" dependencies = [ "anyhow", "arrayvec", @@ -1858,13 +1828,11 @@ dependencies = [ "chrono", "data-encoding", "derive_more 2.0.1", - "futures-buffered", "futures-lite", "genawaiter", - "hashlink", "hex", "iroh", - "iroh-base 0.90.0 (registry+https://github.com/rust-lang/crates.io-index)", + "iroh-base", "iroh-io", "iroh-metrics", "iroh-quinn", @@ -1939,7 +1907,7 @@ dependencies = [ "pin-project-lite", "rustc-hash", "rustls", - "socket2", + "socket2 0.5.9", "thiserror 2.0.12", "tokio", "tracing", @@ -1976,27 +1944,29 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2", + "socket2 0.5.9", "tracing", "windows-sys 0.59.0", ] [[package]] name = "iroh-relay" -version = "0.90.0" -source = "git+https://github.com/n0-computer/iroh.git?branch=main#9c023bf4d7d1c3c10a9cc3b10df7e1a22c6ab7a4" +version = "0.91.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49596b5079817d0904fe4985307f532a4e23a33eb494bd680baaf2743f0c456b" dependencies = [ + "blake3", "bytes", "cfg_aliases", "data-encoding", - "derive_more 1.0.0", + "derive_more 2.0.1", "getrandom 0.3.3", "hickory-resolver", "http 1.2.0", "http-body-util", "hyper", "hyper-util", - "iroh-base 0.90.0 (git+https://github.com/n0-computer/iroh.git?branch=main)", + "iroh-base", "iroh-metrics", "iroh-quinn", "iroh-quinn-proto", @@ -2014,6 +1984,7 @@ dependencies = [ "rustls-pki-types", "rustls-webpki", "serde", + "serde_bytes", "sha1", "snafu", "strum", @@ -2030,9 +2001,9 @@ dependencies = [ [[package]] name = "irpc" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b355fe12226ee885e1c1056a867c2cf37be2b22032a16f5ab7091069e98a966f" +checksum = "a9f8f1d0987ea9da3d74698f921d0a817a214c83b2635a33ed4bc3efa4de1acd" dependencies = [ "anyhow", "futures-buffered", @@ -2053,9 +2024,9 @@ dependencies = [ [[package]] name = "irpc-derive" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efeabe1ee5615ea0416340b1a6d71a16f971495859c87fad48633b6497ee7a77" +checksum = "3e0b26b834d401a046dd9d47bc236517c746eddbb5d25ff3e1a6075bfa4eebdb" dependencies = [ "proc-macro2", "quote", @@ -2302,9 +2273,9 @@ dependencies = [ [[package]] name = "n0-watcher" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f216d4ebc5fcf9548244803cbb93f488a2ae160feba3706cd17040d69cf7a368" +checksum = "c31462392a10d5ada4b945e840cbec2d5f3fee752b96c4b33eb41414d8f45c2a" dependencies = [ "derive_more 1.0.0", "n0-future", @@ -2325,19 +2296,19 @@ dependencies = [ [[package]] name = "netdev" -version = "0.31.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f901362e84cd407be6f8cd9d3a46bccf09136b095792785401ea7d283c79b91d" +checksum = "862209dce034f82a44c95ce2b5183730d616f2a68746b9c1959aa2572e77c0a1" dependencies = [ "dlopen2", "ipnet", "libc", "netlink-packet-core", - "netlink-packet-route 0.17.1", + "netlink-packet-route 0.22.0", "netlink-sys", "once_cell", "system-configuration", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2353,26 +2324,27 @@ dependencies = [ [[package]] name = "netlink-packet-route" -version = "0.17.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66" +checksum = "fc0e7987b28514adf555dc1f9a5c30dfc3e50750bbaffb1aec41ca7b23dcd8e4" dependencies = [ "anyhow", - "bitflags 1.3.2", + "bitflags", "byteorder", "libc", + "log", "netlink-packet-core", "netlink-packet-utils", ] [[package]] name = "netlink-packet-route" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0800eae8638a299eaa67476e1c6b6692922273e0f7939fd188fc861c837b9cd2" +checksum = "56d83370a96813d7c977f8b63054f1162df6e5784f1c598d689236564fb5a6f2" dependencies = [ "anyhow", - "bitflags 2.9.1", + "bitflags", "byteorder", "libc", "log", @@ -2421,14 +2393,14 @@ dependencies = [ [[package]] name = "netwatch" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a829a830199b14989f9bccce6136ab928ab48336ab1f8b9002495dbbbb2edbe" +checksum = "8901dbb408894af3df3fc51420ba0c6faf3a7d896077b797c39b7001e2f787bd" dependencies = [ "atomic-waker", "bytes", "cfg_aliases", - "derive_more 1.0.0", + "derive_more 2.0.1", "iroh-quinn-udp", "js-sys", "libc", @@ -2437,19 +2409,19 @@ dependencies = [ "nested_enum_utils", "netdev", "netlink-packet-core", - "netlink-packet-route 0.23.0", + "netlink-packet-route 0.24.0", "netlink-proto", "netlink-sys", "pin-project-lite", "serde", "snafu", - "socket2", + "socket2 0.6.0", "time", "tokio", "tokio-util", "tracing", "web-sys", - "windows 0.59.0", + "windows 0.61.3", "windows-result 0.3.4", "wmi", ] @@ -2460,7 +2432,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.9.1", + "bitflags", "cfg-if", "cfg_aliases", "libc", @@ -2845,13 +2817,13 @@ checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" [[package]] name = "portmapper" -version = "0.6.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d82975dc029c00d566f4e0f61f567d31f0297a290cb5416b5580dd8b4b54ade" +checksum = "62f1975debe62a70557e42b9ff9466e4890cf9d3d156d296408a711f1c5f642b" dependencies = [ "base64", "bytes", - "derive_more 1.0.0", + "derive_more 2.0.1", "futures-lite", "futures-util", "hyper-util", @@ -2861,11 +2833,11 @@ dependencies = [ "nested_enum_utils", "netwatch", "num_enum", - "rand 0.8.5", + "rand 0.9.0", "serde", "smallvec", "snafu", - "socket2", + "socket2 0.6.0", "time", "tokio", "tokio-util", @@ -3026,7 +2998,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2", + "socket2 0.5.9", "thiserror 2.0.12", "tokio", "tracing", @@ -3061,7 +3033,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2", + "socket2 0.5.9", "tracing", "windows-sys 0.59.0", ] @@ -3193,7 +3165,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.9.1", + "bitflags", ] [[package]] @@ -3374,7 +3346,7 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.9.1", + "bitflags", "errno", "libc", "linux-raw-sys 0.4.15", @@ -3387,7 +3359,7 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" dependencies = [ - "bitflags 2.9.1", + "bitflags", "errno", "libc", "linux-raw-sys 0.9.4", @@ -3535,7 +3507,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" dependencies = [ - "bitflags 2.9.1", + "bitflags", "core-foundation 0.10.1", "core-foundation-sys", "libc", @@ -3610,6 +3582,15 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde_bytes" +version = "0.11.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8437fd221bde2d4ca316d61b90e337e9e702b3820b87d63caa9ba6c02bd06d96" +dependencies = [ + "serde", +] + [[package]] name = "serde_derive" version = "1.0.219" @@ -3759,7 +3740,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dee851d0e5e7af3721faea1843e8015e820a234f81fda3dea9247e15bac9a86a" dependencies = [ - "bitflags 2.9.1", + "bitflags", ] [[package]] @@ -3812,6 +3793,16 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "socket2" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + [[package]] name = "spin" version = "0.9.8" @@ -3845,23 +3836,22 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.26.3" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.26.4" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" dependencies = [ "heck", "proc-macro2", "quote", - "rustversion", "syn 2.0.98", ] @@ -3905,7 +3895,7 @@ dependencies = [ "parking_lot", "pnet_packet", "rand 0.8.5", - "socket2", + "socket2 0.5.9", "thiserror 1.0.69", "tokio", "tracing", @@ -3970,7 +3960,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 2.9.1", + "bitflags", "core-foundation 0.9.4", "system-configuration-sys", ] @@ -4122,7 +4112,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.9", "tokio-macros", "windows-sys 0.52.0", ] @@ -4179,9 +4169,9 @@ dependencies = [ [[package]] name = "tokio-websockets" -version = "0.11.4" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fcaf159b4e7a376b05b5bfd77bfd38f3324f5fce751b4213bfc7eaa47affb4e" +checksum = "3f29ba084eb43becc9864ba514b4a64f5f65b82f9a6ffbafa5436c1c80605f03" dependencies = [ "base64", "bytes", @@ -4665,25 +4655,28 @@ dependencies = [ [[package]] name = "windows" -version = "0.59.0" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f919aee0a93304be7f62e8e5027811bbba96bcb1de84d6618be56e43f8a32a1" +checksum = "ddf874e74c7a99773e62b1c671427abf01a425e77c3d3fb9fb1e4883ea934529" dependencies = [ - "windows-core 0.59.0", - "windows-targets 0.53.2", + "windows-collections 0.1.1", + "windows-core 0.60.1", + "windows-future 0.1.1", + "windows-link", + "windows-numerics 0.1.1", ] [[package]] name = "windows" -version = "0.60.0" +version = "0.61.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf874e74c7a99773e62b1c671427abf01a425e77c3d3fb9fb1e4883ea934529" +checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" dependencies = [ - "windows-collections", - "windows-core 0.60.1", - "windows-future", + "windows-collections 0.2.0", + "windows-core 0.61.2", + "windows-future 0.2.1", "windows-link", - "windows-numerics", + "windows-numerics 0.2.0", ] [[package]] @@ -4695,6 +4688,15 @@ dependencies = [ "windows-core 0.60.1", ] +[[package]] +name = "windows-collections" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" +dependencies = [ + "windows-core 0.61.2", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -4719,28 +4721,28 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.59.0" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ce18ed2112484b0d4e15d022e5f598113e220c53e373fb31e67e21670c1ce" +checksum = "ca21a92a9cae9bf4ccae5cf8368dce0837100ddf6e6d57936749e85f152f6247" dependencies = [ "windows-implement 0.59.0", "windows-interface 0.59.1", + "windows-link", "windows-result 0.3.4", "windows-strings 0.3.1", - "windows-targets 0.53.2", ] [[package]] name = "windows-core" -version = "0.60.1" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca21a92a9cae9bf4ccae5cf8368dce0837100ddf6e6d57936749e85f152f6247" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ - "windows-implement 0.59.0", + "windows-implement 0.60.0", "windows-interface 0.59.1", "windows-link", "windows-result 0.3.4", - "windows-strings 0.3.1", + "windows-strings 0.4.2", ] [[package]] @@ -4753,6 +4755,17 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-future" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" +dependencies = [ + "windows-core 0.61.2", + "windows-link", + "windows-threading", +] + [[package]] name = "windows-implement" version = "0.58.0" @@ -4775,6 +4788,17 @@ dependencies = [ "syn 2.0.98", ] +[[package]] +name = "windows-implement" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.98", +] + [[package]] name = "windows-interface" version = "0.58.0" @@ -4813,6 +4837,16 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-numerics" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" +dependencies = [ + "windows-core 0.61.2", + "windows-link", +] + [[package]] name = "windows-registry" version = "0.4.0" @@ -4861,6 +4895,15 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-strings" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -4959,6 +5002,15 @@ dependencies = [ "windows_x86_64_msvc 0.53.0", ] +[[package]] +name = "windows-threading" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" +dependencies = [ + "windows-link", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -5164,22 +5216,22 @@ version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" dependencies = [ - "bitflags 2.9.1", + "bitflags", ] [[package]] name = "wmi" -version = "0.14.5" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7787dacdd8e71cbc104658aade4009300777f9b5fda6a75f19145fedb8a18e71" +checksum = "3d3de777dce4cbcdc661d5d18e78ce4b46a37adc2bb7c0078a556c7f07bcce2f" dependencies = [ "chrono", "futures", "log", "serde", "thiserror 2.0.12", - "windows 0.59.0", - "windows-core 0.59.0", + "windows 0.61.3", + "windows-core 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 4c7fd5a..47eb980 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,8 +24,8 @@ derive_more = { version = "1.0.0", features = [ # I had some issues with futures-buffered 0.2.9 futures-buffered = "0.2.11" indicatif = "0.17.7" -iroh-blobs = { version = "0.90" } -iroh = "0.90" +iroh-blobs = { version = "0.92" } +iroh = "0.91" num_cpus = "1.16.0" rand = "0.8.5" serde = { version = "1", features = ["derive"] } @@ -57,7 +57,3 @@ tempfile = "3.8.1" [features] clipboard = ["dep:crossterm", "dep:windows-sys", "dep:libc"] default = ["clipboard"] - -[patch.crates-io] -iroh = { git = "https://github.com/n0-computer/iroh.git", branch = "main" } -iroh-blobs = { git = "https://github.com/n0-computer/iroh-blobs.git", branch = "main" } diff --git a/src/main.rs b/src/main.rs index 5afb499..b0d16c5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -35,11 +35,10 @@ use iroh_blobs::{ }, format::collection::Collection, get::{request::get_hash_seq_and_sizes, GetError, Stats}, - net_protocol::Blobs, provider::{self, Event}, store::fs::FsStore, ticket::BlobTicket, - BlobFormat, Hash, + BlobFormat, BlobsProtocol, Hash, }; use n0_future::{task::AbortOnDropHandle, StreamExt}; use rand::Rng; @@ -695,7 +694,7 @@ async fn send(args: SendArgs) -> anyhow::Result<()> { }; mp.set_draw_target(draw_target); let store = FsStore::load(&blobs_data_dir2).await?; - let blobs = Blobs::new(&store, endpoint.clone(), Some(progress_tx)); + let blobs = BlobsProtocol::new(&store, endpoint.clone(), Some(progress_tx)); let import_result = import(path2, blobs.store(), &mut mp).await?; let dt = t0.elapsed(); @@ -704,7 +703,7 @@ async fn send(args: SendArgs) -> anyhow::Result<()> { .accept(iroh_blobs::ALPN, blobs.clone()) .spawn(); // wait for the endpoint to figure out its address before making a ticket - let _ = router.endpoint().home_relay().initialized().await?; + let _ = router.endpoint().home_relay().initialized().await; anyhow::Ok((router, import_result, dt)) }; let (router, (temp_tag, size, collection), dt) = select! { @@ -716,7 +715,7 @@ async fn send(args: SendArgs) -> anyhow::Result<()> { let hash = *temp_tag.hash(); // make a ticket - let mut addr = router.endpoint().node_addr().initialized().await?; + let mut addr = router.endpoint().node_addr().initialized().await; apply_options(&mut addr, args.ticket_type); let ticket = BlobTicket::new(addr, hash, BlobFormat::HashSeq); let entry_type = if path.is_file() { "file" } else { "directory" };