refactor(iroh-willow): use willow-rs

Cargo.toml

@@ -1,17 +1,17 @@
 [workspace]
 members = [
-  "iroh",
-  "iroh-blobs",
-  "iroh-base",
-  "iroh-dns-server",
-  "iroh-gossip",
-  "iroh-metrics",
-  "iroh-net",
-  "iroh-docs",
-  "iroh-test",
-  "iroh-net/bench",
-  "iroh-cli",
-  "iroh-willow",
+    "iroh",
+    "iroh-blobs",
+    "iroh-base",
+    "iroh-dns-server",
+    "iroh-gossip",
+    "iroh-metrics",
+    "iroh-net",
+    "iroh-docs",
+    "iroh-test",
+    "iroh-net/bench",
+    "iroh-cli",
+    "iroh-willow",
 ]
 resolver = "2"
 
@@ -41,3 +41,11 @@ missing_debug_implementations = "warn"
 
 [workspace.lints.clippy]
 unused-async = "warn"
+
+[patch.crates-io]
+# willow-data-model = { path = "../willow-rs/data-model" }
+# willow-encoding = { path = "../willow-rs/encoding" }
+# meadowcap = { path = "../willow-rs/meadowcap" }
+willow-data-model = { git = "https://github.com/Frando/willow-rs.git", branch = "iroh-dev" }
+willow-encoding  = { git = "https://github.com/Frando/willow-rs.git", branch = "iroh-dev" }
+meadowcap  = { git = "https://github.com/Frando/willow-rs.git", branch = "iroh-dev" }

deny.toml

@@ -19,6 +19,7 @@ allow = [
       "Unicode-DFS-2016",
       "Zlib",
       "MPL-2.0", # https://fossa.com/blog/open-source-software-licenses-101-mozilla-public-license-2-0/
+      "CC-PDDC" # https://spdx.org/licenses/CC-PDDC.html
 ]
 
 [[licenses.clarify]]
@@ -31,3 +32,7 @@ license-files = [
 [advisories]
 ignore = [
 ]
+
+# TODO(Frando): added for iroh-willow development, maybe remove again before release?
+[sources.allow-org]
+github = ["n0-computer", "earthstar-project"]

iroh-willow/Cargo.toml

@@ -17,34 +17,39 @@ workspace = true
 [dependencies]
 anyhow = "1"
 bytes = { version = "1.4", features = ["serde"] }
-derive_more = { version = "1.0.0-beta.6", features = ["debug", "deref", "display", "from", "try_into", "into", "as_ref", "try_from"] }
+curve25519-dalek = { version = "4.1.3", features = [ "digest", "rand_core", "serde", ] }
+derive_more = { version = "1.0.0-beta.6", features = [ "debug", "deref", "display", "from", "try_into", "into", "as_ref", "try_from", ] }
 ed25519-dalek = { version = "2.0.0", features = ["serde", "rand_core"] }
 flume = "0.11"
+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.22.0", path = "../iroh-base" }
+iroh-blobs = { version = "0.22.0", path = "../iroh-blobs" }
 iroh-metrics = { version = "0.22.0", path = "../iroh-metrics", optional = true }
 iroh-net = { version = "0.22.0", path = "../iroh-net" }
-iroh-blobs = { version = "0.22.0", path = "../iroh-blobs" }
-postcard = { version = "1", default-features = false, features = ["alloc", "use-std", "experimental-derive"] }
+meadowcap = "0.1.0"
+postcard = { version = "1", default-features = false, features = [ "alloc", "use-std", "experimental-derive", ] }
 quinn = { package = "iroh-quinn", version = "0.10.5" }
 rand = "0.8.5"
 rand_core = "0.6.4"
 redb = { version = "2.0.0" }
 serde = { version = "1.0.164", features = ["derive"] }
+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"
 zerocopy = { version = "0.8.0-alpha.9", features = ["derive"] }
-hex = "0.4.3"
-curve25519-dalek = { version = "4.1.3", features = ["digest", "rand_core", "serde"] }
-sha2 = "0.10.8"
-futures-buffered = "0.2.6"
-tokio-stream = { version = "0.1.15", features = ["sync"] }
 
 [dev-dependencies]
 iroh-test = { path = "../iroh-test" }