From 085029ac26f962be1d66e78cef53b135958ef82d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Kr=C3=BCger?= <philipp.krueger1@gmail.com>
Date: Thu, 14 Nov 2024 13:47:37 +0100
Subject: [PATCH 1/9] refactor: Finish extraction into a compilable state

---
 .github/workflows/tests.yaml |    2 +-
 Cargo.lock                   | 1731 ++--------------------------------
 Cargo.toml                   |   26 +-
 iroh-willow/Cargo.toml       |   12 +-
 4 files changed, 80 insertions(+), 1691 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 5640af4..f5dfee0 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -23,7 +23,7 @@ env:
   RUSTFLAGS: -Dwarnings
   RUSTDOCFLAGS: -Dwarnings
   SCCACHE_CACHE_SIZE: "50G"
-  CRATES_LIST: "iroh,iroh-metrics,iroh-net,iroh-net-bench,iroh-test,iroh-cli,iroh-dns-server,iroh-router,netwatch,portmapper,iroh-relay"
+  CRATES_LIST: "iroh-willow"
   IROH_FORCE_STAGING_RELAYS: "1"
 
 jobs:
diff --git a/Cargo.lock b/Cargo.lock
index ecf5dd4..a2cfe1d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,20 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "acto"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c372578ce4215ccf94ec3f3585fbb6a902e47d07b064ff8a55d850ffb5025e"
-dependencies = [
- "parking_lot",
- "pin-project-lite",
- "rustc_version",
- "smol_str",
- "tokio",
- "tracing",
-]
-
 [[package]]
 name = "addr2line"
 version = "0.24.2"
@@ -63,12 +49,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "allocator-api2"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
-
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -84,12 +64,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "anes"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
-
 [[package]]
 name = "anstream"
 version = "0.6.18"
@@ -145,12 +119,6 @@ version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
 
-[[package]]
-name = "arc-swap"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
-
 [[package]]
 name = "arrayref"
 version = "0.3.9"
@@ -236,15 +204,6 @@ dependencies = [
  "syn 2.0.87",
 ]
 
