From 93c203fafae95c31f56563102607bcdb2ee8dd8d Mon Sep 17 00:00:00 2001
From: link2xt <link2xt@testrun.org>
Date: Wed, 29 Jan 2025 19:07:59 +0000
Subject: [PATCH] chore: upgrade iroh from 0.30 to 0.31

---
 Cargo.lock | 159 ++++++++---------------------------------------------
 Cargo.toml |   4 +-
 deny.toml  |   4 --
 3 files changed, 26 insertions(+), 141 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f5ddd1cbd4..a7d8d7f139 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -486,9 +486,12 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
 dependencies = [
+ "futures-core",
  "getrandom 0.2.12",
  "instant",
+ "pin-project-lite",
  "rand 0.8.5",
+ "tokio",
 ]
 
 [[package]]
@@ -2691,17 +2694,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "hostname"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba"
-dependencies = [
- "cfg-if",
- "libc",
- "windows 0.52.0",
-]
-
 [[package]]
 name = "hostname-validator"
 version = "1.1.1"
@@ -3134,14 +3126,13 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "iroh"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a59352a43dc4199fc804e1a7f3729bd14baff496fd3efbba98763e204bc4af0"
+checksum = "27ee97c8412bbf06d7c5253c6638a8bac741cb44d405669cedbfd7d47cd68090"
 dependencies = [
  "aead",
  "anyhow",
  "backoff",
- "base64 0.22.1",
  "bytes",
  "concurrent-queue",
  "crypto_box",
@@ -3150,54 +3141,39 @@ dependencies = [
  "derive_more",
  "ed25519-dalek",
  "futures-buffered",
- "futures-concurrency",
  "futures-lite 2.5.0",
  "futures-sink",
  "futures-util",
  "governor",
  "hickory-resolver",
- "hostname 0.4.0",
  "http 1.1.0",
  "http-body-util",
  "hyper",
  "hyper-util",
  "igd-next",
  "iroh-base",
- "iroh-metrics 0.30.0",
+ "iroh-metrics",
  "iroh-net-report",
  "iroh-quinn",
  "iroh-quinn-proto",
  "iroh-quinn-udp",
  "iroh-relay",
- "libc",
  "netdev",
- "netlink-packet-core",
- "netlink-packet-route 0.19.0",
- "netlink-packet-route 0.21.0",
- "netlink-sys",
- "netwatch 0.2.0",
- "num_enum",
- "once_cell",
+ "netwatch",
  "pin-project",
  "pkarr",
  "portmapper",
- "postcard",
  "rand 0.8.5",
  "rcgen",
  "reqwest",
  "ring",
- "rtnetlink 0.13.1",
- "rtnetlink 0.14.1",
  "rustls",
  "rustls-webpki",
  "serde",
  "smallvec",
- "socket2",
  "strum",
  "stun-rs",
- "surge-ping",
  "thiserror 2.0.9",
- "time 0.3.36",
  "tokio",
  "tokio-rustls",
  "tokio-stream",
@@ -3207,17 +3183,15 @@ dependencies = [
  "tracing",
  "url",
  "webpki-roots",
- "windows 0.58.0",
- "wmi",
  "x509-parser",
  "z32",
 ]
 
 [[package]]
 name = "iroh-base"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdd4101e3f0732d901beb5461cb9bc415feeda8d21281ab5bf5c0c3458eebde2"
+checksum = "0546d176f79fb63a5efeb8eb8c692c483920e35bd9ba66c028928cf2ca27239b"
 dependencies = [
  "curve25519-dalek",
  "data-encoding",
@@ -3245,9 +3219,9 @@ dependencies = [
 
 [[package]]
 name = "iroh-gossip"
-version = "0.30.1"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290342adf09382c1a446da805076036677d90556021f5dc427dd245404880d58"
+checksum = "0e8c9abdd79f8cf4a77173c59c112b0695febc5dea7b16d785beecc208561590"
 dependencies = [
  "anyhow",
  "async-channel 2.3.1",
@@ -3261,7 +3235,7 @@ dependencies = [
  "indexmap",
  "iroh",
  "iroh-blake3",
- "iroh-metrics 0.30.0",
+ "iroh-metrics",
  "postcard",
  "rand 0.8.5",
  "rand_core 0.6.4",
@@ -3272,26 +3246,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "iroh-metrics"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7efd9d7437db258f4d44852beea820cd872e4db976928ee0c2bc615b8c4fe5a"
-dependencies = [
- "erased_set",
- "http-body-util",
- "hyper",
- "hyper-util",
- "once_cell",
- "prometheus-client",
- "reqwest",
- "serde",
- "struct_iterable",
- "thiserror 2.0.9",
- "tokio",
- "tracing",
-]
-
 [[package]]
 name = "iroh-metrics"
 version = "0.31.0"
@@ -3313,9 +3267,9 @@ dependencies = [
 
 [[package]]
 name = "iroh-net-report"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee04b3b957169e3833f08791802e6bd9878213655d1adbcd9191ea78b8d671a"
+checksum = "547eacca10cd072412b04d784336e29c5e81e7ba4fbb9c1ad70777f7874a5d1a"
 dependencies = [
  "anyhow",
  "bytes",
@@ -3324,16 +3278,16 @@ dependencies = [
  "futures-lite 2.5.0",
  "hickory-resolver",
  "iroh-base",
- "iroh-metrics 0.30.0",
+ "iroh-metrics",
  "iroh-quinn",
  "iroh-relay",
- "netwatch 0.2.0",
+ "netwatch",
  "portmapper",
  "rand 0.8.5",
  "reqwest",
  "rustls",
  "surge-ping",
- "thiserror 1.0.69",
+ "thiserror 2.0.9",
  "tokio",
  "tokio-util",
  "tracing",
@@ -3391,12 +3345,11 @@ dependencies = [
 
 [[package]]
 name = "iroh-relay"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa0080c8d0720009dc5fa109ef2ead96c5aeb8bb8e4534de8f13865520818207"
+checksum = "21e4c13758cac9d81a6793b59eba17da2ccbf90a76278ec160d7c8f90b1bb903"
 dependencies = [
  "anyhow",
- "base64 0.22.1",
  "bytes",
  "data-encoding",
  "derive_more",
@@ -3407,29 +3360,23 @@ dependencies = [
  "governor",
  "hickory-proto",
  "hickory-resolver",
- "hostname 0.4.0",
  "http 1.1.0",
  "http-body-util",
  "hyper",
  "hyper-util",
  "iroh-base",
- "iroh-metrics 0.30.0",
+ "iroh-metrics",
  "iroh-quinn",
  "iroh-quinn-proto",
- "libc",
  "lru",
  "num_enum",
- "once_cell",
  "pin-project",
  "postcard",
  "rand 0.8.5",
  "reqwest",
- "ring",
  "rustls",
  "rustls-webpki",
  "serde",
- "smallvec",
- "socket2",
  "stun-rs",
  "thiserror 2.0.9",
  "time 0.3.36",
@@ -3875,21 +3822,6 @@ dependencies = [
  "netlink-packet-utils",
 ]
 
-[[package]]
-name = "netlink-packet-route"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "483325d4bfef65699214858f097d504eb812c38ce7077d165f301ec406c3066e"
-dependencies = [
- "anyhow",
- "bitflags 2.6.0",
- "byteorder",
- "libc",
- "log",
- "netlink-packet-core",
- "netlink-packet-utils",
-]
-
 [[package]]
 name = "netlink-packet-utils"
 version = "0.5.2"
@@ -3930,39 +3862,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "netwatch"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "304c0c1b348830b016039f2cb1c5ac8217084a78875262c5594925dd08aa77fc"
-dependencies = [
- "anyhow",
- "atomic-waker",
- "bytes",
- "derive_more",
- "futures-lite 2.5.0",
- "futures-sink",
- "futures-util",
- "iroh-quinn-udp",
- "libc",
- "netdev",
- "netlink-packet-core",
- "netlink-packet-route 0.19.0",
- "netlink-sys",
- "once_cell",
- "rtnetlink 0.13.1",
- "rtnetlink 0.14.1",
- "serde",
- "socket2",
- "thiserror 2.0.9",
- "time 0.3.36",
- "tokio",
- "tokio-util",
- "tracing",
- "windows 0.58.0",
- "wmi",
-]
-
 [[package]]
 name = "netwatch"
 version = "0.3.0"
@@ -4481,7 +4380,7 @@ dependencies = [
  "aes-gcm",
  "aes-kw",
  "argon2",
- "base64 0.21.7",
+ "base64 0.22.1",
  "bitfield",
  "block-padding",
  "blowfish",
@@ -4746,9 +4645,9 @@ dependencies = [
  "futures-lite 2.5.0",
  "futures-util",
  "igd-next",
- "iroh-metrics 0.31.0",
+ "iroh-metrics",
  "libc",
- "netwatch 0.3.0",
+ "netwatch",
  "num_enum",
  "rand 0.8.5",
  "serde",
@@ -5323,7 +5222,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
 dependencies = [
- "hostname 0.3.1",
+ "hostname",
  "quick-error 1.2.3",
 ]
 
@@ -7144,16 +7043,6 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
-[[package]]
-name = "windows"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
-dependencies = [
- "windows-core 0.52.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows"
 version = "0.58.0"
diff --git a/Cargo.toml b/Cargo.toml
index d9c7bdb9de..29e9e3f956 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -64,8 +64,8 @@ humansize = "2"
 hyper = "1"
 hyper-util = "0.1.10"
 image = { version = "0.25.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
-iroh-gossip = { version = "0.30", default-features = false, features = ["net"] }
-iroh = { version = "0.30", default-features = false }
+iroh-gossip = { version = "0.31", default-features = false, features = ["net"] }
+iroh = { version = "0.31", default-features = false }
 kamadak-exif = "0.6.1"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 libc = { workspace = true }
diff --git a/deny.toml b/deny.toml
index 7f5e765503..ae2c8ed9f3 100644
--- a/deny.toml
+++ b/deny.toml
@@ -32,13 +32,9 @@ skip = [
      { name = "futures-lite", version = "1.13.0" },
      { name = "generator", version = "0.7.5" },
      { name = "getrandom", version = "<0.2" },
-     { name = "hostname", version = "0.3.1" },
      { name = "http", version = "0.2.12" },
-     { name = "iroh-metrics", version = "0.30.0" },
      { name = "loom", version = "0.5.6" },
      { name = "netlink-packet-route", version = "0.17.1" },
-     { name = "netlink-packet-route", version = "0.21.0" },
-     { name = "netwatch" },
      { name = "nix", version = "0.26.4" },
      { name = "nix", version = "0.27.1" },
      { name = "quick-error", version = "<2.0" },