From 3044905a405080790fd355569c6b12f22d69563c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cramfox=E2=80=9D?= <“kasey@n0.computer”> Date: Mon, 17 Mar 2025 17:42:08 -0400 Subject: [PATCH] chore: upgrade to `iroh@v0.34` --- Cargo.lock | 106 ++++++++++++++++++++++++++++++++++++++++------------- Cargo.toml | 8 +--- 2 files changed, 83 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d638296..7b94d95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -199,16 +199,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] -name = "backoff" -version = "0.4.0" +name = "backon" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +checksum = "49fef586913a57ff189f25c9b3d034356a5bf6b3fa9a7f067588fe1698ba1f5d" dependencies = [ - "futures-core", - "getrandom 0.2.15", - "instant", - "pin-project-lite", - "rand 0.8.5", + "fastrand", + "gloo-timers", + "tokio", ] [[package]] @@ -598,6 +596,7 @@ checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "der_derive", + "pem-rfc7468", "zeroize", ] @@ -1065,6 +1064,18 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "h2" version = "0.4.7" @@ -1550,13 +1561,14 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "iroh" -version = "0.33.0" -source = "git+https://github.com/n0-computer/iroh.git?branch=main#0c7a1227cf1b9f640145c059c7581f2c502e6691" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b7224d4eeec6c8b5b1a9b2347a4dff3588834a7fb17233044bff3e90e7b293d" dependencies = [ "aead", "anyhow", "atomic-waker", - "backoff", + "backon", "bytes", "cfg_aliases", "concurrent-queue", @@ -1579,7 +1591,7 @@ dependencies = [ "iroh-relay", "n0-future", "netdev", - "netwatch", + "netwatch 0.4.0", "pin-project", "pkarr", "portmapper", @@ -1608,8 +1620,9 @@ dependencies = [ [[package]] name = "iroh-base" -version = "0.33.0" -source = "git+https://github.com/n0-computer/iroh.git?branch=main#0c7a1227cf1b9f640145c059c7581f2c502e6691" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02bf2374c0f1d01cde6e60de7505e42a604acda1a1bb3f7be19806e466055517" dependencies = [ "curve25519-dalek", "data-encoding", @@ -1624,9 +1637,9 @@ dependencies = [ [[package]] name = "iroh-metrics" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "571d177e20f0848a643a2c0f662be0e08968f8743b0776941f83a2152b87a180" +checksum = "c0f7cd1ffe3b152a5f4f4c1880e01e07d96001f20e02cc143cb7842987c616b3" dependencies = [ "erased_set", "serde", @@ -1637,8 +1650,9 @@ dependencies = [ [[package]] name = "iroh-net-report" -version = "0.33.0" -source = "git+https://github.com/n0-computer/iroh.git?branch=main#0c7a1227cf1b9f640145c059c7581f2c502e6691" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63407d73331e8e38980be7e39b1db8e173fc28545b3ea0c48c9a718f95877b8e" dependencies = [ "anyhow", "bytes", @@ -1650,7 +1664,7 @@ dependencies = [ "iroh-quinn", "iroh-relay", "n0-future", - "netwatch", + "netwatch 0.4.0", "portmapper", "rand 0.8.5", "reqwest", @@ -1720,8 +1734,9 @@ dependencies = [ [[package]] name = "iroh-relay" -version = "0.33.0" -source = "git+https://github.com/n0-computer/iroh.git?branch=main#0c7a1227cf1b9f640145c059c7581f2c502e6691" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21d282c04a71a83a90b8fe6872ba30ae341853255aa908375a3e6181f7215d7b" dependencies = [ "anyhow", "bytes", @@ -2116,6 +2131,39 @@ dependencies = [ "wmi", ] +[[package]] +name = "netwatch" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7879c2cfdf30d92f2be89efa3169b3d78107e3ab7f7b9a37157782569314e1" +dependencies = [ + "atomic-waker", + "bytes", + "cfg_aliases", + "derive_more", + "iroh-quinn-udp", + "js-sys", + "libc", + "n0-future", + "netdev", + "netlink-packet-core", + "netlink-packet-route 0.19.0", + "netlink-sys", + "rtnetlink 0.13.1", + "rtnetlink 0.14.1", + "serde", + "socket2", + "thiserror 2.0.11", + "time", + "tokio", + "tokio-util", + "tracing", + "web-sys", + "windows 0.59.0", + "windows-result 0.3.0", + "wmi", +] + [[package]] name = "nix" version = "0.26.4" @@ -2328,6 +2376,15 @@ dependencies = [ "serde", ] +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.3.1" @@ -2506,11 +2563,10 @@ checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" [[package]] name = "portmapper" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5469b29e6ce2a27bfc9382720b5f0768993afec9e53b133d8248c8b09406156a" +checksum = "b715da165f399be093fecb2ca774b00713a3b32f6b27e0752fbf255e3be622af" dependencies = [ - "anyhow", "base64", "bytes", "derive_more", @@ -2519,7 +2575,7 @@ dependencies = [ "igd-next", "iroh-metrics", "libc", - "netwatch", + "netwatch 0.3.0", "num_enum", "rand 0.8.5", "serde", diff --git a/Cargo.toml b/Cargo.toml index cc3adbc..17b0a30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,8 +17,8 @@ rust-version = "1.81" anyhow = "1.0.75" clap = { version = "4.4.10", features = ["derive"] } hex = "0.4.3" -iroh = { version = "0.33", default-features = false } -iroh-base = { version = "0.33", features = ["ticket"] } +iroh = { version = "0.34", default-features = false } +iroh-base = { version = "0.34", features = ["ticket"] } quinn = { version = "0.13", package = "iroh-quinn" } rand = "0.8.5" tokio = { version = "1.34.0", features = ["full"] } @@ -29,7 +29,3 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } [dev-dependencies] duct = "0.13.6" nix = { version = "0.29", features = ["signal", "process"] } - -[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" }