-[[package]]
-name = "atomic-polyfill"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4"
-dependencies = [
- "critical-section",
-]
-
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -276,7 +235,6 @@ checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae"
 dependencies = [
  "async-trait",
  "axum-core",
- "axum-macros",
  "bytes",
  "futures-util",
  "http 1.1.0",
@@ -297,7 +255,7 @@ dependencies = [
  "serde_urlencoded",
  "sync_wrapper 1.0.1",
  "tokio",
- "tower 0.5.1",
+ "tower",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -324,41 +282,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "axum-macros"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.87",
-]
-
-[[package]]
-name = "axum-server"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56bac90848f6a9393ac03c63c640925c4b7c8ca21654de40d53f55964667c7d8"
-dependencies = [
- "arc-swap",
- "bytes",
- "futures-util",
- "http 1.1.0",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-util",
- "pin-project-lite",
- "rustls",
- "rustls-pemfile",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls",
- "tower 0.4.13",
- "tower-service",
-]
-
 [[package]]
 name = "backoff"
 version = "0.4.0"
@@ -420,15 +343,6 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
-[[package]]
-name = "base64-url"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb9fb9fb058cc3063b5fc88d9a21eefa2735871498a04e1650da76ed511c8569"
-dependencies = [
- "base64 0.21.7",
-]
-
 [[package]]
 name = "base64ct"
 version = "1.6.0"
@@ -441,15 +355,6 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "597bb81c80a54b6a4381b23faba8d7774b144c94cbd1d6fe3f1329bd776554ab"
 
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -526,58 +431,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "camino"
-version = "1.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cargo-platform"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cargo_metadata"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa"
-dependencies = [
- "camino",
- "cargo-platform",
- "semver",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "cassowary"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
-
-[[package]]
-name = "cast"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
-
-[[package]]
-name = "castaway"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5"
-dependencies = [
- "rustversion",
-]
-
 [[package]]
 name = "cc"
 version = "1.1.31"
@@ -631,33 +484,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "ciborium"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
-dependencies = [
- "ciborium-io",
- "ciborium-ll",
- "serde",
-]
-
-[[package]]
-name = "ciborium-io"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
-
-[[package]]
-name = "ciborium-ll"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
-dependencies = [
- "ciborium-io",
- "half",
-]
-
 [[package]]
 name = "cipher"
 version = "0.4.4"
@@ -697,7 +523,7 @@ version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
  "syn 2.0.87",
@@ -709,17 +535,6 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 
-[[package]]
-name = "clipboard-win"
-version = "4.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362"
-dependencies = [
- "error-code",
- "str-buf",
- "winapi",
-]
-
 [[package]]
 name = "cobs"
 version = "0.2.3"
@@ -732,16 +547,6 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
-[[package]]
-name = "colored"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8"
-dependencies = [
- "lazy_static",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -752,31 +557,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "comfy-table"
-version = "7.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7"
-dependencies = [
- "crossterm",
- "strum 0.26.3",
- "strum_macros 0.26.4",
- "unicode-width",
-]
-
-[[package]]
-name = "compact_str"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f"
-dependencies = [
- "castaway",
- "cfg-if",
- "itoa",
- "ryu",
- "static_assertions",
-]
-
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -786,19 +566,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "console"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
-dependencies = [
- "encode_unicode",
- "lazy_static",
- "libc",
- "unicode-width",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "const-oid"
 version = "0.9.6"
@@ -861,113 +628,12 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
-[[package]]
-name = "criterion"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
-dependencies = [
- "anes",
- "cast",
- "ciborium",
- "clap",
- "criterion-plot",
- "is-terminal",
- "itertools 0.10.5",
- "num-traits",
- "once_cell",
- "oorandom",
- "plotters",
- "rayon",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
- "tinytemplate",
- "walkdir",
-]
-
-[[package]]
-name = "criterion-plot"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
-dependencies = [
- "cast",
- "itertools 0.10.5",
-]
-
-[[package]]
-name = "critical-section"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
-[[package]]
-name = "crossterm"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
-dependencies = [
- "bitflags 2.6.0",
- "crossterm_winapi",
- "libc",
- "mio 0.8.11",
- "parking_lot",
- "signal-hook",
- "signal-hook-mio",
- "winapi",
-]
-
-[[package]]
-name = "crossterm_winapi"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
 [[package]]
 name = "crypto-bigint"
 version = "0.5.5"
@@ -1052,41 +718,6 @@ dependencies = [
  "syn 2.0.87",
 ]
 
-[[package]]
-name = "darling"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 2.0.87",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
-dependencies = [
- "darling_core",
- "quote",
- "syn 2.0.87",
-]
-
 [[package]]
 name = "dashmap"
 version = "5.5.3"
@@ -1173,29 +804,12 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "dialoguer"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de"
-dependencies = [
- "console",
- "shell-words",
- "thiserror",
-]
-
 [[package]]
 name = "diatomic-waker"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab03c107fafeb3ee9f5925686dbb7a73bc76e3932abb0d2b365cb64b169cf04c"
 
-[[package]]
-name = "diff"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -1209,52 +823,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "dirs"
-version = "5.0.1"
+name = "displaydoc"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
-dependencies = [
- "cfg-if",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "displaydoc"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1394,25 +966,13 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
 
-[[package]]
-name = "encode_unicode"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-
-[[package]]
-name = "endian-type"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
-
 [[package]]
 name = "enum-as-inner"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
  "syn 2.0.87",
@@ -1482,16 +1042,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "error-code"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21"
-dependencies = [
- "libc",
- "str-buf",
-]
-
 [[package]]
 name = "event-listener"
 version = "4.0.3"
@@ -1545,17 +1095,6 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
 
-[[package]]
-name = "fd-lock"
-version = "3.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5"
-dependencies = [
- "cfg-if",
- "rustix",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "ff"
 version = "0.13.0"
@@ -1596,12 +1135,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "foldhash"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -1611,16 +1144,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "forwarded-header-value"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835f84f38484cc86f110a805655697908257fb9a7af005234060891557198e9"
-dependencies = [
- "nonempty",
- "thiserror",
-]
-
 [[package]]
 name = "futures"
 version = "0.3.31"
@@ -1894,38 +1417,13 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http 1.1.0",
- "indexmap 2.6.0",
+ "indexmap",
  "slab",
  "tokio",
  "tokio-util",
  "tracing",
 ]
 
-[[package]]
-name = "half"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
-dependencies = [
- "cfg-if",
- "crunchy",
-]
-
-[[package]]
-name = "hash32"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
@@ -1940,11 +1438,6 @@ name = "hashbrown"
 version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
-dependencies = [
- "allocator-api2",
- "equivalent",
- "foldhash",
-]
 
 [[package]]
 name = "hashlink"
@@ -1955,36 +1448,6 @@ dependencies = [
  "hashbrown 0.14.5",
 ]
 
-[[package]]
-name = "hdrhistogram"
-version = "7.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d"
-dependencies = [
- "byteorder",
- "num-traits",
-]
-
-[[package]]
-name = "heapless"
-version = "0.7.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f"
-dependencies = [
- "atomic-polyfill",
- "hash32",
- "rustc_version",
- "serde",
- "spin",
- "stable_deref_trait",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -1997,42 +1460,12 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
-[[package]]
-name = "hermit-abi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
-
 [[package]]
 name = "hex"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
-[[package]]
-name = "hickory-proto"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512"
-dependencies = [
- "async-trait",
- "cfg-if",
- "data-encoding",
- "enum-as-inner",
- "futures-channel",
- "futures-io",
- "futures-util",
- "idna 0.4.0",
- "ipnet",
- "once_cell",
- "rand",
- "thiserror",
- "tinyvec",
- "tokio",
- "tracing",
- "url",
-]
-
 [[package]]
 name = "hickory-proto"
 version = "0.25.0-alpha.2"
@@ -2041,7 +1474,6 @@ checksum = "8270a1857fb962b9914aafd46a89a187a4e63d0eb4190c327e7c7b8256a2d055"
 dependencies = [
  "async-recursion",
  "async-trait",
- "bitflags 2.6.0",
  "cfg-if",
  "data-encoding",
  "enum-as-inner",
@@ -2052,41 +1484,14 @@ dependencies = [
  "ipnet",
  "once_cell",
  "rand",
- "ring",
- "rustls",
- "rustls-pemfile",
- "serde",
  "thiserror",
  "time",
  "tinyvec",
  "tokio",
- "tokio-rustls",
  "tracing",
  "url",
 ]
 
-[[package]]
-name = "hickory-recursor"
-version = "0.25.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0d2b7bc3b967b53b1b9879e319c8cc4ec037bb5d25bc7a88edd2e6de15d1a70"
-dependencies = [
- "async-recursion",
- "async-trait",
- "bytes",
- "cfg-if",
- "enum-as-inner",
- "futures-util",
- "hickory-proto 0.25.0-alpha.2",
- "hickory-resolver",
- "lru-cache",
- "parking_lot",
- "serde",
- "thiserror",
- "tokio",
- "tracing",
-]
-
 [[package]]
 name = "hickory-resolver"
 version = "0.25.0-alpha.2"
@@ -2095,45 +1500,16 @@ checksum = "46c110355b5703070d9e29c344d79818a7cde3de9c27fc35750defea6074b0ad"
 dependencies = [
  "cfg-if",
  "futures-util",
- "hickory-proto 0.25.0-alpha.2",
+ "hickory-proto",
  "ipconfig",
  "lru-cache",
  "once_cell",
  "parking_lot",
  "rand",
  "resolv-conf",
- "rustls",
- "serde",
  "smallvec",
  "thiserror",
  "tokio",
- "tokio-rustls",
- "tracing",
-]
-
-[[package]]
-name = "hickory-server"
-version = "0.25.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee9bc516413439e322999f9c3263361b0454969cd53f20d26297ed8aa1e77c1"
-dependencies = [
- "async-trait",
- "bytes",
- "cfg-if",
- "enum-as-inner",
- "futures-util",
- "hickory-proto 0.25.0-alpha.2",
- "hickory-recursor",
- "hickory-resolver",
- "ipnet",
- "prefix-trie",
- "rustls",
- "serde",
- "thiserror",
- "time",
- "tokio",
- "tokio-rustls",
- "tokio-util",
  "tracing",
 ]
 
@@ -2162,15 +1538,6 @@ version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3688e69b38018fec1557254f64c8dc2cc8ec502890182f395dbb0aa997aa5735"
 
-[[package]]
-name = "home"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "hostname"
 version = "0.3.1"
@@ -2245,25 +1612,6 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
-[[package]]
-name = "human-time"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "259822ea527bd0d5ebf3108d84e98ac4f20769e2e8b2f3ab76e1dd6e21de7f3c"
-dependencies = [
- "human-time-macros",
-]
-
-[[package]]
-name = "human-time-macros"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a04129f85bfd960234ed3fa53212a4904881e024322e804ac5a48da239e44a09"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "hyper"
 version = "1.5.0"
@@ -2463,22 +1811,6 @@ dependencies = [
  "syn 2.0.87",
 ]
 
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "idna"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -2531,17 +1863,6 @@ dependencies = [
  "xmltree",
 ]
 
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
- "serde",
-]
-
 [[package]]
 name = "indexmap"
 version = "2.6.0"
@@ -2550,21 +1871,6 @@ checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.1",
- "serde",
-]
-
-[[package]]
-name = "indicatif"
-version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
-dependencies = [
- "console",
- "instant",
- "number_prefix",
- "portable-atomic",
- "tokio",
- "unicode-width",
 ]
 
 [[package]]
@@ -2611,72 +1917,11 @@ name = "ipnet"
 version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "iroh"
-version = "0.28.1"
-dependencies = [
- "anyhow",
- "async-channel",
- "bao-tree",
- "bytes",
- "cc",
- "clap",
- "console",
- "derive_more",
- "futures-buffered",
- "futures-lite 2.4.0",
- "futures-util",
- "genawaiter",
- "hex",
- "indicatif",
- "iroh",
- "iroh-base",
- "iroh-blobs",
- "iroh-docs",
- "iroh-gossip",
- "iroh-io",
- "iroh-metrics",
- "iroh-net",
- "iroh-quinn",
- "iroh-relay",
- "iroh-router",
- "iroh-test",
- "nested_enum_utils",
- "num_cpus",
- "parking_lot",
- "portable-atomic",
- "postcard",
- "proptest",
- "quic-rpc",
- "quic-rpc-derive",
- "rand",
- "rand_chacha",
- "ref-cast",
- "regex",
- "serde",
- "serde-error",
- "serde_json",
- "strum 0.25.0",
- "tempfile",
- "test-strategy 0.4.0",
- "testdir",
- "testresult",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "tracing",
- "tracing-subscriber",
- "url",
-]
 
 [[package]]
 name = "iroh-base"
 version = "0.28.0"
+source = "git+https://github.com/n0-computer/iroh?branch=main#1084400e215769ff4d58cf2bc00fc2336e278dba"
 dependencies = [
  "aead",
  "anyhow",
@@ -2688,16 +1933,12 @@ dependencies = [
  "getrandom",
  "hex",
  "iroh-blake3",
- "iroh-test",
  "once_cell",
  "postcard",
- "proptest",
  "rand",
  "rand_core",
  "redb 2.2.0",
  "serde",
- "serde_json",
- "serde_test",
  "ssh-key",
  "thiserror",
  "ttl_cache",
@@ -2729,230 +1970,45 @@ dependencies = [
  "bytes",
  "chrono",
  "derive_more",
- "futures-buffered",
- "futures-lite 2.4.0",
- "futures-util",
- "genawaiter",
- "hashlink",
- "hex",
- "iroh-base",
- "iroh-io",
- "iroh-metrics",
- "iroh-net",
- "iroh-quinn",
- "iroh-router",
- "nested_enum_utils",
- "num_cpus",
- "oneshot",
- "parking_lot",
- "pin-project",
- "portable-atomic",
- "postcard",
- "quic-rpc",
- "quic-rpc-derive",
- "rand",
- "range-collections",
- "redb 1.5.1",
- "redb 2.2.0",
- "ref-cast",
- "reflink-copy",
- "self_cell",
- "serde",
- "serde-error",
- "smallvec",
- "strum 0.26.3",
- "tempfile",
- "thiserror",
- "tokio",
- "tokio-util",
- "tracing",
- "tracing-futures",
- "walkdir",
-]
-
-[[package]]
-name = "iroh-cli"
-version = "0.28.1"
-dependencies = [
- "anyhow",
- "async-channel",
- "bao-tree",
- "bytes",
- "clap",
- "colored",
- "comfy-table",
- "console",
- "crossterm",
- "derive_more",
- "dialoguer",
- "dirs-next",
- "duct",
- "futures-buffered",
- "futures-lite 2.4.0",
- "futures-util",
- "hex",
- "human-time",
- "indicatif",
- "iroh",
- "iroh-docs",
- "iroh-gossip",
- "iroh-metrics",
- "nix 0.27.1",
- "parking_lot",
- "pkarr",
- "portable-atomic",
- "portmapper",
- "postcard",
- "quic-rpc",
- "rand",
- "rand_xorshift",
- "ratatui",
- "regex",
- "reqwest",
- "rustyline",
- "serde",
- "serde_with",
- "shell-words",
- "shellexpand",
- "strum 0.26.3",
- "tempfile",
- "testdir",
- "thiserror",
- "time",
- "tokio",
- "tokio-util",
- "toml",
- "tracing",
- "tracing-appender",
- "tracing-subscriber",
- "url",
- "walkdir",
-]
-
-[[package]]
-name = "iroh-dns-server"
-version = "0.28.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "axum",
- "axum-server",
- "base64-url",
- "bytes",
- "clap",
- "derive_more",
- "dirs-next",
- "futures-lite 2.4.0",
- "governor",
- "hickory-proto 0.25.0-alpha.2",
- "hickory-resolver",
- "hickory-server",
- "http 1.1.0",
- "iroh-metrics",
- "iroh-net",
- "iroh-test",
- "lru",
- "mainline",
- "parking_lot",
- "pkarr",
- "rcgen",
- "redb 2.2.0",
- "regex",
- "rustls",
- "rustls-pemfile",
- "serde",
- "struct_iterable",
- "strum 0.26.3",
- "tokio",
- "tokio-rustls",
- "tokio-rustls-acme",
- "tokio-stream",
- "tokio-util",
- "toml",
- "tower-http",
- "tower_governor",
- "tracing",
- "tracing-subscriber",
- "ttl_cache",
- "url",
- "z32",
-]
-
-[[package]]
-name = "iroh-docs"
-version = "0.28.0"
-source = "git+https://github.com/n0-computer/iroh-docs?branch=main#9166b226fedc889218986eb6ef2a3d3cdcdee367"
-dependencies = [
- "anyhow",
- "async-channel",
- "bytes",
- "derive_more",
- "ed25519-dalek",
- "futures-buffered",
- "futures-lite 2.4.0",
- "futures-util",
- "hex",
- "iroh-base",
- "iroh-blake3",
- "iroh-blobs",
- "iroh-gossip",
- "iroh-metrics",
- "iroh-net",
- "iroh-router",
- "lru",
- "nested_enum_utils",
- "num_enum",
- "portable-atomic",
- "postcard",
- "quic-rpc",
- "quic-rpc-derive",
- "rand",
- "rand_core",
- "redb 1.5.1",
- "redb 2.2.0",
- "self_cell",
- "serde",
- "serde-error",
- "strum 0.26.3",
- "tempfile",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "iroh-gossip"
-version = "0.28.1"
-source = "git+https://github.com/n0-computer/iroh-gossip?branch=main#3d6659daf326f57cbafec189be996b89c7f441bd"
-dependencies = [
- "anyhow",
- "async-channel",
- "bytes",
- "derive_more",
- "ed25519-dalek",
- "futures-concurrency",
+ "futures-buffered",
  "futures-lite 2.4.0",
  "futures-util",
- "indexmap 2.6.0",
+ "genawaiter",
+ "hashlink",
+ "hex",
  "iroh-base",
- "iroh-blake3",
+ "iroh-io",
  "iroh-metrics",
  "iroh-net",
+ "iroh-quinn",
  "iroh-router",
  "nested_enum_utils",
+ "num_cpus",
+ "oneshot",
+ "parking_lot",
+ "pin-project",
+ "portable-atomic",
  "postcard",
  "quic-rpc",
  "quic-rpc-derive",
  "rand",
- "rand_core",
+ "range-collections",
+ "redb 1.5.1",
+ "redb 2.2.0",
+ "ref-cast",
+ "reflink-copy",
+ "self_cell",
  "serde",
  "serde-error",
- "strum 0.26.3",
+ "smallvec",
+ "strum",
+ "tempfile",
+ "thiserror",
  "tokio",
  "tokio-util",
  "tracing",
+ "tracing-futures",
+ "walkdir",
 ]
 
 [[package]]
@@ -2971,6 +2027,7 @@ dependencies = [
 [[package]]
 name = "iroh-metrics"
 version = "0.28.0"
+source = "git+https://github.com/n0-computer/iroh?branch=main#1084400e215769ff4d58cf2bc00fc2336e278dba"
 dependencies = [
  "anyhow",
  "erased_set",
@@ -2990,6 +2047,7 @@ dependencies = [
 [[package]]
 name = "iroh-net"
 version = "0.28.1"
+source = "git+https://github.com/n0-computer/iroh?branch=main#1084400e215769ff4d58cf2bc00fc2336e278dba"
 dependencies = [
  "anyhow",
  "axum",
@@ -2997,9 +2055,6 @@ dependencies = [
  "base64 0.22.1",
  "bytes",
  "cc",
- "clap",
- "criterion",
- "crypto_box",
  "der",
  "derive_more",
  "duct",
@@ -3011,7 +2066,7 @@ dependencies = [
  "genawaiter",
  "governor",
  "hex",
- "hickory-proto 0.25.0-alpha.2",
+ "hickory-proto",
  "hickory-resolver",
  "hostname",
  "http 1.1.0",
@@ -3021,14 +2076,11 @@ dependencies = [
  "igd-next",
  "iroh-base",
  "iroh-metrics",
- "iroh-net",
  "iroh-quinn",
  "iroh-quinn-proto",
  "iroh-quinn-udp",
  "iroh-relay",
- "iroh-test",
  "libc",
- "mainline",
  "netdev",
  "netlink-packet-core",
  "netlink-packet-route",
@@ -3041,25 +2093,19 @@ dependencies = [
  "pkarr",
  "portmapper",
  "postcard",
- "pretty_assertions",
  "rand",
- "rand_chacha",
  "rcgen",
- "regex",
  "reqwest",
  "ring",
  "rtnetlink",
  "rustls",
  "rustls-webpki",
  "serde",
- "serde_json",
  "smallvec",
  "socket2",
- "strum 0.26.3",
+ "strum",
  "stun-rs",
  "surge-ping",
- "swarm-discovery",
- "testresult",
  "thiserror",
  "time",
  "tokio",
@@ -3069,7 +2115,6 @@ dependencies = [
  "tokio-tungstenite-wasm",
  "tokio-util",
  "tracing",
- "tracing-subscriber",
  "tungstenite",
  "url",
  "watchable",
@@ -3080,26 +2125,6 @@ dependencies = [
  "z32",
 ]
 
-[[package]]
-name = "iroh-net-bench"
-version = "0.27.0"
-dependencies = [
- "anyhow",
- "bytes",
- "clap",
- "futures-lite 2.4.0",
- "hdrhistogram",
- "iroh-metrics",
- "iroh-net",
- "iroh-quinn",
- "rcgen",
- "rustls",
- "socket2",
- "tokio",
- "tracing",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "iroh-quinn"
 version = "0.12.0"
@@ -3152,20 +2177,21 @@ dependencies = [
 [[package]]
 name = "iroh-relay"
 version = "0.28.0"
+source = "git+https://github.com/n0-computer/iroh?branch=main#1084400e215769ff4d58cf2bc00fc2336e278dba"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
  "bytes",
  "clap",
- "crypto_box",
  "derive_more",
  "duct",
+ "futures-buffered",
  "futures-lite 2.4.0",
  "futures-sink",
  "futures-util",
  "governor",
  "hex",
- "hickory-proto 0.25.0-alpha.2",
+ "hickory-proto",
  "hickory-resolver",
  "hostname",
  "http 1.1.0",
@@ -3174,16 +2200,13 @@ dependencies = [
  "hyper-util",
  "iroh-base",
  "iroh-metrics",
- "iroh-test",
  "libc",
  "num_enum",
  "once_cell",
  "parking_lot",
  "pin-project",
  "postcard",
- "proptest",
  "rand",
- "rand_chacha",
  "rcgen",
  "regex",
  "reqwest",
@@ -3192,7 +2215,6 @@ dependencies = [
  "rustls-pemfile",
  "rustls-webpki",
  "serde",
- "serde_json",
  "smallvec",
  "socket2",
  "stun-rs",
@@ -3215,9 +2237,9 @@ dependencies = [
 [[package]]
 name = "iroh-router"
 version = "0.28.0"
+source = "git+https://github.com/n0-computer/iroh?branch=main#1084400e215769ff4d58cf2bc00fc2336e278dba"
 dependencies = [
  "anyhow",
- "clap",
  "futures-buffered",
  "futures-lite 2.4.0",
  "futures-util",
@@ -3225,12 +2247,12 @@ dependencies = [
  "tokio",
  "tokio-util",
  "tracing",
- "tracing-subscriber",
 ]
 
 [[package]]
 name = "iroh-test"
 version = "0.28.0"
+source = "git+https://github.com/n0-computer/iroh?branch=main#1084400e215769ff4d58cf2bc00fc2336e278dba"
 dependencies = [
  "anyhow",
  "tokio",
@@ -3240,7 +2262,7 @@ dependencies = [
 
 [[package]]
 name = "iroh-willow"
-version = "0.27.0"
+version = "0.28.0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -3276,10 +2298,10 @@ dependencies = [
  "serde",
  "serde-error",
  "sha2",
- "strum 0.26.3",
+ "strum",
  "syncify",
  "tempfile",
- "test-strategy 0.3.1",
+ "test-strategy",
  "testresult",
  "thiserror",
  "tokio",
@@ -3295,41 +2317,12 @@ dependencies = [
  "zerocopy-derive",
 ]
 
-[[package]]
-name = "is-terminal"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
-dependencies = [
- "hermit-abi 0.4.0",
- "libc",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.13.0"
@@ -3395,16 +2388,6 @@ version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
 
-[[package]]
-name = "libredox"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-dependencies = [
- "bitflags 2.6.0",
- "libc",
-]
-
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
@@ -3463,9 +2446,6 @@ name = "lru"
 version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
-dependencies = [
- "hashbrown 0.15.1",
-]
 
 [[package]]
 name = "lru-cache"
@@ -3575,25 +2555,13 @@ dependencies = [
  "adler2",
 ]
 
-[[package]]
-name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "log",
- "wasi",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "mio"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
  "libc",
  "wasi",
  "windows-sys 0.52.0",
@@ -3705,6 +2673,7 @@ dependencies = [
 [[package]]
 name = "netwatch"
 version = "0.1.0"
+source = "git+https://github.com/n0-computer/iroh?branch=main#1084400e215769ff4d58cf2bc00fc2336e278dba"
 dependencies = [
  "anyhow",
  "bytes",
@@ -3730,15 +2699,6 @@ dependencies = [
  "wmi",
 ]
 
-[[package]]
-name = "nibble_vec"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
-dependencies = [
- "smallvec",
-]
-
 [[package]]
 name = "nix"
 version = "0.26.4"
@@ -3750,17 +2710,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "nix"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "no-std-compat"
 version = "0.4.1"
@@ -3783,60 +2732,12 @@ dependencies = [
  "minimal-lexical",
 ]
 
-[[package]]
-name = "nonempty"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7"
-
 [[package]]
 name = "nonzero_ext"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
 
-[[package]]
-name = "ntapi"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "ntest"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb183f0a1da7a937f672e5ee7b7edb727bf52b8a52d531374ba8ebb9345c0330"
-dependencies = [
- "ntest_test_cases",
- "ntest_timeout",
-]
-
-[[package]]
-name = "ntest_test_cases"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16d0d3f2a488592e5368ebbe996e7f1d44aa13156efad201f5b4d84e150eaa93"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "ntest_timeout"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc7c92f190c97f79b4a332f5e81dcf68c8420af2045c936c9be0bc9de6f63b5"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -3916,7 +2817,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
  "libc",
 ]
 
@@ -3941,21 +2842,6 @@ dependencies = [
  "syn 2.0.87",
 ]
 
-[[package]]
-name = "num_threads"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "number_prefix"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
-
 [[package]]
 name = "object"
 version = "0.36.5"
@@ -3986,12 +2872,6 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e296cf87e61c9cfc1a61c3c63a0f7f286ed4554e0e22be84e8a38e1d264a2a29"
 
-[[package]]
-name = "oorandom"
-version = "11.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
-
 [[package]]
 name = "opaque-debug"
 version = "0.3.1"
@@ -4004,12 +2884,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
-[[package]]
-name = "option-ext"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
-
 [[package]]
 name = "os_pipe"
 version = "1.2.1"
@@ -4216,7 +3090,6 @@ dependencies = [
  "js-sys",
  "lru",
  "mainline",
- "rand",
  "self_cell",
  "simple-dns",
  "thiserror",
@@ -4249,34 +3122,6 @@ dependencies = [
  "spki",
 ]
 
-[[package]]
-name = "plotters"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
-dependencies = [
- "num-traits",
- "plotters-backend",
- "plotters-svg",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "plotters-backend"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
-
-[[package]]
-name = "plotters-svg"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
-dependencies = [
- "plotters-backend",
-]
-
 [[package]]
 name = "pnet_base"
 version = "0.34.0"
@@ -4339,6 +3184,7 @@ checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
 [[package]]
 name = "portmapper"
 version = "0.1.0"
+source = "git+https://github.com/n0-computer/iroh?branch=main#1084400e215769ff4d58cf2bc00fc2336e278dba"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
@@ -4350,10 +3196,8 @@ dependencies = [
  "iroh-metrics",
  "libc",
  "netwatch",
- "ntest",
  "num_enum",
  "rand",
- "rand_chacha",
  "serde",
  "smallvec",
  "socket2",
@@ -4384,7 +3228,6 @@ dependencies = [
  "cobs",
  "embedded-io 0.4.0",
  "embedded-io 0.6.1",
- "heapless",
  "postcard-derive",
  "serde",
 ]
@@ -4449,26 +3292,6 @@ dependencies = [
  "ucd-parse",
 ]
 
-[[package]]
-name = "prefix-trie"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cb065e4407d69a5a5265221262cceeafff7f1aabc545d01ed955cce92ee78b"
-dependencies = [
- "ipnet",
- "num-traits",
-]
-
-[[package]]
-name = "pretty_assertions"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
-dependencies = [
- "diff",
- "yansi",
-]
-
 [[package]]
 name = "primeorder"
 version = "0.13.6"
@@ -4593,7 +3416,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61e131f594054d27d077162815db3b5e9ddd76a28fbb9091b68095971e75c286"
 dependencies = [
  "anyhow",
- "bincode",
  "derive_more",
  "educe",
  "flume",
@@ -4601,13 +3423,10 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "hex",
- "iroh-quinn",
  "pin-project",
  "serde",
  "slab",
  "tokio",
- "tokio-serde",
- "tokio-util",
  "tracing",
 ]
 
@@ -4697,16 +3516,6 @@ dependencies = [
  "pest_derive",
 ]
 
-[[package]]
-name = "radix_trie"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
-dependencies = [
- "endian-type",
- "nibble_vec",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -4758,26 +3567,6 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "ratatui"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f44c9e68fd46eda15c646fbb85e1040b657a58cdc8c98db1d97a55930d991eef"
-dependencies = [
- "bitflags 2.6.0",
- "cassowary",
- "compact_str",
- "crossterm",
- "itertools 0.12.1",
- "lru",
- "paste",
- "stability",
- "strum 0.26.3",
- "unicode-segmentation",
- "unicode-truncate",
- "unicode-width",
-]
-
 [[package]]
 name = "raw-cpuid"
 version = "11.2.0"
@@ -4787,26 +3576,6 @@ dependencies = [
  "bitflags 2.6.0",
 ]
 
-[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "rcgen"
 version = "0.12.1"
@@ -4846,17 +3615,6 @@ dependencies = [
  "bitflags 2.6.0",
 ]
 
-[[package]]
-name = "redox_users"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
-dependencies = [
- "getrandom",
- "libredox",
- "thiserror",
-]
-
 [[package]]
 name = "ref-cast"
 version = "1.0.23"
@@ -5049,7 +3807,7 @@ dependencies = [
  "netlink-packet-utils",
  "netlink-proto",
  "netlink-sys",
- "nix 0.26.4",
+ "nix",
  "thiserror",
  "tokio",
 ]
@@ -5193,30 +3951,7 @@ dependencies = [
  "fnv",
  "quick-error",
  "tempfile",
- "wait-timeout",
-]
-
-[[package]]
-name = "rustyline"
-version = "12.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "clipboard-win",
- "fd-lock",
- "home",
- "libc",
- "log",
- "memchr",
- "nix 0.26.4",
- "radix_trie",
- "scopeguard",
- "unicode-segmentation",
- "unicode-width",
- "utf8parse",
- "winapi",
+ "wait-timeout",
 ]
 
 [[package]]
@@ -5313,9 +4048,6 @@ name = "semver"
 version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "serde"
@@ -5396,15 +4128,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_test"
-version = "1.0.177"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f901ee573cab6b3060453d2d5f0bae4e6d628c23c0a962ff9b5f1d7c8d4f1ed"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -5417,36 +4140,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_with"
-version = "3.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817"
-dependencies = [
- "base64 0.22.1",
- "chrono",
- "hex",
- "indexmap 1.9.3",
- "indexmap 2.6.0",
- "serde",
- "serde_derive",
- "serde_json",
- "serde_with_macros",
- "time",
-]
-
-[[package]]
-name = "serde_with_macros"
-version = "3.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn 2.0.87",
-]
-
 [[package]]
 name = "serdect"
 version = "0.2.0"
@@ -5504,48 +4197,12 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "shell-words"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
-
-[[package]]
-name = "shellexpand"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b"
-dependencies = [
- "dirs",
-]
-
 [[package]]
 name = "shlex"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
-[[package]]
-name = "signal-hook"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-mio"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
-dependencies = [
- "libc",
- "mio 0.8.11",
- "signal-hook",
-]
-
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.2"
@@ -5592,12 +4249,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "smol_str"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9"
-
 [[package]]
 name = "socket2"
 version = "0.5.7"
@@ -5678,34 +4329,12 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "stability"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac"
-dependencies = [
- "quote",
- "syn 2.0.87",
-]
-
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "str-buf"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
-
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -5749,19 +4378,7 @@ checksum = "78ad9e09554f0456d67a69c1584c9798ba733a5b50349a6c0d0948710523922d"
 dependencies = [
  "proc-macro2",
  "quote",
- "structmeta-derive 0.2.0",
- "syn 2.0.87",
-]
-
-[[package]]
-name = "structmeta"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329"
-dependencies = [
- "proc-macro2",
- "quote",
- "structmeta-derive 0.3.0",
+ "structmeta-derive",
  "syn 2.0.87",
 ]
 
@@ -5776,46 +4393,13 @@ dependencies = [
  "syn 2.0.87",
 ]
 
-[[package]]
-name = "structmeta-derive"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.87",
-]
-
-[[package]]
-name = "strum"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
-dependencies = [
- "strum_macros 0.25.3",
-]
-
 [[package]]
 name = "strum"
 version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
 dependencies = [
- "strum_macros 0.26.4",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.25.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 2.0.87",
+ "strum_macros",
 ]
 
 [[package]]
@@ -5824,7 +4408,7 @@ version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
  "rustversion",
@@ -5877,21 +4461,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "swarm-discovery"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39769914108ae68e261d85ceac7bce7095947130f79c29d4535e9b31fc702a40"
-dependencies = [
- "acto",
- "anyhow",
- "hickory-proto 0.24.1",
- "rand",
- "socket2",
- "tokio",
- "tracing",
-]
-
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -5962,20 +4531,6 @@ dependencies = [
  "syn 2.0.87",
 ]
 
-[[package]]
-name = "sysinfo"
-version = "0.26.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c18a6156d1f27a9592ee18c1a846ca8dd5c258b7179fc193ae87c74ebb666f5"
-dependencies = [
- "cfg-if",
- "core-foundation-sys",
- "libc",
- "ntapi",
- "once_cell",
- "winapi",
-]
-
 [[package]]
 name = "system-configuration"
 version = "0.6.1"
@@ -6018,36 +4573,10 @@ checksum = "b8361c808554228ad09bfed70f5c823caf8a3450b6881cc3a38eb57e8c08c1d9"
 dependencies = [
  "proc-macro2",
  "quote",
- "structmeta 0.2.0",
- "syn 2.0.87",
-]
-
-[[package]]
-name = "test-strategy"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bf41af45e3f54cc184831d629d41d5b2bda8297e29c81add7ae4f362ed5e01b"
-dependencies = [
- "proc-macro2",
- "quote",
- "structmeta 0.3.0",
+ "structmeta",
  "syn 2.0.87",
 ]
 
-[[package]]
-name = "testdir"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee79e927b64d193f5abb60d20a0eb56be0ee5a242fdeb8ce3bf054177006de52"
-dependencies = [
- "anyhow",
- "backtrace",
- "cargo_metadata",
- "once_cell",
- "sysinfo",
- "whoami",
-]
-
 [[package]]
 name = "testresult"
 version = "0.4.1"
@@ -6092,9 +4621,7 @@ checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
  "deranged",
  "itoa",
- "libc",
  "num-conv",
- "num_threads",
  "powerfmt",
  "serde",
  "time-core",
@@ -6127,16 +4654,6 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "tinytemplate"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
-dependencies = [
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "tinyvec"
 version = "1.8.0"
@@ -6161,7 +4678,7 @@ dependencies = [
  "backtrace",
  "bytes",
  "libc",
- "mio 1.0.2",
+ "mio",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
@@ -6199,7 +4716,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4ee7cbca7da86fa030e33b0deac55bad0e0bf8ab909f1a84666f04447f6339b"
 dependencies = [
  "async-trait",
- "axum-server",
  "base64 0.21.7",
  "chrono",
  "futures",
@@ -6222,21 +4738,6 @@ dependencies = [
  "x509-parser",
 ]
 
-[[package]]
-name = "tokio-serde"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "911a61637386b789af998ee23f50aa30d5fd7edcec8d6d3dedae5e5815205466"
-dependencies = [
- "bincode",
- "bytes",
- "educe",
- "futures-core",
- "futures-sink",
- "pin-project",
- "serde",
-]
-
 [[package]]
 name = "tokio-stream"
 version = "0.1.16"
@@ -6301,7 +4802,6 @@ version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
- "indexmap 2.6.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -6323,28 +4823,13 @@ version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
- "indexmap 2.6.0",
+ "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
  "winnow",
 ]
 
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
 [[package]]
 name = "tower"
 version = "0.5.1"
@@ -6361,23 +4846,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "tower-http"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
-dependencies = [
- "bitflags 2.6.0",
- "bytes",
- "http 1.1.0",
- "http-body",
- "http-body-util",
- "pin-project-lite",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
@@ -6390,22 +4858,6 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
-[[package]]
-name = "tower_governor"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3790eac6ad3fb8d9d96c2b040ae06e2517aa24b067545d1078b96ae72f7bb9a7"
-dependencies = [
- "axum",
- "forwarded-header-value",
- "governor",
- "http 1.1.0",
- "pin-project",
- "thiserror",
- "tower 0.4.13",
- "tracing",
-]
-
 [[package]]
 name = "tracing"
 version = "0.1.40"
@@ -6418,18 +4870,6 @@ dependencies = [
  "tracing-core",
 ]
 
-[[package]]
-name = "tracing-appender"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf"
-dependencies = [
- "crossbeam-channel",
- "thiserror",
- "time",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "tracing-attributes"
 version = "0.1.27"
@@ -6485,7 +4925,6 @@ dependencies = [
  "sharded-slab",
  "smallvec",
  "thread_local",
- "time",
  "tracing",
  "tracing-core",
  "tracing-log",
@@ -6590,29 +5029,6 @@ dependencies = [
  "tinyvec",
 ]
 
-[[package]]
-name = "unicode-segmentation"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
-
-[[package]]
-name = "unicode-truncate"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf"
-dependencies = [
- "itertools 0.13.0",
- "unicode-segmentation",
- "unicode-width",
-]
-
-[[package]]
-name = "unicode-width"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
-
 [[package]]
 name = "unicode-xid"
 version = "0.2.6"
@@ -6738,12 +5154,6 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
-[[package]]
-name = "wasite"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
-
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.95"
@@ -6842,17 +5252,6 @@ dependencies = [
  "rustls-pki-types",
 ]
 
-[[package]]
-name = "whoami"
-version = "1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
-dependencies = [
- "redox_syscall",
- "wasite",
- "web-sys",
-]
-
 [[package]]
 name = "widestring"
 version = "1.1.0"
@@ -6890,7 +5289,7 @@ dependencies = [
  "blake3",
  "genawaiter",
  "hex",
- "itertools 0.13.0",
+ "itertools",
  "redb 2.2.0",
  "ref-cast",
  "self_cell",
@@ -7277,12 +5676,6 @@ dependencies = [
  "xml-rs",
 ]
 
-[[package]]
-name = "yansi"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
-
 [[package]]
 name = "yasna"
 version = "0.5.2"
@@ -7391,3 +5784,13 @@ dependencies = [
  "quote",
  "syn 2.0.87",
 ]
+
+[[patch.unused]]
+name = "iroh-docs"
+version = "0.28.0"
+source = "git+https://github.com/n0-computer/iroh-docs?branch=main#9166b226fedc889218986eb6ef2a3d3cdcdee367"
+
+[[patch.unused]]
+name = "iroh-gossip"
+version = "0.28.1"
+source = "git+https://github.com/n0-computer/iroh-gossip?branch=main#3d6659daf326f57cbafec189be996b89c7f441bd"
diff --git a/Cargo.toml b/Cargo.toml
index 3f73396..247db45 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,19 +1,5 @@
 [workspace]
-members = [
-  "iroh",
-  "iroh-base",
-  "iroh-dns-server",
-  "iroh-metrics",
-  "iroh-net",
-  "iroh-test",
-  "iroh-net/bench",
-  "iroh-cli",
-  "iroh-relay",
-  "iroh-router",
-  "iroh-willow",
-  "net-tools/netwatch",
-  "net-tools/portmapper",
-]
+members = ["iroh-willow"]
 resolver = "2"
 
 [profile.release]
@@ -65,11 +51,11 @@ willow-data-model = { git = "https://github.com/n0-computer/willow-rs.git", bran
 willow-encoding = { git = "https://github.com/n0-computer/willow-rs.git", branch = "main" }
 meadowcap = { git = "https://github.com/n0-computer/willow-rs.git", branch = "main" }
 
-iroh-base = { path = "./iroh-base" }
-iroh-net = { path = "./iroh-net" }
-iroh-metrics = { path = "./iroh-metrics" }
-iroh-test = { path = "./iroh-test" }
-iroh-router = { path = "./iroh-router" }
+iroh-base = { git = "https://github.com/n0-computer/iroh", branch = "main" }
+iroh-net = { git = "https://github.com/n0-computer/iroh", branch = "main" }
+iroh-metrics = { git = "https://github.com/n0-computer/iroh", branch = "main" }
+iroh-test = { git = "https://github.com/n0-computer/iroh", branch = "main" }
+iroh-router = { git = "https://github.com/n0-computer/iroh", branch = "main" }
 
 iroh-gossip = { git = "https://github.com/n0-computer/iroh-gossip", branch = "main" }
 iroh-docs = { git = "https://github.com/n0-computer/iroh-docs", branch = "main" }
diff --git a/iroh-willow/Cargo.toml b/iroh-willow/Cargo.toml
index b4d57a5..f01e3c9 100644
--- a/iroh-willow/Cargo.toml
+++ b/iroh-willow/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iroh-willow"
-version = "0.27.0"
+version = "0.28.0"
 edition = "2021"
 readme = "README.md"
 description = "willow protocol implementation for iroh"
@@ -27,12 +27,12 @@ futures-lite = "2.3.0"
 futures-util = "0.3.30"
 genawaiter = "0.99.1"
 hex = "0.4.3"
-iroh-base = { version = "0.28.0", path = "../iroh-base" }
+iroh-base = { version = "0.28.0" }
 iroh-blake3 = "1.4.5"
 iroh-blobs = { version = "0.28.0" }
 iroh-io = { version = "0.6.0", features = ["stats"] }
-iroh-metrics = { version = "0.28.0", path = "../iroh-metrics", optional = true }
-iroh-net = { version = "0.28.0", path = "../iroh-net" }
+iroh-metrics = { version = "0.28.0", optional = true }
+iroh-net = { version = "0.28.0" }
 meadowcap = "0.1.0"
 nested_enum_utils = "0.1.0"
 postcard = { version = "1", default-features = false, features = [ "alloc", "use-std", "experimental-derive", ] }
@@ -61,8 +61,8 @@ zerocopy = { version = "0.7", features = ["derive"] }
 zerocopy-derive = "0.7"
 
 [dev-dependencies]
-iroh-test = { path = "../iroh-test" }
-iroh-net = { path = "../iroh-net", features = ["test-utils"] }
+iroh-test = { version = "0.28" }
+iroh-net = { version = "0.28", features = ["test-utils"] }
 rand_chacha = "0.3.1"
 tokio = { version = "1", features = ["sync", "macros"] }
 proptest = "1.2.0"

From 604732771b24b6a27221774be46a3afd761f51d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Kr=C3=BCger?= <philipp.krueger1@gmail.com>
Date: Thu, 14 Nov 2024 15:27:29 +0100
Subject: [PATCH 2/9] kick CI, softly


From 2dbb97db37a55bac155af67637e0de3c9c22feaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Kr=C3=BCger?= <philipp.krueger1@gmail.com>
Date: Thu, 14 Nov 2024 16:38:22 +0100
Subject: [PATCH 3/9] refactor: Move iroh-willow to top level

---
 Cargo.lock                                    |  10 -
 Cargo.toml                                    |  81 ++++++-
 README.md                                     |  55 ++---
 .../docs => docs}/willow-over-quic.md         |   0
 {iroh-willow/examples => examples}/bench.rs   |   0
 iroh-willow/Cargo.toml                        |  76 -------
 iroh-willow/LICENSE-APACHE                    | 201 ------------------
 iroh-willow/LICENSE-MIT                       |  25 ---
 iroh-willow/README.md                         |  20 --
 .../store/glue.txt                            |   0
 {iroh-willow/src => src}/engine.rs            |   0
 {iroh-willow/src => src}/engine/actor.rs      |   0
 .../src => src}/engine/peer_manager.rs        |   0
 {iroh-willow/src => src}/form.rs              |   0
 {iroh-willow/src => src}/interest.rs          |   0
 {iroh-willow/src => src}/lib.rs               |   0
 {iroh-willow/src => src}/net.rs               |   0
 {iroh-willow/src => src}/proto.rs             |   0
 {iroh-willow/src => src}/proto/data_model.rs  |   0
 {iroh-willow/src => src}/proto/grouping.rs    |   0
 {iroh-willow/src => src}/proto/keys.rs        |   0
 {iroh-willow/src => src}/proto/meadowcap.rs   |   0
 {iroh-willow/src => src}/proto/pai.rs         |   0
 {iroh-willow/src => src}/proto/wgps.rs        |   0
 .../src => src}/proto/wgps/challenge.rs       |   0
 .../src => src}/proto/wgps/channels.rs        |   0
 .../src => src}/proto/wgps/fingerprint.rs     |   0
 .../src => src}/proto/wgps/handles.rs         |   0
 .../src => src}/proto/wgps/messages.rs        |   0
 {iroh-willow/src => src}/rpc.rs               |   0
 {iroh-willow/src => src}/rpc/client.rs        |   0
 {iroh-willow/src => src}/rpc/handler.rs       |   0
 {iroh-willow/src => src}/rpc/proto.rs         |   0
 {iroh-willow/src => src}/session.rs           |   0
 .../src => src}/session/aoi_finder.rs         |   0
 .../src => src}/session/capabilities.rs       |   0
 {iroh-willow/src => src}/session/challenge.rs |   0
 {iroh-willow/src => src}/session/channels.rs  |   0
 {iroh-willow/src => src}/session/data.rs      |   0
 {iroh-willow/src => src}/session/error.rs     |   0
 {iroh-willow/src => src}/session/intents.rs   |   0
 .../src => src}/session/pai_finder.rs         |   0
 {iroh-willow/src => src}/session/payload.rs   |   0
 .../src => src}/session/reconciler.rs         |   0
 {iroh-willow/src => src}/session/resource.rs  |   0
 {iroh-willow/src => src}/session/run.rs       |   0
 .../src => src}/session/static_tokens.rs      |   0
 {iroh-willow/src => src}/store.rs             |   0
 {iroh-willow/src => src}/store/auth.rs        |   0
 {iroh-willow/src => src}/store/memory.rs      |   0
 {iroh-willow/src => src}/store/persistent.rs  |   0
 .../src => src}/store/persistent/tables.rs    |   0
 {iroh-willow/src => src}/store/traits.rs      |   0
 .../src => src}/store/willow_store_glue.rs    |   0
 {iroh-willow/src => src}/util.rs              |   0
 {iroh-willow/src => src}/util/channel.rs      |   0
 {iroh-willow/src => src}/util/codec.rs        |   0
 {iroh-willow/src => src}/util/codec2.rs       |   0
 {iroh-willow/src => src}/util/gen_stream.rs   |   0
 {iroh-willow/src => src}/util/pipe.rs         |   0
 {iroh-willow/src => src}/util/queue.rs        |   0
 {iroh-willow/src => src}/util/stream.rs       |   0
 {iroh-willow/src => src}/util/time.rs         |   0
 {iroh-willow/tests => tests}/basic.rs         |   0
 {iroh-willow/tests => tests}/spaces.rs        |   0
 65 files changed, 93 insertions(+), 375 deletions(-)
 rename {iroh-willow/docs => docs}/willow-over-quic.md (100%)
 rename {iroh-willow/examples => examples}/bench.rs (100%)
 delete mode 100644 iroh-willow/Cargo.toml
 delete mode 100644 iroh-willow/LICENSE-APACHE
 delete mode 100644 iroh-willow/LICENSE-MIT
 delete mode 100644 iroh-willow/README.md
 rename {iroh-willow/proptest-regressions => proptest-regressions}/store/glue.txt (100%)
 rename {iroh-willow/src => src}/engine.rs (100%)
 rename {iroh-willow/src => src}/engine/actor.rs (100%)
 rename {iroh-willow/src => src}/engine/peer_manager.rs (100%)
 rename {iroh-willow/src => src}/form.rs (100%)
 rename {iroh-willow/src => src}/interest.rs (100%)
 rename {iroh-willow/src => src}/lib.rs (100%)
 rename {iroh-willow/src => src}/net.rs (100%)
 rename {iroh-willow/src => src}/proto.rs (100%)
 rename {iroh-willow/src => src}/proto/data_model.rs (100%)
 rename {iroh-willow/src => src}/proto/grouping.rs (100%)
 rename {iroh-willow/src => src}/proto/keys.rs (100%)
 rename {iroh-willow/src => src}/proto/meadowcap.rs (100%)
 rename {iroh-willow/src => src}/proto/pai.rs (100%)
 rename {iroh-willow/src => src}/proto/wgps.rs (100%)
 rename {iroh-willow/src => src}/proto/wgps/challenge.rs (100%)
 rename {iroh-willow/src => src}/proto/wgps/channels.rs (100%)
 rename {iroh-willow/src => src}/proto/wgps/fingerprint.rs (100%)
 rename {iroh-willow/src => src}/proto/wgps/handles.rs (100%)
 rename {iroh-willow/src => src}/proto/wgps/messages.rs (100%)
 rename {iroh-willow/src => src}/rpc.rs (100%)
 rename {iroh-willow/src => src}/rpc/client.rs (100%)
 rename {iroh-willow/src => src}/rpc/handler.rs (100%)
 rename {iroh-willow/src => src}/rpc/proto.rs (100%)
 rename {iroh-willow/src => src}/session.rs (100%)
 rename {iroh-willow/src => src}/session/aoi_finder.rs (100%)
 rename {iroh-willow/src => src}/session/capabilities.rs (100%)
 rename {iroh-willow/src => src}/session/challenge.rs (100%)
 rename {iroh-willow/src => src}/session/channels.rs (100%)
 rename {iroh-willow/src => src}/session/data.rs (100%)
 rename {iroh-willow/src => src}/session/error.rs (100%)
 rename {iroh-willow/src => src}/session/intents.rs (100%)
 rename {iroh-willow/src => src}/session/pai_finder.rs (100%)
 rename {iroh-willow/src => src}/session/payload.rs (100%)
 rename {iroh-willow/src => src}/session/reconciler.rs (100%)
 rename {iroh-willow/src => src}/session/resource.rs (100%)
 rename {iroh-willow/src => src}/session/run.rs (100%)
 rename {iroh-willow/src => src}/session/static_tokens.rs (100%)
 rename {iroh-willow/src => src}/store.rs (100%)
 rename {iroh-willow/src => src}/store/auth.rs (100%)
 rename {iroh-willow/src => src}/store/memory.rs (100%)
 rename {iroh-willow/src => src}/store/persistent.rs (100%)
 rename {iroh-willow/src => src}/store/persistent/tables.rs (100%)
 rename {iroh-willow/src => src}/store/traits.rs (100%)
 rename {iroh-willow/src => src}/store/willow_store_glue.rs (100%)
 rename {iroh-willow/src => src}/util.rs (100%)
 rename {iroh-willow/src => src}/util/channel.rs (100%)
 rename {iroh-willow/src => src}/util/codec.rs (100%)
 rename {iroh-willow/src => src}/util/codec2.rs (100%)
 rename {iroh-willow/src => src}/util/gen_stream.rs (100%)
 rename {iroh-willow/src => src}/util/pipe.rs (100%)
 rename {iroh-willow/src => src}/util/queue.rs (100%)
 rename {iroh-willow/src => src}/util/stream.rs (100%)
 rename {iroh-willow/src => src}/util/time.rs (100%)
 rename {iroh-willow/tests => tests}/basic.rs (100%)
 rename {iroh-willow/tests => tests}/spaces.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index a2cfe1d..2b12df3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5784,13 +5784,3 @@ dependencies = [
  "quote",
  "syn 2.0.87",
 ]
-
-[[patch.unused]]
-name = "iroh-docs"
-version = "0.28.0"
-source = "git+https://github.com/n0-computer/iroh-docs?branch=main#9166b226fedc889218986eb6ef2a3d3cdcdee367"
-
-[[patch.unused]]
-name = "iroh-gossip"
-version = "0.28.1"
-source = "git+https://github.com/n0-computer/iroh-gossip?branch=main#3d6659daf326f57cbafec189be996b89c7f441bd"
diff --git a/Cargo.toml b/Cargo.toml
index 247db45..5095b6d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,79 @@
-[workspace]
-members = ["iroh-willow"]
-resolver = "2"
+[package]
+name = "iroh-willow"
+version = "0.28.0"
+edition = "2021"
+readme = "README.md"
+description = "willow protocol implementation for iroh"
+license = "MIT/Apache-2.0"
+authors = ["n0 team"]
+repository = "https://github.com/n0-computer/iroh"
+
+# Sadly this also needs to be updated in .github/workflows/ci.yml
+rust-version = "1.76"
+
+[lints]
+workspace = true
+
+[dependencies]
+anyhow = "1"
+bytes = { version = "1.4", features = ["serde"] }
+curve25519-dalek = { version = "4.1.3", features = [ "digest", "rand_core", "serde", ] }
+derive_more = { version = "1.0.0", features = [ "debug", "deref", "display", "from", "try_into", "into", "as_ref", "try_from", ] }
+ed25519-dalek = { version = "2.0.0", features = ["serde", "rand_core"] }
+either = "1.13.0"
+futures-buffered = "0.2.6"
+futures-concurrency = "7.6.0"
+futures-lite = "2.3.0"
+futures-util = "0.3.30"
+genawaiter = "0.99.1"
+hex = "0.4.3"
+iroh-base = { version = "0.28.0" }
+iroh-blake3 = "1.4.5"
+iroh-blobs = { version = "0.28.0" }
+iroh-io = { version = "0.6.0", features = ["stats"] }
+iroh-metrics = { version = "0.28.0", optional = true }
+iroh-net = { version = "0.28.0" }
+meadowcap = "0.1.0"
+nested_enum_utils = "0.1.0"
+postcard = { version = "1", default-features = false, features = [ "alloc", "use-std", "experimental-derive", ] }
+quic-rpc = "0.15.0"
+quic-rpc-derive = "0.15.0"
+rand = "0.8.5"
+rand_core = "0.6.4"
+redb = { version = "2.0.0" }
+ref-cast = "1.0.23"
+self_cell = "1.0.4"
+serde = { version = "1.0.164", features = ["derive"] }
+serde-error = "0.1.3"
+sha2 = "0.10.8"
+strum = { version = "0.26", features = ["derive"] }
+syncify = "0.1.0"
+thiserror = "1"
+tokio = { version = "1", features = ["sync"] }
+tokio-stream = { version = "0.1.15", features = ["sync"] }
+tokio-util = { version = "0.7", features = ["io-util", "io"] }
+tracing = "0.1"
+ufotofu = { version = "0.4.1", features = ["std"] }
+willow-data-model = "0.1.0"
+willow-encoding = "0.1.0"
+willow-store = { git = "https://github.com/n0-computer/willow-store.git", branch = "matheus23/redb-ref" }
+zerocopy = { version = "0.7", features = ["derive"] }
+zerocopy-derive = "0.7"
+
+[dev-dependencies]
+iroh-test = { version = "0.28" }
+iroh-net = { version = "0.28", features = ["test-utils"] }
+rand_chacha = "0.3.1"
+tokio = { version = "1", features = ["sync", "macros"] }
+proptest = "1.2.0"
+tempfile = "3.4"
+testresult = "0.4.0"
+test-strategy = "0.3.1"
+tracing-subscriber = "0.3.18"
+
+[features]
+default = ["metrics"]
+metrics = ["iroh-metrics"]
 
 [profile.release]
 debug = true
@@ -57,6 +130,4 @@ iroh-metrics = { git = "https://github.com/n0-computer/iroh", branch = "main" }
 iroh-test = { git = "https://github.com/n0-computer/iroh", branch = "main" }
 iroh-router = { git = "https://github.com/n0-computer/iroh", branch = "main" }
 
-iroh-gossip = { git = "https://github.com/n0-computer/iroh-gossip", branch = "main" }
-iroh-docs = { git = "https://github.com/n0-computer/iroh-docs", branch = "main" }
 iroh-blobs = { git = "https://github.com/n0-computer/iroh-blobs", branch = "matheus23/verified-streams" }
diff --git a/README.md b/README.md
index 710628c..0609efa 100644
--- a/README.md
+++ b/README.md
@@ -1,64 +1,43 @@
 <h1 align="center"><a href="https://iroh.computer"><img alt="iroh" src="./.img/iroh_wordmark.svg" width="100" /></a></h1>
 
 <h3 align="center">
-A toolkit for building distributed applications
+A minimal implementation of Willow, Meadowcap, and WGPS with iroh
 </h3>
 
-[![Documentation](https://img.shields.io/badge/docs-latest-blue.svg?style=flat-square)](https://docs.rs/iroh/)
-[![Crates.io](https://img.shields.io/crates/v/iroh.svg?style=flat-square)](https://crates.io/crates/iroh)
-[![downloads](https://img.shields.io/crates/d/iroh.svg?style=flat-square)](https://crates.io/crates/iroh)
+[![Documentation](https://img.shields.io/badge/docs-latest-blue.svg?style=flat-square)](https://docs.rs/iroh-willow/)
+[![Crates.io](https://img.shields.io/crates/v/iroh-willow.svg?style=flat-square)](https://crates.io/crates/iroh-willow)
+[![downloads](https://img.shields.io/crates/d/iroh-willow.svg?style=flat-square)](https://crates.io/crates/iroh-willow)
 [![Chat](https://img.shields.io/discord/1161119546170687619?logo=discord&style=flat-square)](https://discord.com/invite/DpmJgtU7cW)
 [![Youtube](https://img.shields.io/badge/YouTube-red?logo=youtube&logoColor=white&style=flat-square)](https://www.youtube.com/@n0computer)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)](LICENSE-MIT)
 [![License: Apache 2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg?style=flat-square)](LICENSE-APACHE)
-[![CI](https://github.com/n0-computer/iroh/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/n0-computer/iroh/actions/workflows/ci.yml)
+[![CI](https://github.com/n0-computer/iroh-willow/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/n0-computer/iroh-willow/actions/workflows/ci.yml)
 
 <div align="center">
   <h3>
-    <a href="https://iroh.computer/docs">
-      Docs Site
-    </a>
-    <span> | </span>
-    <a href="https://docs.rs/iroh">
+    <a href="https://docs.rs/iroh-willow">
       Rust Docs
     </a>
-    <span> | </span>
-    <a href="https://github.com/n0-computer/iroh/releases">
-      Releases
-    </a>
   </h3>
 </div>
 <br/>
 
-## Features
-
-- Documents - Authors create and join documents: mutable key-value stores that multiple users read from, write to, and sync with, subscribing to live updates in real time.
-- Blobs - Iroh works with content-addressed blobs of opaque data, which are often the bytes of a file.
-- Networking - At the core of iroh is the ability to connect any two devices, no matter where they are.
-
-## Overview
-
-Iroh is a protocol for syncing & moving bytes. Bytes of any size, on any device. At its core, it's a peer-2-peer network built on a _magic socket_ that establishes [QUIC](https://en.wikipedia.org/wiki/QUIC) connections between peers. Peers request and provide _blobs_ of opaque bytes that are incrementally verified by their BLAKE3 hash during transfer.
-
-## Getting Started
-
-Iroh is delivered as a Rust library and a CLI.
-
-### Library
-
-Run `cargo add iroh`, to add `iroh` to your project.
+# License
 
-### CLI
-
-Check out https://iroh.computer/docs/install to get started.
+This project is licensed under either of
 
-The implementation lives in the `iroh-cli` crate.
+ * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
+   http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or
+   http://opensource.org/licenses/MIT)
 
-### Links
+at your option.
 
-- [Introducing Iroh (video)](https://www.youtube.com/watch?v=RwAt36Xe3UI_)
-- [Iroh Examples](https://github.com/n0-computer/iroh-examples)
+### Contribution
 
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in this project by you, as defined in the Apache-2.0 license,
+shall be dual licensed as above, without any additional terms or conditions.
 
 ## License
 
diff --git a/iroh-willow/docs/willow-over-quic.md b/docs/willow-over-quic.md
similarity index 100%
rename from iroh-willow/docs/willow-over-quic.md
rename to docs/willow-over-quic.md
diff --git a/iroh-willow/examples/bench.rs b/examples/bench.rs
similarity index 100%
rename from iroh-willow/examples/bench.rs
rename to examples/bench.rs
diff --git a/iroh-willow/Cargo.toml b/iroh-willow/Cargo.toml
deleted file mode 100644
index f01e3c9..0000000
--- a/iroh-willow/Cargo.toml
+++ /dev/null
@@ -1,76 +0,0 @@
-[package]
-name = "iroh-willow"
-version = "0.28.0"
-edition = "2021"
-readme = "README.md"
-description = "willow protocol implementation for iroh"
-license = "MIT/Apache-2.0"
-authors = ["n0 team"]
-repository = "https://github.com/n0-computer/iroh"
-
-# Sadly this also needs to be updated in .github/workflows/ci.yml
-rust-version = "1.76"
-
-[lints]
-workspace = true
-
-[dependencies]
-anyhow = "1"
-bytes = { version = "1.4", features = ["serde"] }
-curve25519-dalek = { version = "4.1.3", features = [ "digest", "rand_core", "serde", ] }
-derive_more = { version = "1.0.0", features = [ "debug", "deref", "display", "from", "try_into", "into", "as_ref", "try_from", ] }
-ed25519-dalek = { version = "2.0.0", features = ["serde", "rand_core"] }
-either = "1.13.0"
-futures-buffered = "0.2.6"
-futures-concurrency = "7.6.0"
-futures-lite = "2.3.0"
-futures-util = "0.3.30"
-genawaiter = "0.99.1"
-hex = "0.4.3"
-iroh-base = { version = "0.28.0" }
-iroh-blake3 = "1.4.5"
-iroh-blobs = { version = "0.28.0" }
-iroh-io = { version = "0.6.0", features = ["stats"] }
-iroh-metrics = { version = "0.28.0", optional = true }
-iroh-net = { version = "0.28.0" }
-meadowcap = "0.1.0"
-nested_enum_utils = "0.1.0"
-postcard = { version = "1", default-features = false, features = [ "alloc", "use-std", "experimental-derive", ] }
-quic-rpc = "0.15.0"
-quic-rpc-derive = "0.15.0"
-rand = "0.8.5"
-rand_core = "0.6.4"
-redb = { version = "2.0.0" }
-ref-cast = "1.0.23"
-self_cell = "1.0.4"
-serde = { version = "1.0.164", features = ["derive"] }
-serde-error = "0.1.3"
-sha2 = "0.10.8"
-strum = { version = "0.26", features = ["derive"] }
-syncify = "0.1.0"
-thiserror = "1"
-tokio = { version = "1", features = ["sync"] }
-tokio-stream = { version = "0.1.15", features = ["sync"] }
-tokio-util = { version = "0.7", features = ["io-util", "io"] }
-tracing = "0.1"
-ufotofu = { version = "0.4.1", features = ["std"] }
-willow-data-model = "0.1.0"
-willow-encoding = "0.1.0"
-willow-store = { git = "https://github.com/n0-computer/willow-store.git", branch = "matheus23/redb-ref" }
-zerocopy = { version = "0.7", features = ["derive"] }
-zerocopy-derive = "0.7"
-
-[dev-dependencies]
-iroh-test = { version = "0.28" }
-iroh-net = { version = "0.28", features = ["test-utils"] }
-rand_chacha = "0.3.1"
-tokio = { version = "1", features = ["sync", "macros"] }
-proptest = "1.2.0"
-tempfile = "3.4"
-testresult = "0.4.0"
-test-strategy = "0.3.1"
-tracing-subscriber = "0.3.18"
-
-[features]
-default = ["metrics"]
-metrics = ["iroh-metrics"]
diff --git a/iroh-willow/LICENSE-APACHE b/iroh-willow/LICENSE-APACHE
deleted file mode 100644
index e2db928..0000000
--- a/iroh-willow/LICENSE-APACHE
+++ /dev/null
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [2023] [N0, INC]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/iroh-willow/LICENSE-MIT b/iroh-willow/LICENSE-MIT
deleted file mode 100644
index dfd85ba..0000000
--- a/iroh-willow/LICENSE-MIT
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2023
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/iroh-willow/README.md b/iroh-willow/README.md
deleted file mode 100644
index f488797..0000000
--- a/iroh-willow/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# iroh-willow
-
-Minimal implementation of Willow, Meadowcap, and WGPS for iroh
-
-# License
-
-This project is licensed under either of
-
- * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
-   http://www.apache.org/licenses/LICENSE-2.0)
- * MIT license ([LICENSE-MIT](LICENSE-MIT) or
-   http://opensource.org/licenses/MIT)
-
-at your option.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in this project by you, as defined in the Apache-2.0 license,
-shall be dual licensed as above, without any additional terms or conditions.
diff --git a/iroh-willow/proptest-regressions/store/glue.txt b/proptest-regressions/store/glue.txt
similarity index 100%
rename from iroh-willow/proptest-regressions/store/glue.txt
rename to proptest-regressions/store/glue.txt
diff --git a/iroh-willow/src/engine.rs b/src/engine.rs
similarity index 100%
rename from iroh-willow/src/engine.rs
rename to src/engine.rs
diff --git a/iroh-willow/src/engine/actor.rs b/src/engine/actor.rs
similarity index 100%
rename from iroh-willow/src/engine/actor.rs
rename to src/engine/actor.rs
diff --git a/iroh-willow/src/engine/peer_manager.rs b/src/engine/peer_manager.rs
similarity index 100%
rename from iroh-willow/src/engine/peer_manager.rs
rename to src/engine/peer_manager.rs
diff --git a/iroh-willow/src/form.rs b/src/form.rs
similarity index 100%
rename from iroh-willow/src/form.rs
rename to src/form.rs
diff --git a/iroh-willow/src/interest.rs b/src/interest.rs
similarity index 100%
rename from iroh-willow/src/interest.rs
rename to src/interest.rs
diff --git a/iroh-willow/src/lib.rs b/src/lib.rs
similarity index 100%
rename from iroh-willow/src/lib.rs
rename to src/lib.rs
diff --git a/iroh-willow/src/net.rs b/src/net.rs
similarity index 100%
rename from iroh-willow/src/net.rs
rename to src/net.rs
diff --git a/iroh-willow/src/proto.rs b/src/proto.rs
similarity index 100%
rename from iroh-willow/src/proto.rs
rename to src/proto.rs
diff --git a/iroh-willow/src/proto/data_model.rs b/src/proto/data_model.rs
similarity index 100%
rename from iroh-willow/src/proto/data_model.rs
rename to src/proto/data_model.rs
diff --git a/iroh-willow/src/proto/grouping.rs b/src/proto/grouping.rs
similarity index 100%
rename from iroh-willow/src/proto/grouping.rs
rename to src/proto/grouping.rs
diff --git a/iroh-willow/src/proto/keys.rs b/src/proto/keys.rs
similarity index 100%
rename from iroh-willow/src/proto/keys.rs
rename to src/proto/keys.rs
diff --git a/iroh-willow/src/proto/meadowcap.rs b/src/proto/meadowcap.rs
similarity index 100%
rename from iroh-willow/src/proto/meadowcap.rs
rename to src/proto/meadowcap.rs
diff --git a/iroh-willow/src/proto/pai.rs b/src/proto/pai.rs
similarity index 100%
rename from iroh-willow/src/proto/pai.rs
rename to src/proto/pai.rs
diff --git a/iroh-willow/src/proto/wgps.rs b/src/proto/wgps.rs
similarity index 100%
rename from iroh-willow/src/proto/wgps.rs
rename to src/proto/wgps.rs
diff --git a/iroh-willow/src/proto/wgps/challenge.rs b/src/proto/wgps/challenge.rs
similarity index 100%
rename from iroh-willow/src/proto/wgps/challenge.rs
rename to src/proto/wgps/challenge.rs
diff --git a/iroh-willow/src/proto/wgps/channels.rs b/src/proto/wgps/channels.rs
similarity index 100%
rename from iroh-willow/src/proto/wgps/channels.rs
rename to src/proto/wgps/channels.rs
diff --git a/iroh-willow/src/proto/wgps/fingerprint.rs b/src/proto/wgps/fingerprint.rs
similarity index 100%
rename from iroh-willow/src/proto/wgps/fingerprint.rs
rename to src/proto/wgps/fingerprint.rs
diff --git a/iroh-willow/src/proto/wgps/handles.rs b/src/proto/wgps/handles.rs
similarity index 100%
rename from iroh-willow/src/proto/wgps/handles.rs
rename to src/proto/wgps/handles.rs
diff --git a/iroh-willow/src/proto/wgps/messages.rs b/src/proto/wgps/messages.rs
similarity index 100%
rename from iroh-willow/src/proto/wgps/messages.rs
rename to src/proto/wgps/messages.rs
diff --git a/iroh-willow/src/rpc.rs b/src/rpc.rs
similarity index 100%
rename from iroh-willow/src/rpc.rs
rename to src/rpc.rs
diff --git a/iroh-willow/src/rpc/client.rs b/src/rpc/client.rs
similarity index 100%
rename from iroh-willow/src/rpc/client.rs
rename to src/rpc/client.rs
diff --git a/iroh-willow/src/rpc/handler.rs b/src/rpc/handler.rs
similarity index 100%
rename from iroh-willow/src/rpc/handler.rs
rename to src/rpc/handler.rs
diff --git a/iroh-willow/src/rpc/proto.rs b/src/rpc/proto.rs
similarity index 100%
rename from iroh-willow/src/rpc/proto.rs
rename to src/rpc/proto.rs
diff --git a/iroh-willow/src/session.rs b/src/session.rs
similarity index 100%
rename from iroh-willow/src/session.rs
rename to src/session.rs
diff --git a/iroh-willow/src/session/aoi_finder.rs b/src/session/aoi_finder.rs
similarity index 100%
rename from iroh-willow/src/session/aoi_finder.rs
rename to src/session/aoi_finder.rs
diff --git a/iroh-willow/src/session/capabilities.rs b/src/session/capabilities.rs
similarity index 100%
rename from iroh-willow/src/session/capabilities.rs
rename to src/session/capabilities.rs
diff --git a/iroh-willow/src/session/challenge.rs b/src/session/challenge.rs
similarity index 100%
rename from iroh-willow/src/session/challenge.rs
rename to src/session/challenge.rs
diff --git a/iroh-willow/src/session/channels.rs b/src/session/channels.rs
similarity index 100%
rename from iroh-willow/src/session/channels.rs
rename to src/session/channels.rs
diff --git a/iroh-willow/src/session/data.rs b/src/session/data.rs
similarity index 100%
rename from iroh-willow/src/session/data.rs
rename to src/session/data.rs
diff --git a/iroh-willow/src/session/error.rs b/src/session/error.rs
similarity index 100%
rename from iroh-willow/src/session/error.rs
rename to src/session/error.rs
diff --git a/iroh-willow/src/session/intents.rs b/src/session/intents.rs
similarity index 100%
rename from iroh-willow/src/session/intents.rs
rename to src/session/intents.rs
diff --git a/iroh-willow/src/session/pai_finder.rs b/src/session/pai_finder.rs
similarity index 100%
rename from iroh-willow/src/session/pai_finder.rs
rename to src/session/pai_finder.rs
diff --git a/iroh-willow/src/session/payload.rs b/src/session/payload.rs
similarity index 100%
rename from iroh-willow/src/session/payload.rs
rename to src/session/payload.rs
diff --git a/iroh-willow/src/session/reconciler.rs b/src/session/reconciler.rs
similarity index 100%
rename from iroh-willow/src/session/reconciler.rs
rename to src/session/reconciler.rs
diff --git a/iroh-willow/src/session/resource.rs b/src/session/resource.rs
similarity index 100%
rename from iroh-willow/src/session/resource.rs
rename to src/session/resource.rs
diff --git a/iroh-willow/src/session/run.rs b/src/session/run.rs
similarity index 100%
rename from iroh-willow/src/session/run.rs
rename to src/session/run.rs
diff --git a/iroh-willow/src/session/static_tokens.rs b/src/session/static_tokens.rs
similarity index 100%
rename from iroh-willow/src/session/static_tokens.rs
rename to src/session/static_tokens.rs
diff --git a/iroh-willow/src/store.rs b/src/store.rs
similarity index 100%
rename from iroh-willow/src/store.rs
rename to src/store.rs
diff --git a/iroh-willow/src/store/auth.rs b/src/store/auth.rs
similarity index 100%
rename from iroh-willow/src/store/auth.rs
rename to src/store/auth.rs
diff --git a/iroh-willow/src/store/memory.rs b/src/store/memory.rs
similarity index 100%
rename from iroh-willow/src/store/memory.rs
rename to src/store/memory.rs
diff --git a/iroh-willow/src/store/persistent.rs b/src/store/persistent.rs
similarity index 100%
rename from iroh-willow/src/store/persistent.rs
rename to src/store/persistent.rs
diff --git a/iroh-willow/src/store/persistent/tables.rs b/src/store/persistent/tables.rs
similarity index 100%
rename from iroh-willow/src/store/persistent/tables.rs
rename to src/store/persistent/tables.rs
diff --git a/iroh-willow/src/store/traits.rs b/src/store/traits.rs
similarity index 100%
rename from iroh-willow/src/store/traits.rs
rename to src/store/traits.rs
diff --git a/iroh-willow/src/store/willow_store_glue.rs b/src/store/willow_store_glue.rs
similarity index 100%
rename from iroh-willow/src/store/willow_store_glue.rs
rename to src/store/willow_store_glue.rs
diff --git a/iroh-willow/src/util.rs b/src/util.rs
similarity index 100%
rename from iroh-willow/src/util.rs
rename to src/util.rs
diff --git a/iroh-willow/src/util/channel.rs b/src/util/channel.rs
similarity index 100%
rename from iroh-willow/src/util/channel.rs
rename to src/util/channel.rs
diff --git a/iroh-willow/src/util/codec.rs b/src/util/codec.rs
similarity index 100%
rename from iroh-willow/src/util/codec.rs
rename to src/util/codec.rs
diff --git a/iroh-willow/src/util/codec2.rs b/src/util/codec2.rs
similarity index 100%
rename from iroh-willow/src/util/codec2.rs
rename to src/util/codec2.rs
diff --git a/iroh-willow/src/util/gen_stream.rs b/src/util/gen_stream.rs
similarity index 100%
rename from iroh-willow/src/util/gen_stream.rs
rename to src/util/gen_stream.rs
diff --git a/iroh-willow/src/util/pipe.rs b/src/util/pipe.rs
similarity index 100%
rename from iroh-willow/src/util/pipe.rs
rename to src/util/pipe.rs
diff --git a/iroh-willow/src/util/queue.rs b/src/util/queue.rs
similarity index 100%
rename from iroh-willow/src/util/queue.rs
rename to src/util/queue.rs
diff --git a/iroh-willow/src/util/stream.rs b/src/util/stream.rs
similarity index 100%
rename from iroh-willow/src/util/stream.rs
rename to src/util/stream.rs
diff --git a/iroh-willow/src/util/time.rs b/src/util/time.rs
similarity index 100%
rename from iroh-willow/src/util/time.rs
rename to src/util/time.rs
diff --git a/iroh-willow/tests/basic.rs b/tests/basic.rs
similarity index 100%
rename from iroh-willow/tests/basic.rs
rename to tests/basic.rs
diff --git a/iroh-willow/tests/spaces.rs b/tests/spaces.rs
similarity index 100%
rename from iroh-willow/tests/spaces.rs
rename to tests/spaces.rs

From 32a62156782aca71ec62e6c7d0adeb1f62ec3dcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Kr=C3=BCger?= <philipp.krueger1@gmail.com>
Date: Thu, 14 Nov 2024 17:06:39 +0100
Subject: [PATCH 4/9] Better badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0609efa..0286e87 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ A minimal implementation of Willow, Meadowcap, and WGPS with iroh
 [![Youtube](https://img.shields.io/badge/YouTube-red?logo=youtube&logoColor=white&style=flat-square)](https://www.youtube.com/@n0computer)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)](LICENSE-MIT)
 [![License: Apache 2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg?style=flat-square)](LICENSE-APACHE)
-[![CI](https://github.com/n0-computer/iroh-willow/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/n0-computer/iroh-willow/actions/workflows/ci.yml)
+[![CI](https://img.shields.io/github/actions/workflow/status/n0-computer/iroh-willow/ci.yml?branch=main&label=CI)](https://github.com/n0-computer/iroh-willow/actions/workflows/ci.yml)
 
 <div align="center">
   <h3>

From d74624809047f22998712829bbad8cf64de9d263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Kr=C3=BCger?= <philipp.krueger1@gmail.com>
Date: Thu, 14 Nov 2024 18:15:07 +0100
Subject: [PATCH 5/9] Adjust readme

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0286e87..8295703 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ A minimal implementation of Willow, Meadowcap, and WGPS with iroh
 [![Youtube](https://img.shields.io/badge/YouTube-red?logo=youtube&logoColor=white&style=flat-square)](https://www.youtube.com/@n0computer)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)](LICENSE-MIT)
 [![License: Apache 2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg?style=flat-square)](LICENSE-APACHE)
-[![CI](https://img.shields.io/github/actions/workflow/status/n0-computer/iroh-willow/ci.yml?branch=main&label=CI)](https://github.com/n0-computer/iroh-willow/actions/workflows/ci.yml)
+[![CI](https://img.shields.io/github/actions/workflow/status/n0-computer/iroh-willow/ci.yml?branch=main&label=CI&style=flat-square)](https://github.com/n0-computer/iroh-willow/actions/workflows/ci.yml)
 
 <div align="center">
   <h3>
@@ -22,6 +22,8 @@ A minimal implementation of Willow, Meadowcap, and WGPS with iroh
 </div>
 <br/>
 
+Read more about willow here: https://willowprotocol.org
+
 # License
 
 This project is licensed under either of

From 72cb433778de3c637ae7216418d8ae867c9f36e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Kr=C3=BCger?= <philipp.krueger1@gmail.com>
Date: Thu, 14 Nov 2024 18:15:40 +0100
Subject: [PATCH 6/9] Adjust CI

---
 .github/workflows/ci.yml | 97 +++-------------------------------------
 1 file changed, 7 insertions(+), 90 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d4971c5..0ce765d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -147,23 +147,6 @@ jobs:
       env:
         RUST_LOG: ${{ runner.debug && 'TRACE' || 'DEBUG' }}
 
-
-  wasm_build:
-    name: Build wasm32
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
-
-      - name: Install stable toolchain
-        uses: dtolnay/rust-toolchain@stable
-
-      - name: Add wasm target
-        run: rustup target add wasm32-unknown-unknown
-
-      - name: wasm32 build (iroh-base)
-        run: cargo build -p iroh-base --all-features --target wasm32-unknown-unknown
-
   check_semver:
     runs-on: ubuntu-latest
     env:
@@ -190,7 +173,7 @@ jobs:
         # uses: obi1kenobi/cargo-semver-checks-action@v2
         uses: n0-computer/cargo-semver-checks-action@feat-baseline
         with:
-          package: iroh, iroh-base, iroh-cli, iroh-dns-server, iroh-metrics, iroh-net, iroh-net-bench, iroh-router, netwatch, portmapper, iroh-relay
+          package: iroh-willow
           baseline-rev: ${{ env.HEAD_COMMIT_SHA }}
           use-cache: false
 
@@ -226,7 +209,7 @@ jobs:
       uses: mozilla-actions/sccache-action@v0.0.6
 
     - name: Docs
-      run: cargo doc --workspace --all-features --no-deps --document-private-items
+      run: cargo doc --all-features --no-deps --document-private-items
       env:
         RUSTDOCFLAGS: --cfg docsrs
 
@@ -247,13 +230,13 @@ jobs:
     # TODO: We have a bunch of platform-dependent code so should
     #    probably run this job on the full platform matrix
     - name: clippy check (all features)
-      run: cargo clippy --workspace --all-features --all-targets --bins --tests --benches
+      run: cargo clippy --all-features --all-targets --bins --tests --benches
 
     - name: clippy check (no features)
-      run: cargo clippy --workspace --no-default-features --lib --bins --tests
+      run: cargo clippy --no-default-features --lib --bins --tests
 
     - name: clippy check (default features)
-      run: cargo clippy --workspace --all-targets
+      run: cargo clippy --all-targets
 
   msrv:
     if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')"
@@ -273,7 +256,7 @@ jobs:
 
     - name: Check MSRV all features
       run: |
-        cargo +$MSRV check --workspace --all-targets
+        cargo +$MSRV check --all-targets
 
   cargo_deny:
     timeout-minutes: 30
@@ -283,76 +266,10 @@ jobs:
       - uses: actions/checkout@v4
       - uses: EmbarkStudios/cargo-deny-action@v2
         with:
-          arguments: --workspace --all-features
+          arguments: --all-features
           command: check
           command-arguments: "-Dwarnings"
 
-  netsim-integration-tests:
-    permissions: write-all
-    if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')"
-    uses: './.github/workflows/netsim_runner.yaml'
-    secrets: inherit
-    with:
-      branch: ${{ github.ref }}
-      max_workers: 4
-      netsim_branch: "main"
-      sim_paths: "sims/iroh/iroh.json,sims/integration"
-      pr_number: ${{ github.event.pull_request.number || '' }}
-
-  docker_build_and_test:
-    name: Docker Test
-    if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')"
-    timeout-minutes: 30
-    runs-on: [self-hosted, linux, X64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install rust
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: stable
-
-      - name: Install sccache
-        uses: mozilla-actions/sccache-action@v0.0.6
-
-      - name: Prep
-        run: sudo apt-get install musl-tools -y
-
-      - name: Build iroh
-        run: cargo build --profile=dev-ci --all-features --bin iroh --target x86_64-unknown-linux-musl
-
-      - name: Prep bins
-        run: |
-          mkdir -p bins/linux/amd64
-          cp target/x86_64-unknown-linux-musl/dev-ci/iroh bins/linux/amd64/iroh
-
-      - name: Cleanup Docker
-        continue-on-error: true
-        run: |
-          docker kill $(docker ps -q)
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: false
-          load: true
-          tags: n0computer/iroh-test:latest
-          target: iroh
-          platforms: linux/amd64
-          file: docker/Dockerfile.ci
-
-      - name: Run Docker image & stats test
-        run: |
-          docker run -p 9090:9090 -p 4919:4919/udp -Pd n0computer/iroh-test:latest --rpc-addr 0.0.0.0:4919 start
-          # Give the server time to start
-          sleep 3
-          target/x86_64-unknown-linux-musl/dev-ci/iroh --rpc-addr 127.0.0.1:4919 stats
-
   codespell:
     timeout-minutes: 30
     runs-on: ubuntu-latest

From 4056825f5b7c9b45f708290b1c3b7b1adbeb0572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Kr=C3=BCger?= <philipp.krueger1@gmail.com>
Date: Fri, 15 Nov 2024 08:25:53 +0100
Subject: [PATCH 7/9] `cargo clippy --fix` && increase MSRV to 1.77 (async
 recursion)

---
 .github/workflows/ci.yml       | 2 +-
 Cargo.toml                     | 2 +-
 src/proto/wgps/fingerprint.rs  | 2 +-
 src/store/persistent.rs        | 6 +++---
 src/store/persistent/tables.rs | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0ce765d..14a1f22 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ env:
   RUST_BACKTRACE: 1
   RUSTFLAGS: -Dwarnings
   RUSTDOCFLAGS: -Dwarnings
-  MSRV: "1.76"
+  MSRV: "1.77"
   SCCACHE_CACHE_SIZE: "50G"
   IROH_FORCE_STAGING_RELAYS: "1"
 
diff --git a/Cargo.toml b/Cargo.toml
index 5095b6d..4cf20f5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ authors = ["n0 team"]
 repository = "https://github.com/n0-computer/iroh"
 
 # Sadly this also needs to be updated in .github/workflows/ci.yml
-rust-version = "1.76"
+rust-version = "1.77"
 
 [lints]
 workspace = true
diff --git a/src/proto/wgps/fingerprint.rs b/src/proto/wgps/fingerprint.rs
index d627514..953da2a 100644
--- a/src/proto/wgps/fingerprint.rs
+++ b/src/proto/wgps/fingerprint.rs
@@ -66,7 +66,7 @@ impl LiftingCommutativeMonoid<PointRef<IrohWillowParams>, StoredAuthorisedEntry>
     }
 
     fn combine(&self, other: &Self) -> Self {
-        let mut slf = self.clone();
+        let mut slf = *self;
         slf ^= *other;
         slf
     }
diff --git a/src/store/persistent.rs b/src/store/persistent.rs
index f5d6c1a..eff8a29 100644
--- a/src/store/persistent.rs
+++ b/src/store/persistent.rs
@@ -95,7 +95,7 @@ impl WillowStore {
     ///
     /// The file will be created if it does not exist, otherwise it will be opened.
     pub fn persistent(path: impl AsRef<std::path::Path>) -> Result<Self> {
-        let db = Database::create(&path.as_ref())?;
+        let db = Database::create(path.as_ref())?;
         Self::new_impl(db)
     }
 
@@ -260,9 +260,9 @@ impl WillowSnapshot {
 
         Ok(either::Right(
             ns_node
-                .split_range_owned(to_query(&range), split_factor, self.clone())
+                .split_range_owned(to_query(range), split_factor, self.clone())
                 .map({
-                    let ns_node = ns_node.clone();
+                    let ns_node = ns_node;
                     move |result| {
                         let (range, count) = result?;
                         if count <= max_set_size {
diff --git a/src/store/persistent/tables.rs b/src/store/persistent/tables.rs
index ae20549..5d74322 100644
--- a/src/store/persistent/tables.rs
+++ b/src/store/persistent/tables.rs
@@ -115,7 +115,7 @@ impl OpenRead {
             auth_tokens: tx.open_table(AUTH_TOKENS)?,
             read_caps: tx.open_multimap_table(READ_CAPS)?,
             write_caps: tx.open_multimap_table(WRITE_CAPS)?,
-            node_store: willow_store::Snapshot::open(&tx)?,
+            node_store: willow_store::Snapshot::open(tx)?,
         })
     }
 }

From a12c74099f708769580e5254df89561cace650b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Kr=C3=BCger?= <philipp.krueger1@gmail.com>
Date: Fri, 15 Nov 2024 08:27:11 +0100
Subject: [PATCH 8/9] Mark `test_restricted_area` as flaky test

---
 deny.toml       | 2 --
 tests/spaces.rs | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/deny.toml b/deny.toml
index 784d4b4..4b100d2 100644
--- a/deny.toml
+++ b/deny.toml
@@ -41,8 +41,6 @@ ignore = [
 [sources]
 allow-git = [
     "https://github.com/n0-computer/iroh-blobs.git",
-    "https://github.com/n0-computer/iroh-gossip.git",
-    "https://github.com/n0-computer/iroh-docs.git",
 ]
 
 # TODO(Frando): added for iroh-willow development, maybe remove again before release?
diff --git a/tests/spaces.rs b/tests/spaces.rs
index ff01d8c..1ff19f0 100644
--- a/tests/spaces.rs
+++ b/tests/spaces.rs
@@ -579,6 +579,7 @@ async fn spaces_subscription() -> TestResult {
     Ok(())
 }
 
+#[ignore = "flaky"]
 #[tokio::test]
 async fn test_restricted_area() -> testresult::TestResult {
     iroh_test::logging::setup_multithreaded();

From 43a78037305cf4fcdd11fce9a39944ff00becb7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Kr=C3=BCger?= <philipp.krueger1@gmail.com>
Date: Fri, 15 Nov 2024 08:45:05 +0100
Subject: [PATCH 9/9] box `ReadAuthorization` due to size

---
 src/session/aoi_finder.rs |  4 ++--
 src/session/pai_finder.rs | 34 +++++++++++++++++-----------------
 src/store/persistent.rs   | 23 ++++++++++-------------
 3 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/src/session/aoi_finder.rs b/src/session/aoi_finder.rs
index dc59c0d..8f99e95 100644
--- a/src/session/aoi_finder.rs
+++ b/src/session/aoi_finder.rs
@@ -54,7 +54,7 @@ pub enum Input {
 #[derive(Debug)]
 pub enum Output {
     SendMessage(SetupBindAreaOfInterest),
-    SubmitAuthorisation(ReadAuthorisation),
+    SubmitAuthorisation(Box<ReadAuthorisation>),
     AoiIntersection(AoiIntersection),
     SignAndSendCapability {
         handle: IntersectionHandle,
@@ -133,7 +133,7 @@ impl IntersectionFinder {
                     // The authorisation is new. Submit to the PaiFinder.
                     entry.insert(aois);
                     self.co
-                        .yield_(Output::SubmitAuthorisation(authorisation))
+                        .yield_(Output::SubmitAuthorisation(Box::new(authorisation)))
                         .await;
                 }
             }
diff --git a/src/session/pai_finder.rs b/src/session/pai_finder.rs
index b925ddf..041e77e 100644
--- a/src/session/pai_finder.rs
+++ b/src/session/pai_finder.rs
@@ -46,14 +46,14 @@ pub enum PaiError {
 
 #[derive(Debug)]
 pub struct PaiIntersection {
-    pub authorisation: ReadAuthorisation,
+    pub authorisation: Box<ReadAuthorisation>, // Boxing due to size
     pub handle: IntersectionHandle,
 }
 
 #[derive(Debug)]
 pub enum Input {
     Established,
-    SubmitAuthorisation(ReadAuthorisation),
+    SubmitAuthorisation(Box<ReadAuthorisation>),
     ReceivedMessage(Result<IntersectionMessage, Error>),
     ReceivedSubspaceCapRequest(IntersectionHandle),
     ReceivedVerifiedSubspaceCapReply(IntersectionHandle, NamespaceId),
@@ -76,8 +76,8 @@ pub struct PaiFinder {
     our_intersection_handles: ResourceMap<IntersectionHandle, GroupState>,
     their_intersection_handles: ResourceMap<IntersectionHandle, GroupState>,
     requested_subspace_cap_handles: HashSet<IntersectionHandle>,
-    submitted: HashSet<ReadAuthorisation>,
-    pending: Option<HashSet<ReadAuthorisation>>,
+    submitted: HashSet<Box<ReadAuthorisation>>,
+    pending: Option<HashSet<Box<ReadAuthorisation>>>,
 }
 
 impl PaiFinder {
@@ -163,7 +163,7 @@ impl PaiFinder {
         Ok(())
     }
 
-    async fn submit_authorisation(&mut self, authorisation: ReadAuthorisation) {
+    async fn submit_authorisation(&mut self, authorisation: Box<ReadAuthorisation>) {
         if !self.submitted.insert(authorisation.clone()) {
             return;
         }
@@ -211,7 +211,7 @@ impl PaiFinder {
 
     async fn submit_fragment(
         &mut self,
-        authorisation: ReadAuthorisation,
+        authorisation: Box<ReadAuthorisation>,
         fragment: Fragment,
         kind: FragmentKind,
         is_most_specific: bool,
@@ -382,7 +382,7 @@ impl PaiFinder {
 #[derive(Debug)]
 pub struct LocalFragmentInfo {
     on_intersection: OnIntersection,
-    authorisation: ReadAuthorisation,
+    authorisation: Box<ReadAuthorisation>,
     namespace_id: NamespaceId,
     // will be needed for spec-compliant encodings of read capabilities
     #[allow(dead_code)]
@@ -394,7 +394,7 @@ pub struct LocalFragmentInfo {
 
 impl LocalFragmentInfo {
     fn new(
-        authorisation: ReadAuthorisation,
+        authorisation: Box<ReadAuthorisation>,
         fragment: Fragment,
         kind: FragmentKind,
         is_most_specific: bool,
@@ -538,16 +538,16 @@ mod tests {
 
         let (mut alfie, mut betty) = Handle::create_two();
 
-        alfie.submit(auth_alfie.clone()).await;
-        betty.submit(auth_betty.clone()).await;
+        alfie.submit(Box::new(auth_alfie.clone())).await;
+        betty.submit(Box::new(auth_betty.clone())).await;
 
         transfer::<PaiBindFragment>(&mut alfie, &betty).await;
         transfer::<PaiBindFragment>(&mut betty, &alfie).await;
         transfer::<PaiReplyFragment>(&mut alfie, &betty).await;
         transfer::<PaiReplyFragment>(&mut betty, &alfie).await;
 
-        assert_eq!(alfie.next_intersection().await.authorisation, auth_alfie);
-        assert_eq!(betty.next_intersection().await.authorisation, auth_betty);
+        assert_eq!(&*alfie.next_intersection().await.authorisation, &auth_alfie);
+        assert_eq!(&*betty.next_intersection().await.authorisation, &auth_betty);
 
         alfie.join().await;
         betty.join().await;
@@ -591,8 +591,8 @@ mod tests {
 
         let (mut alfie, mut betty) = Handle::create_two();
 
-        alfie.submit(alfie_auth.clone()).await;
-        betty.submit(betty_auth.clone()).await;
+        alfie.submit(Box::new(alfie_auth.clone())).await;
+        betty.submit(Box::new(betty_auth.clone())).await;
 
         transfer::<PaiBindFragment>(&mut alfie, &betty).await;
         transfer::<PaiBindFragment>(&mut betty, &alfie).await;
@@ -623,13 +623,13 @@ mod tests {
             .await;
 
         let next = alfie.next_intersection().await;
-        assert_eq!(next.authorisation, alfie_auth);
+        assert_eq!(&*next.authorisation, &alfie_auth);
         betty
             .input(Input::ReceivedReadCapForIntersection(next.handle))
             .await;
 
         let next = betty.next_intersection().await;
-        assert_eq!(next.authorisation, betty_auth);
+        assert_eq!(&*next.authorisation, &betty_auth);
 
         alfie.join().await;
         betty.join().await;
@@ -685,7 +685,7 @@ mod tests {
             self.input.send(input).await.unwrap();
         }
 
-        pub async fn submit(&self, auth: ReadAuthorisation) {
+        pub async fn submit(&self, auth: Box<ReadAuthorisation>) {
             self.input(Input::SubmitAuthorisation(auth)).await
         }
 
diff --git a/src/store/persistent.rs b/src/store/persistent.rs
index eff8a29..76d2f26 100644
--- a/src/store/persistent.rs
+++ b/src/store/persistent.rs
@@ -261,19 +261,16 @@ impl WillowSnapshot {
         Ok(either::Right(
             ns_node
                 .split_range_owned(to_query(range), split_factor, self.clone())
-                .map({
-                    let ns_node = ns_node;
-                    move |result| {
-                        let (range, count) = result?;
-                        if count <= max_set_size {
-                            Ok((to_range3d(range)?, traits::SplitAction::SendEntries(count)))
-                        } else {
-                            let fingerprint = ns_node.range_summary(&range, &self)?;
-                            Ok((
-                                to_range3d(range)?,
-                                traits::SplitAction::SendFingerprint(fingerprint),
-                            ))
-                        }
+                .map(move |result| {
+                    let (range, count) = result?;
+                    if count <= max_set_size {
+                        Ok((to_range3d(range)?, traits::SplitAction::SendEntries(count)))
+                    } else {
+                        let fingerprint = ns_node.range_summary(&range, &self)?;
+                        Ok((
+                            to_range3d(range)?,
+                            traits::SplitAction::SendFingerprint(fingerprint),
+                        ))
                     }
                 }),
         ))