From 5dbb1d4dcf8e9197501cfa8208c54d5d141619c9 Mon Sep 17 00:00:00 2001
From: Kasey <klhuizinga@gmail.com>
Date: Mon, 30 Sep 2024 11:37:15 -0400
Subject: [PATCH 1/3] chore: upgrade iroh to v0.26.0

---
 Cargo.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index 3415b7f..e5a1b07 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,3 +25,6 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 duct = "0.13.6"
 nix = { version = "0.29", features = ["signal", "process"] }
 rand = "0.8.5"
+
+[patch.crates-io]
+iroh-net = { git = "https://github.com/n0-computer/iroh", branch = "main" }

From 36ed9de147f2e727813eb8d7337c6e9f9d2871a6 Mon Sep 17 00:00:00 2001
From: Kasey <klhuizinga@gmail.com>
Date: Mon, 30 Sep 2024 12:30:15 -0400
Subject: [PATCH 2/3] patch lockfile

---
 Cargo.lock | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cd5f892..ce00aab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -638,18 +638,18 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "1.0.0-beta.7"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3249c0372e72f5f93b5c0ca54c0ab76bbf6216b6f718925476fd9bc4ffabb4fe"
+checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
 dependencies = [
  "derive_more-impl",
 ]
 
 [[package]]
 name = "derive_more-impl"
-version = "1.0.0-beta.7"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27d919ced7590fc17b5d5a3c63b662e8a7d2324212c4e4dbbed975cafd22d16d"
+checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1583,8 +1583,7 @@ checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
 [[package]]
 name = "iroh-base"
 version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "545424889bce87e44fd08dac9e6889635630fdbdaaa858a3c5a5f0adbb8d3779"
+source = "git+https://github.com/n0-computer/iroh?branch=main#5d92f49891c0c9ce52d5f64ed990655f85392b2b"
 dependencies = [
  "aead",
  "anyhow",
@@ -1624,8 +1623,7 @@ dependencies = [
 [[package]]
 name = "iroh-metrics"
 version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb6ab80f7cccde80be07a643308e1ff925d5be91721ec65ba96b261a0bcb5e5"
+source = "git+https://github.com/n0-computer/iroh?branch=main#5d92f49891c0c9ce52d5f64ed990655f85392b2b"
 dependencies = [
  "anyhow",
  "erased_set",
@@ -1645,8 +1643,7 @@ dependencies = [
 [[package]]
 name = "iroh-net"
 version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a099a60478cb9319153756a9cf2ff41aa03d18403690a91e60f049ad467b057"
+source = "git+https://github.com/n0-computer/iroh?branch=main#5d92f49891c0c9ce52d5f64ed990655f85392b2b"
 dependencies = [
  "anyhow",
  "backoff",
@@ -1704,6 +1701,7 @@ dependencies = [
  "time",
  "tokio",
  "tokio-rustls",
+ "tokio-stream",
  "tokio-tungstenite",
  "tokio-tungstenite-wasm",
  "tokio-util",
@@ -3766,6 +3764,17 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-stream"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-tungstenite"
 version = "0.21.0"

From c0ec4c454855f02ff1da36fb4451ebd19974ae4e Mon Sep 17 00:00:00 2001
From: Kasey <klhuizinga@gmail.com>
Date: Mon, 30 Sep 2024 13:43:32 -0400
Subject: [PATCH 3/3] upgrade to iroh v0.26.0

---
 Cargo.lock | 15 +++++++++------
 Cargo.toml |  5 +----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ce00aab..a26aa15 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1582,8 +1582,9 @@ checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
 
 [[package]]
 name = "iroh-base"
-version = "0.25.0"
-source = "git+https://github.com/n0-computer/iroh?branch=main#5d92f49891c0c9ce52d5f64ed990655f85392b2b"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "973c0b3c7851fa2e8e6cf4cb81c9f4cab1373848828fafa43dfe25b123a89ff2"
 dependencies = [
  "aead",
  "anyhow",
@@ -1622,8 +1623,9 @@ dependencies = [
 
 [[package]]
 name = "iroh-metrics"
-version = "0.25.0"
-source = "git+https://github.com/n0-computer/iroh?branch=main#5d92f49891c0c9ce52d5f64ed990655f85392b2b"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02edfa7ca1aa89b0b9793d94671e32b79c97d61e9022f082c5eb2b95b64e90c0"
 dependencies = [
  "anyhow",
  "erased_set",
@@ -1642,8 +1644,9 @@ dependencies = [
 
 [[package]]
 name = "iroh-net"
-version = "0.25.0"
-source = "git+https://github.com/n0-computer/iroh?branch=main#5d92f49891c0c9ce52d5f64ed990655f85392b2b"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "329553be056a92eec7802e1c087eed951eec6e60f0f0740491ef16a295be4ca2"
 dependencies = [
  "anyhow",
  "backoff",
diff --git a/Cargo.toml b/Cargo.toml
index e5a1b07..9a87d02 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ description = "A cli tool to pipe data over the network, with NAT hole punching"
 anyhow = "1.0.75"
 clap = { version = "4.4.10", features = ["derive"] }
 hex = "0.4.3"
-iroh-net = "0.25"
+iroh-net = "0.26"
 quinn = { version = "0.11.3", package = "iroh-quinn" }
 tokio = { version = "1.34.0", features = ["full"] }
 tokio-util = "0.7.10"
@@ -25,6 +25,3 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 duct = "0.13.6"
 nix = { version = "0.29", features = ["signal", "process"] }
 rand = "0.8.5"
-
-[patch.crates-io]
-iroh-net = { git = "https://github.com/n0-computer/iroh", branch = "main" }