From abc50641c23398d776676fdf86cc6749ac9e1de5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cramfox=E2=80=9D?= <“kasey@n0.computer”>
Date: Mon, 13 Jan 2025 21:28:04 -0500
Subject: [PATCH] prepping for release

patching `portmapper` and `netwatch` deps
---
 Cargo.lock                 | 37 +++++++++++++++++++++++++++----------
 Cargo.toml                 |  4 ++++
 iroh-net-report/Cargo.toml |  2 +-
 iroh-relay/Cargo.toml      |  2 +-
 iroh/Cargo.toml            |  2 +-
 iroh/bench/Cargo.toml      |  2 +-
 6 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 066298f345..e9ef38e6c9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2039,7 +2039,7 @@ dependencies = [
  "igd-next",
  "indicatif",
  "iroh-base",
- "iroh-metrics",
+ "iroh-metrics 0.31.0",
  "iroh-net-report",
  "iroh-quinn",
  "iroh-quinn-proto",
@@ -2113,7 +2113,7 @@ dependencies = [
  "futures-lite",
  "hdrhistogram",
  "iroh",
- "iroh-metrics",
+ "iroh-metrics 0.31.0",
  "iroh-quinn",
  "rcgen",
  "rustls",
@@ -2143,7 +2143,7 @@ dependencies = [
  "http 1.2.0",
  "humantime-serde",
  "iroh",
- "iroh-metrics",
+ "iroh-metrics 0.30.0",
  "iroh-test 0.30.0",
  "lru",
  "pkarr",
@@ -2193,6 +2193,25 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "iroh-metrics"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "571d177e20f0848a643a2c0f662be0e08968f8743b0776941f83a2152b87a180"
+dependencies = [
+ "erased_set",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "prometheus-client",
+ "reqwest",
+ "serde",
+ "struct_iterable",
+ "thiserror 2.0.11",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "iroh-net-report"
 version = "0.30.0"
@@ -2204,7 +2223,7 @@ dependencies = [
  "futures-lite",
  "hickory-resolver",
  "iroh-base",
- "iroh-metrics",
+ "iroh-metrics 0.31.0",
  "iroh-quinn",
  "iroh-relay",
  "iroh-test 0.30.0",
@@ -2295,7 +2314,7 @@ dependencies = [
  "hyper",
  "hyper-util",
  "iroh-base",
- "iroh-metrics",
+ "iroh-metrics 0.31.0",
  "iroh-quinn",
  "iroh-quinn-proto",
  "iroh-test 0.30.0",
@@ -2727,8 +2746,7 @@ dependencies = [
 [[package]]
 name = "netwatch"
 version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "304c0c1b348830b016039f2cb1c5ac8217084a78875262c5594925dd08aa77fc"
+source = "git+https://github.com/n0-computer/net-tools.git?branch=main#f58cd8b3ddb0a2609dcae3e490c96e659a57c4f3"
 dependencies = [
  "anyhow",
  "atomic-waker",
@@ -3202,8 +3220,7 @@ checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 [[package]]
 name = "portmapper"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e6b2058e5b2c829b7dcc62bb94ec223e2fdf07cad157b09ab05c5520af6f5b6"
+source = "git+https://github.com/n0-computer/net-tools.git?branch=main#f58cd8b3ddb0a2609dcae3e490c96e659a57c4f3"
 dependencies = [
  "anyhow",
  "base64",
@@ -3212,7 +3229,7 @@ dependencies = [
  "futures-lite",
  "futures-util",
  "igd-next",
- "iroh-metrics",
+ "iroh-metrics 0.31.0",
  "libc",
  "netwatch",
  "num_enum",
diff --git a/Cargo.toml b/Cargo.toml
index 9ad1da7780..9125820d30 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,3 +42,7 @@ unexpected_cfgs = { level = "warn", check-cfg = ["cfg(iroh_docsrs)", "cfg(iroh_l
 
 [workspace.lints.clippy]
 unused-async = "warn"
+
+[patch.crates-io]
+portmapper = { git = "https://github.com/n0-computer/net-tools.git", branch = "main" }
+netwatch = { git = "https://github.com/n0-computer/net-tools.git", branch = "main" }
diff --git a/iroh-net-report/Cargo.toml b/iroh-net-report/Cargo.toml
index b2cabb734f..536799be1e 100644
--- a/iroh-net-report/Cargo.toml
+++ b/iroh-net-report/Cargo.toml
@@ -23,7 +23,7 @@ futures-buffered = "0.2.8"
 futures-lite = "2.3"
 hickory-resolver = "=0.25.0-alpha.4"
 iroh-base = { version = "0.30.0", path = "../iroh-base", default-features = false, features = ["relay"] }
-iroh-metrics = { version = "0.30.0", default-features = false }
+iroh-metrics = { version = "0.31", default-features = false }
 iroh-relay = { version = "0.30", path = "../iroh-relay" }
 netwatch = { version = "0.2.0" }
 portmapper = { version = "0.3.0", default-features = false }
diff --git a/iroh-relay/Cargo.toml b/iroh-relay/Cargo.toml
index a30f9b8db9..7d394bc078 100644
--- a/iroh-relay/Cargo.toml
+++ b/iroh-relay/Cargo.toml
@@ -36,7 +36,7 @@ http-body-util = "0.1.0"
 hyper = { version = "1", features = ["server", "client", "http1"] }
 hyper-util = "0.1.1"
 iroh-base = { version = "0.30.0", path = "../iroh-base", default-features = false, features = ["key", "relay"] }
-iroh-metrics = { version = "0.30.0", default-features = false }
+iroh-metrics = { version = "0.31", default-features = false }
 num_enum = "0.7"
 pin-project = "1"
 postcard = { version = "1", default-features = false, features = [
diff --git a/iroh/Cargo.toml b/iroh/Cargo.toml
index e8902e1761..9d92a1f16b 100644
--- a/iroh/Cargo.toml
+++ b/iroh/Cargo.toml
@@ -98,7 +98,7 @@ z32 = "1.0.3"
 net-report = { package = "iroh-net-report", path = "../iroh-net-report", version = "0.30", default-features = false }
 
 # metrics
-iroh-metrics = { version = "0.30", default-features = false }
+iroh-metrics = { version = "0.31", default-features = false }
 
 # local-swarm-discovery
 swarm-discovery = { version = "0.3.0-alpha.1", optional = true }
diff --git a/iroh/bench/Cargo.toml b/iroh/bench/Cargo.toml
index 5203c71440..958f42bcbf 100644
--- a/iroh/bench/Cargo.toml
+++ b/iroh/bench/Cargo.toml
@@ -10,7 +10,7 @@ anyhow = "1.0.22"
 bytes = "1.7"
 hdrhistogram = { version = "7.2", default-features = false }
 iroh = { path = ".." }
-iroh-metrics = "0.30"
+iroh-metrics = "0.31"
 quinn = { package = "iroh-quinn", version = "0.12" }
 rcgen = "0.13"
 rustls = { version = "0.23", default-features = false, features = ["ring"] }