Merge branch 'entity-manager' into slim-down-state

Author: rklaehn

Cargo.lock

@@ -65,8 +65,8 @@ hide-proto-docs = []
 metrics = []
 default = ["hide-proto-docs"]
 
-# [patch.crates-io]
-# iroh = { git = "https://github.com/n0-computer/iroh.git", branch = "ramfox/ticket-error" }
-# iroh-base = { git = "https://github.com/n0-computer/iroh.git", branch = "ramfox/ticket-error" }
-# irpc = { git = "https://github.com/n0-computer/irpc.git", branch = "iroh-quinn-latest" }
-# irpc-derive = { git = "https://github.com/n0-computer/irpc.git", branch = "iroh-quinn-latest" }
+[patch.crates-io]
+iroh = { git = "https://github.com/n0-computer/iroh.git", branch = "main" }
+iroh-base = { git = "https://github.com/n0-computer/iroh.git", branch = "main" }
+irpc = { git = "https://github.com/n0-computer/irpc.git", branch = "main" }
+irpc-derive = { git = "https://github.com/n0-computer/irpc.git", branch = "main" }

Cargo.toml

@@ -41,4 +41,7 @@ hash = 3171872035
 path = "LICENSE"
 
 [sources]
-allow-git = []
+allow-git = [
+    "https://github.com/n0-computer/irpc.git",
+    "https://github.com/n0-computer/iroh.git",
+]