From df65d79def94ccc07605258c635fa0f5f649c298 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cramfox=E2=80=9D?= <“kasey@n0.computer”> Date: Thu, 18 Sep 2025 14:54:34 -0400 Subject: [PATCH 1/3] chore: upgrade `n0-snafu` --- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 988d7955a..6d11c0de2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2196,9 +2196,9 @@ dependencies = [ [[package]] name = "n0-snafu" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4fed465ff57041f29db78a9adc8864296ef93c6c16029f9e192dc303404ebd0" +checksum = "1815107e577a95bfccedb4cfabc73d709c0db6d12de3f14e0f284a8c5036dc4f" dependencies = [ "anyhow", "btparse", diff --git a/Cargo.toml b/Cargo.toml index 2c6d8754a..c0d0618ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ derive_more = { version = "2.0.1", features = ["from", "try_from", "into", "debu futures-lite = "2.6.0" quinn = { package = "iroh-quinn", version = "0.14.0" } n0-future = "0.2.0" -n0-snafu = "0.2.0" +n0-snafu = "0.2.2" range-collections = { version = "0.4.6", features = ["serde"] } smallvec = { version = "1", features = ["serde", "const_new"] } snafu = "0.8.5" @@ -69,4 +69,4 @@ fs-store = ["dep:redb", "dep:reflink-copy"] [patch.crates-io] iroh = { git = "https://github.com/n0-computer/iroh", branch = "main" } -iroh-base = { git = "https://github.com/n0-computer/iroh", branch = "main" } \ No newline at end of file +iroh-base = { git = "https://github.com/n0-computer/iroh", branch = "main" } From f8bdd62c4e0659e0b97a02a03d36dc973dc892b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cramfox=E2=80=9D?= <“kasey@n0.computer”> Date: Thu, 18 Sep 2025 17:17:00 -0400 Subject: [PATCH 2/3] chore: upgrade iroh, iroh-base, irpc, n0-snafu, and tracing-subscriber --- Cargo.lock | 52 ++++++++++++++++++++++++++++++++++++---------------- Cargo.toml | 14 +++++--------- 2 files changed, 41 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6d11c0de2..025c289f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1658,8 +1658,9 @@ dependencies = [ [[package]] name = "iroh" -version = "0.91.1" -source = "git+https://github.com/n0-computer/iroh?branch=main#e30c788f968265bd9d181e5ca92d02eb61ef3d0d" +version = "0.92.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "135ad6b793a5851b9e5435ad36fea63df485f8fd4520a58117e7dc3326a69c15" dependencies = [ "aead", "backon", @@ -1687,7 +1688,7 @@ dependencies = [ "n0-snafu", "n0-watcher", "nested_enum_utils", - "netdev", + "netdev 0.36.0", "netwatch", "pin-project", "pkarr", @@ -1719,8 +1720,9 @@ dependencies = [ [[package]] name = "iroh-base" -version = "0.91.1" -source = "git+https://github.com/n0-computer/iroh?branch=main#e30c788f968265bd9d181e5ca92d02eb61ef3d0d" +version = "0.92.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04ae51a14c9255a735b1db2d8cf29b875b971e96a5b23e4d0d1ee7d85bf32132" dependencies = [ "curve25519-dalek", "data-encoding", @@ -1881,8 +1883,9 @@ dependencies = [ [[package]] name = "iroh-relay" -version = "0.91.1" -source = "git+https://github.com/n0-computer/iroh?branch=main#e30c788f968265bd9d181e5ca92d02eb61ef3d0d" +version = "0.92.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "315cb02e660de0de339303296df9a29b27550180bb3979d0753a267649b34a7f" dependencies = [ "blake3", "bytes", @@ -1942,9 +1945,9 @@ dependencies = [ [[package]] name = "irpc" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9f8f1d0987ea9da3d74698f921d0a817a214c83b2635a33ed4bc3efa4de1acd" +checksum = "092c0b20697bbc7de4839eebcb49be975cc09221021626d301eea55fc10bfeb7" dependencies = [ "anyhow", "futures-buffered", @@ -1965,9 +1968,9 @@ dependencies = [ [[package]] name = "irpc-derive" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0b26b834d401a046dd9d47bc236517c746eddbb5d25ff3e1a6075bfa4eebdb" +checksum = "209d38d83c0f7043916e90de2d3a8d01035db3a2f49ea7d5fb41b8f43e889924" dependencies = [ "proc-macro2", "quote", @@ -2247,6 +2250,23 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "netdev" +version = "0.37.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daa1e3eaf125c54c21e6221df12dd2a0a682784a068782dd564c836c0f281b6d" +dependencies = [ + "dlopen2", + "ipnet", + "libc", + "netlink-packet-core", + "netlink-packet-route 0.22.0", + "netlink-sys", + "once_cell", + "system-configuration", + "windows-sys 0.59.0", +] + [[package]] name = "netlink-packet-core" version = "0.7.0" @@ -2329,9 +2349,9 @@ dependencies = [ [[package]] name = "netwatch" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901dbb408894af3df3fc51420ba0c6faf3a7d896077b797c39b7001e2f787bd" +checksum = "8a63d76f52f3f15ebde3ca751a2ab73a33ae156662bc04383bac8e824f84e9bb" dependencies = [ "atomic-waker", "bytes", @@ -2343,7 +2363,7 @@ dependencies = [ "n0-future 0.1.3", "n0-watcher", "nested_enum_utils", - "netdev", + "netdev 0.37.3", "netlink-packet-core", "netlink-packet-route 0.24.0", "netlink-proto", @@ -2714,9 +2734,9 @@ checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "portmapper" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f1975debe62a70557e42b9ff9466e4890cf9d3d156d296408a711f1c5f642b" +checksum = "a9f99e8cd25cd8ee09fc7da59357fd433c0a19272956ebb4ad7443b21842988d" dependencies = [ "base64", "bytes", diff --git a/Cargo.toml b/Cargo.toml index c0d0618ea..28847252b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,11 +36,11 @@ chrono = "0.4.39" nested_enum_utils = "0.2.1" ref-cast = "1.0.24" arrayvec = "0.7.6" -iroh = "0.91.1" +iroh = "0.92" self_cell = "1.1.0" genawaiter = { version = "0.99.1", features = ["futures03"] } -iroh-base = "0.91.1" -irpc = { version = "0.7.0", features = ["rpc", "quinn_endpoint_setup", "spans", "stream", "derive"], default-features = false } +iroh-base = "0.92" +irpc = { version = "0.8.0", features = ["rpc", "quinn_endpoint_setup", "spans", "stream", "derive"], default-features = false } iroh-metrics = { version = "0.35" } redb = { version = "=2.4", optional = true } reflink-copy = { version = "0.1.24", optional = true } @@ -55,18 +55,14 @@ serde_test = "1.0.177" tempfile = "3.17.1" test-strategy = "0.4.0" testresult = "0.4.1" -tracing-subscriber = { version = "0.3.19", features = ["fmt"] } +tracing-subscriber = { version = "0.3.20", features = ["fmt"] } tracing-test = "0.2.5" walkdir = "2.5.0" atomic_refcell = "0.1.13" -iroh = { version = "0.91.1", features = ["discovery-local-network"]} +iroh = { version = "0.92", features = ["discovery-local-network"]} [features] hide-proto-docs = [] metrics = [] default = ["hide-proto-docs", "fs-store"] fs-store = ["dep:redb", "dep:reflink-copy"] - -[patch.crates-io] -iroh = { git = "https://github.com/n0-computer/iroh", branch = "main" } -iroh-base = { git = "https://github.com/n0-computer/iroh", branch = "main" } From 413773cb71f48f95e84511ffb80f837e0a9f0494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cramfox=E2=80=9D?= <“kasey@n0.computer”> Date: Thu, 18 Sep 2025 17:29:28 -0400 Subject: [PATCH 3/3] chore: remove iroh from allowed github source --- deny.toml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/deny.toml b/deny.toml index 85be20882..bb2a4118f 100644 --- a/deny.toml +++ b/deny.toml @@ -39,8 +39,3 @@ name = "ring" [[licenses.clarify.license-files]] hash = 3171872035 path = "LICENSE" - -[sources] -allow-git = [ - "https://github.com/n0-computer/iroh", -] \ No newline at end of file