From 6c1007cbe0b545a63021f0bfc46503d33fce7ba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cramfox=E2=80=9D?= <“kasey@n0.computer”> Date: Mon, 3 Nov 2025 19:59:03 -0500 Subject: [PATCH 1/2] chore: add patch for `iroh` dependencies Updates the following dependencies to use their main branches: - `iroh` from `https://github.com/n0-computer/iroh.git` - `irpc` from `https://github.com/n0-computer/irpc.git` - `iroh-blobs` from `https://github.com/n0-computer/iroh-blobs.git` --- Cargo.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 4e32271..8cdde18 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,3 +66,8 @@ codegen-units = 1 lto = true debug = "none" strip = true + +[patch.crates-io] +iroh = { git = "https://github.com/n0-computer/iroh.git", branch = "main" } +irpc = { git = "https://github.com/n0-computer/irpc.git", branch = "patch-iroh-main" } +iroh-blobs = { git = "https://github.com/n0-computer/iroh-blobs.git", branch = "patch-iroh-main" } From dda3a221590f54495a594ea5ec7c4991354338c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cramfox=E2=80=9D?= <“kasey@n0.computer”> Date: Wed, 5 Nov 2025 22:11:28 -0500 Subject: [PATCH 2/2] chore: upgrade `iroh`, `irpc, `iroh-blobs` --- Cargo.lock | 125 +++++++++++++++++++++++++++++++---------------------- Cargo.toml | 11 ++--- 2 files changed, 76 insertions(+), 60 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 062fd92..5a24bde 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -219,9 +219,9 @@ dependencies = [ [[package]] name = "bao-tree" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff16d65e48353db458be63ee395c03028f24564fd48668389bd65fd945f5ac36" +checksum = "06384416b1825e6e04fde63262fda2dc408f5b64c02d04e0d8b70ae72c17a52b" dependencies = [ "blake3", "bytes", @@ -1615,9 +1615,9 @@ dependencies = [ [[package]] name = "iroh" -version = "0.94.0" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9428cef1eafd2eac584269986d1949e693877ac12065b401dfde69f664b07ac" +checksum = "2374ba3cdaac152dc6ada92d971f7328e6408286faab3b7350842b2ebbed4789" dependencies = [ "aead", "backon", @@ -1639,10 +1639,9 @@ dependencies = [ "iroh-quinn-proto", "iroh-quinn-udp", "iroh-relay", + "n0-error", "n0-future", - "n0-snafu", "n0-watcher", - "nested_enum_utils", "netdev", "netwatch", "pin-project", @@ -1657,7 +1656,6 @@ dependencies = [ "rustls-webpki", "serde", "smallvec", - "snafu", "strum", "time", "tokio", @@ -1672,19 +1670,17 @@ dependencies = [ [[package]] name = "iroh-base" -version = "0.94.0" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db942f6f3d6fa9b475690c6e8e6684d60591dd886bf1bdfef4c60d89d502215c" +checksum = "25a8c5fb1cc65589f0d7ab44269a76f615a8c4458356952c9b0ef1c93ea45ff8" dependencies = [ "curve25519-dalek", "data-encoding", "derive_more 2.0.1", "ed25519-dalek", - "n0-snafu", - "nested_enum_utils", + "n0-error", "rand_core 0.9.3", "serde", - "snafu", "url", "zeroize", "zeroize_derive", @@ -1692,14 +1688,15 @@ dependencies = [ [[package]] name = "iroh-blobs" -version = "0.96.0" +version = "0.97.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a58699e59c2deb116df7420bc6755bf5f445603f71998f274a99f1985a5bc5" +checksum = "c901304c1c28f257fcf9aae8c9149e54e0baf62f5eb2788cecde3bf1206a04e6" dependencies = [ "anyhow", "arrayvec", "bao-tree", "bytes", + "cfg_aliases", "chrono", "data-encoding", "derive_more 2.0.1", @@ -1713,6 +1710,7 @@ dependencies = [ "iroh-quinn", "iroh-tickets", "irpc", + "n0-error", "n0-future", "n0-snafu", "nested_enum_utils", @@ -1727,7 +1725,6 @@ dependencies = [ "smallvec", "snafu", "tokio", - "tokio-util", "tracing", ] @@ -1746,24 +1743,24 @@ dependencies = [ [[package]] name = "iroh-metrics" -version = "0.36.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090161e84532a0cb78ab13e70abb882b769ec67cf5a2d2dcea39bd002e1f7172" +checksum = "79e3381da7c93c12d353230c74bba26131d1c8bf3a4d8af0fec041546454582e" dependencies = [ "iroh-metrics-derive", "itoa", + "n0-error", "postcard", "ryu", "serde", - "snafu", "tracing", ] [[package]] name = "iroh-metrics-derive" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a39de3779d200dadde3a27b9fbdb34389a2af1b85ea445afca47bf4d7672573" +checksum = "d4e12bd0763fd16062f5cc5e8db15dd52d26e75a8af4c7fb57ccee3589b344b8" dependencies = [ "heck", "proc-macro2", @@ -1828,9 +1825,9 @@ dependencies = [ [[package]] name = "iroh-relay" -version = "0.94.0" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360e201ab1803201de9a125dd838f7a4d13e6ba3a79aeb46c7fbf023266c062e" +checksum = "43fbdf2aeffa7d6ede1a31f6570866c2199b1cee96a0b563994623795d1bac2c" dependencies = [ "blake3", "bytes", @@ -1848,9 +1845,8 @@ dependencies = [ "iroh-quinn", "iroh-quinn-proto", "lru 0.16.1", + "n0-error", "n0-future", - "n0-snafu", - "nested_enum_utils", "num_enum", "pin-project", "pkarr", @@ -1862,7 +1858,6 @@ dependencies = [ "serde", "serde_bytes", "sha1", - "snafu", "strum", "tokio", "tokio-rustls", @@ -1877,38 +1872,35 @@ dependencies = [ [[package]] name = "iroh-tickets" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7683c7819693eb8b3d61d1d45ffa92e2faeb07762eb0c3debb50ad795538d221" +checksum = "1a322053cacddeca222f0999ce3cf6aa45c64ae5ad8c8911eac9b66008ffbaa5" dependencies = [ "data-encoding", "derive_more 2.0.1", "iroh-base", - "n0-snafu", - "nested_enum_utils", + "n0-error", "postcard", "serde", - "snafu", ] [[package]] name = "irpc" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52cf44fdb253f2a3e22e5ecfa8efa466929f8b7cdd4fc0f958f655406e8cdab6" +checksum = "0bee97aaa18387c4f0aae61058195dc9f9dea3e41c0e272973fe3e9bf611563d" dependencies = [ - "anyhow", "futures-buffered", "futures-util", "iroh-quinn", "irpc-derive", + "n0-error", "n0-future", "postcard", "rcgen", "rustls", "serde", "smallvec", - "thiserror 2.0.16", "tokio", "tokio-util", "tracing", @@ -1916,9 +1908,9 @@ dependencies = [ [[package]] name = "irpc-derive" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969df6effc474e714fb7e738eb9859aa22f40dc2280cadeab245817075c7f273" +checksum = "58148196d2230183c9679431ac99b57e172000326d664e8456fa2cd27af6505a" dependencies = [ "proc-macro2", "quote", @@ -2104,6 +2096,29 @@ dependencies = [ "uuid", ] +[[package]] +name = "n0-error" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a4839a11b62f1fdd75be912ee20634053c734c2240e867ded41c7f50822c549" +dependencies = [ + "derive_more 2.0.1", + "n0-error-macros", + "spez", +] + +[[package]] +name = "n0-error-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed2a7e5ca3cb5729d4a162d7bcab5b338bed299a2fee8457568d7e0a747ed89" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "n0-future" version = "0.3.0" @@ -2140,13 +2155,13 @@ dependencies = [ [[package]] name = "n0-watcher" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34c65e127e06e5a2781b28df6a33ea474a7bddc0ac0cfea888bd20c79a1b6516" +checksum = "38acf13c1ddafc60eb7316d52213467f8ccb70b6f02b65e7d97f7799b1f50be4" dependencies = [ "derive_more 2.0.1", + "n0-error", "n0-future", - "snafu", ] [[package]] @@ -2228,9 +2243,9 @@ dependencies = [ [[package]] name = "netwatch" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98d7ec7abdbfe67ee70af3f2002326491178419caea22254b9070e6ff0c83491" +checksum = "26f2acd376ef48b6c326abf3ba23c449e0cb8aa5c2511d189dd8a8a3bfac889b" dependencies = [ "atomic-waker", "bytes", @@ -2239,9 +2254,9 @@ dependencies = [ "iroh-quinn-udp", "js-sys", "libc", + "n0-error", "n0-future", "n0-watcher", - "nested_enum_utils", "netdev", "netlink-packet-core", "netlink-packet-route", @@ -2249,7 +2264,6 @@ dependencies = [ "netlink-sys", "pin-project-lite", "serde", - "snafu", "socket2 0.6.0", "time", "tokio", @@ -2552,9 +2566,9 @@ checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "portmapper" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d73aa9bd141e0ff6060fea89a5437883f3b9ceea1cda71c790b90e17d072a3b3" +checksum = "7b575f975dcf03e258b0c7ab3f81497d7124f508884c37da66a7314aa2a8d467" dependencies = [ "base64", "bytes", @@ -2565,13 +2579,12 @@ dependencies = [ "igd-next", "iroh-metrics", "libc", - "nested_enum_utils", + "n0-error", "netwatch", "num_enum", "rand 0.9.2", "serde", "smallvec", - "snafu", "socket2 0.6.0", "time", "tokio", @@ -2583,9 +2596,9 @@ dependencies = [ [[package]] name = "positioned-io" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8078ce4d22da5e8f57324d985cc9befe40c49ab0507a192d6be9e59584495c9" +checksum = "d4ec4b80060f033312b99b6874025d9503d2af87aef2dd4c516e253fbfcdada7" dependencies = [ "libc", "winapi", @@ -3455,6 +3468,17 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "spez" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c87e960f4dca2788eeb86bbdde8dd246be8948790b7618d656e68f9b720a86e8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "spin" version = "0.9.8" @@ -3776,12 +3800,9 @@ checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" dependencies = [ "bytes", "futures-core", - "futures-io", "futures-sink", "futures-util", - "hashbrown", "pin-project-lite", - "slab", "tokio", ] diff --git a/Cargo.toml b/Cargo.toml index 8cdde18..c48ee25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,8 +24,8 @@ derive_more = { version = "2.0.1", features = [ # I had some issues with futures-buffered 0.2.9 futures-buffered = "0.2.11" indicatif = "0.17.7" -iroh-blobs = { version = "0.96" } -iroh = "0.94" +iroh-blobs = { version = "0.97" } +iroh = "0.95" num_cpus = "1.16.0" rand = "0.9.2" serde = { version = "1", features = ["derive"] } @@ -40,7 +40,7 @@ crossterm = { version = "0.29.0", features = [ "event-stream", "osc52", ], optional = true } -irpc = "0.10.0" +irpc = "0.11.0" [target.'cfg(unix)'.dependencies] libc = { version = "0.2.174", optional = true } @@ -66,8 +66,3 @@ codegen-units = 1 lto = true debug = "none" strip = true - -[patch.crates-io] -iroh = { git = "https://github.com/n0-computer/iroh.git", branch = "main" } -irpc = { git = "https://github.com/n0-computer/irpc.git", branch = "patch-iroh-main" } -iroh-blobs = { git = "https://github.com/n0-computer/iroh-blobs.git", branch = "patch-iroh-main" }