chore: upgrade to iroh at 0.90.0 and irpc at 0.5.0 (#80)

* chore: upgrade to `iroh` at `0.90.0` and `irpc` at `0.5.0`

* chore: fmt

* update deny

* tests: fix die_and_reconnect test

---------

Co-authored-by: “ramfox” <“kasey@n0.computer”>
Co-authored-by: Frando <frando@unbiskant.org>

Author: 3 people

Cargo.lock

@@ -47,8 +47,8 @@ derive_more = { version = "1.0.0", features = [
 ed25519-dalek = { version = "2.0.0", features = ["serde", "rand_core"] }
 hex = "0.4.3"
 indexmap = "2.0"
-iroh-metrics = { version = "0.34", default-features = false }
-iroh-base = { git = "https://github.com/n0-computer/iroh", branch = "main", default-features = false, features = [
+iroh-metrics = { version = "0.35", default-features = false }
+iroh-base = { version = "0.90", default-features = false, features = [
     "key",
 ] }
 n0-future = "0.1.2"
@@ -65,12 +65,12 @@ serde = { version = "1.0.164", features = ["derive"] }
 futures-lite = { version = "2.3", optional = true }
 futures-concurrency = { version = "7.6.1", optional = true }
 futures-util = { version = "0.3.30", optional = true }
-iroh = { git = "https://github.com/n0-computer/iroh", branch = "main", default-features = false, optional = true }
+iroh = { version = "0.90", default-features = false, optional = true }
 tokio = { version = "1", optional = true, features = ["io-util", "sync"] }
 tokio-util = { version = "0.7.12", optional = true, features = ["codec"] }
 tracing = "0.1"
 thiserror = { version = "2.0", optional = true }
-irpc = { version = "0.4.0", optional = true, default-features = false, features = [
+irpc = { version = "0.5.0", optional = true, default-features = false, features = [
     "derive",
     "stream",
     "message_spans",
@@ -81,7 +81,7 @@ nested_enum_utils = { version = "0.2.2", optional = true }
 snafu = { version = "0.8.5", features = ["rust_1_81"], optional = true }
 
 # rpc dependencies (optional)
-quinn = { package = "iroh-quinn", version = "0.13.0", optional = true }
+quinn = { package = "iroh-quinn", version = "0.14.0", optional = true }
 
 # test-utils dependencies (optional)
 rand_chacha = { version = "0.3.1", optional = true }
@@ -109,7 +109,7 @@ tokio = { version = "1", features = [
 ] }
 clap = { version = "4", features = ["derive"] }
 humantime-serde = { version = "1.1.1" }
-iroh = { git = "https://github.com/n0-computer/iroh", branch = "main", default-features = false, features = [
+iroh = { version = "0.90", default-features = false, features = [
     "metrics",
     "test-utils",
 ] }

Cargo.toml

@@ -2,6 +2,7 @@
 ignore = [
     "RUSTSEC-2024-0384",
     "RUSTSEC-2024-0436",
+    "RUSTSEC-2023-0089",
 ]
 
 [bans]
@@ -37,6 +38,3 @@ name = "ring"
 [[licenses.clarify.license-files]]
 hash = 3171872035
 path = "LICENSE"
-
-[sources]
-allow-git = ["https://github.com/n0-computer/iroh.git"]

deny.toml

@@ -93,7 +93,10 @@ async fn main() -> Result<()> {
         None => SecretKey::generate(rand::rngs::OsRng),
         Some(key) => key.parse()?,
     };
-    println!("> our secret key: {secret_key}");
+    println!(
+        "> our secret key: {}",
+        data_encoding::HEXLOWER.encode(&secret_key.to_bytes())
+    );
 
     // configure our relay map
     let relay_mode = match (args.no_relay, args.relay) {

examples/chat.rs

@@ -1595,7 +1595,7 @@ pub(crate) mod test {
                 .bind()
                 .await?;
             let gossip = Gossip::builder().spawn(ep.clone());
-            let router = Router::builder(ep.clone())
+            let router = Router::builder(ep)
                 .accept(GOSSIP_ALPN, gossip.clone())
                 .spawn();
             Ok((router, gossip))
@@ -1632,6 +1632,11 @@ pub(crate) mod test {
             let secret_key = SecretKey::generate(&mut rng);
             async move {
                 let (router, gossip) = spawn_gossip(secret_key, relay_map).await?;
+                // wait for the relay to be set. iroh currently has issues when trying
+                // to immediately reconnect with changed direct addresses, but when the
+                // relay path is available it works.
+                // See https://github.com/n0-computer/iroh/pull/3372
+                router.endpoint().home_relay().initialized().await?;
                 let addr = router.endpoint().node_addr().initialized().await?;
                 info!(node_id = %addr.node_id.fmt_short(), "recv node spawned");
                 addr_tx.send(addr).unwrap();