From 2995b7a0d52c1f5e82082aa8824e98b3ec5d70c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cramfox=E2=80=9D?= <“kasey@n0.computer”> Date: Wed, 17 Sep 2025 15:53:07 -0400 Subject: [PATCH 1/3] chore: upgrade `iroh` and `iroh-base` --- Cargo.lock | 15 ++++++--------- Cargo.toml | 6 +++++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b549972..d495205 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1574,9 +1574,8 @@ dependencies = [ [[package]] name = "iroh" -version = "0.91.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef05c956df0788a649d65c33fdbbb8fc4442d7716af3d67a1bd6d00a9ee56ead" +version = "0.91.2" +source = "git+https://github.com/n0-computer/iroh.git?branch=main#4583b1280b8f5ab9d264940102382956ddbbb1a8" dependencies = [ "aead", "backon", @@ -1635,9 +1634,8 @@ dependencies = [ [[package]] name = "iroh-base" -version = "0.91.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f68b5c5e190d8965699b2fd583f301a7e6094a0b89bb4d6c5baa94761fd1b7a3" +version = "0.91.2" +source = "git+https://github.com/n0-computer/iroh.git?branch=main#4583b1280b8f5ab9d264940102382956ddbbb1a8" dependencies = [ "curve25519-dalek", "data-encoding", @@ -1735,9 +1733,8 @@ dependencies = [ [[package]] name = "iroh-relay" -version = "0.91.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49596b5079817d0904fe4985307f532a4e23a33eb494bd680baaf2743f0c456b" +version = "0.91.2" +source = "git+https://github.com/n0-computer/iroh.git?branch=main#4583b1280b8f5ab9d264940102382956ddbbb1a8" dependencies = [ "blake3", "bytes", diff --git a/Cargo.toml b/Cargo.toml index f921324..404da2d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,4 +39,8 @@ opt-level = "s" codegen-units = 1 lto = true debug = "none" -strip = true \ No newline at end of file +strip = true + +[patch.crates-io] +iroh = { git = "https://github.com/n0-computer/iroh.git", branch = "main" } +iroh-base = { git = "https://github.com/n0-computer/iroh.git", branch = "main" } From 9cee2ba9f2d1c47db344c4f302af6dfbda475a59 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:53:53 -0400 Subject: [PATCH 2/3] chore: upgrade `n0-snafu` --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d495205..cfdbe79 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1981,9 +1981,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 404da2d..63060d8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ tokio-util = "0.7.10" tracing = "0.1.40" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } data-encoding = "2.9.0" -n0-snafu = "0.2.1" +n0-snafu = "0.2.2" [dev-dependencies] duct = "0.13.6" From 3980cef72f7f3cdc91045b88251e105f8c8432de 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 16:35:25 -0400 Subject: [PATCH 3/3] chore: upgrade `n0-snafu`, `tracing-subscriber`, `iroh`, and `iroh-base` --- Cargo.lock | 90 ++++++++++++++++++++++++++---------------------------- Cargo.toml | 10 ++---- 2 files changed, 47 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cfdbe79..1eadd62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1574,8 +1574,9 @@ dependencies = [ [[package]] name = "iroh" -version = "0.91.2" -source = "git+https://github.com/n0-computer/iroh.git?branch=main#4583b1280b8f5ab9d264940102382956ddbbb1a8" +version = "0.92.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "135ad6b793a5851b9e5435ad36fea63df485f8fd4520a58117e7dc3326a69c15" dependencies = [ "aead", "backon", @@ -1603,7 +1604,7 @@ dependencies = [ "n0-snafu", "n0-watcher", "nested_enum_utils", - "netdev", + "netdev 0.36.0", "netwatch", "pin-project", "pkarr", @@ -1634,8 +1635,9 @@ dependencies = [ [[package]] name = "iroh-base" -version = "0.91.2" -source = "git+https://github.com/n0-computer/iroh.git?branch=main#4583b1280b8f5ab9d264940102382956ddbbb1a8" +version = "0.92.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04ae51a14c9255a735b1db2d8cf29b875b971e96a5b23e4d0d1ee7d85bf32132" dependencies = [ "curve25519-dalek", "data-encoding", @@ -1733,8 +1735,9 @@ dependencies = [ [[package]] name = "iroh-relay" -version = "0.91.2" -source = "git+https://github.com/n0-computer/iroh.git?branch=main#4583b1280b8f5ab9d264940102382956ddbbb1a8" +version = "0.92.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "315cb02e660de0de339303296df9a29b27550180bb3979d0753a267649b34a7f" dependencies = [ "blake3", "bytes", @@ -1900,11 +1903,11 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" [[package]] name = "matchers" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" dependencies = [ - "regex-automata 0.1.10", + "regex-automata", ] [[package]] @@ -2032,6 +2035,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" @@ -2114,9 +2134,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", @@ -2128,7 +2148,7 @@ dependencies = [ "n0-future", "n0-watcher", "nested_enum_utils", - "netdev", + "netdev 0.37.3", "netlink-packet-core", "netlink-packet-route 0.24.0", "netlink-proto", @@ -2182,12 +2202,11 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.46.0" +version = "0.50.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" dependencies = [ - "overload", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -2274,12 +2293,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "parking" version = "2.2.1" @@ -2518,9 +2531,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", @@ -2804,17 +2817,8 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.9", - "regex-syntax 0.8.5", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", + "regex-automata", + "regex-syntax", ] [[package]] @@ -2825,7 +2829,7 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.5", + "regex-syntax", ] [[package]] @@ -2834,12 +2838,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - [[package]] name = "regex-syntax" version = "0.8.5" @@ -3822,14 +3820,14 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5" dependencies = [ "matchers", "nu-ansi-term", "once_cell", - "regex", + "regex-automata", "sharded-slab", "smallvec", "thread_local", diff --git a/Cargo.toml b/Cargo.toml index 63060d8..2646b56 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,14 +17,14 @@ rust-version = "1.81" snafu = "0.8.6" clap = { version = "4.4.10", features = ["derive"] } hex = "0.4.3" -iroh = { version = "0.91", default-features = false } -iroh-base = { version = "0.91", features = ["ticket"] } +iroh = { version = "0.92", default-features = false } +iroh-base = { version = "0.92", features = ["ticket"] } quinn = { version = "0.14", package = "iroh-quinn" } rand = "0.8.5" tokio = { version = "1.34.0", features = ["full"] } tokio-util = "0.7.10" tracing = "0.1.40" -tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } +tracing-subscriber = { version = "0.3.20", features = ["env-filter"] } data-encoding = "2.9.0" n0-snafu = "0.2.2" @@ -40,7 +40,3 @@ codegen-units = 1 lto = true debug = "none" strip = true - -[patch.crates-io] -iroh = { git = "https://github.com/n0-computer/iroh.git", branch = "main" } -iroh-base = { git = "https://github.com/n0-computer/iroh.git", branch = "main" }