Merge remote-tracking branch 'origin/main' into feat-multipath

Author: Frando

CHANGELOG.md

@@ -2,7 +2,44 @@
 
 All notable changes to iroh will be documented in this file.
 
-## [0.94.0](https://github.com/n0-computer/iroh/compare/v0.93.2..0.94.0) - 2025-10-21
+## [0.95.0](https://github.com/n0-computer/iroh/compare/v0.94.1..0.95.0) - 2025-11-04
+
+### ⛰️  Features
+
+- *(iroh-relay)* Allow for extension of `RelayMap`s ([#3575](https://github.com/n0-computer/iroh/issues/3575)) - ([45e1f48](https://github.com/n0-computer/iroh/commit/45e1f4895f2cc4bb74ebd442f153f5f6c03058bb))
+- Add new NA west default relay ([#3599](https://github.com/n0-computer/iroh/issues/3599)) - ([828789a](https://github.com/n0-computer/iroh/commit/828789af1f538781eebb8c40805043d1e70f75ea))
+- Make `Connection::remote_id` and `Connection::alpn` infallible ([#3556](https://github.com/n0-computer/iroh/issues/3556)) - ([e2dc591](https://github.com/n0-computer/iroh/commit/e2dc59107e350d07b86b77ae678d2a76edb6f6b7))
+
+### 🐛 Bug Fixes
+
+- Remove "https" from NA west url ([#3600](https://github.com/n0-computer/iroh/issues/3600)) - ([c2bdbe2](https://github.com/n0-computer/iroh/commit/c2bdbe25f85dfb1180bc842996c3934519deaa62))
+- Stop relay actor on endpoint close ([#3601](https://github.com/n0-computer/iroh/issues/3601)) - ([30c23e8](https://github.com/n0-computer/iroh/commit/30c23e8dbaa02d17ab57ba41f0aa5271b0a411dc))
+
+### 🚜 Refactor
+
+- [**breaking**] Convert from snafu to n0-error ([#3561](https://github.com/n0-computer/iroh/issues/3561)) - ([7b9c95b](https://github.com/n0-computer/iroh/commit/7b9c95b7a12415ded937a62858c72337d3e731a9))
+
+### 📚 Documentation
+
+- *(iroh)* Fix documentation on endpoint::Builder::empty ([#3592](https://github.com/n0-computer/iroh/issues/3592)) - ([71d5136](https://github.com/n0-computer/iroh/commit/71d5136962b6fb7b56c2ddb7789dfe9edaab7414))
+- *(iroh)* Clarify ProtocolHandler::accept ([#3567](https://github.com/n0-computer/iroh/issues/3567)) - ([406bfde](https://github.com/n0-computer/iroh/commit/406bfde94c00f45037a9a98c808629ecb35e8b11))
+
+### ⚙️ Miscellaneous Tasks
+
+- *(iroh)* Update wasm-bindgen version to fix CI ([#3589](https://github.com/n0-computer/iroh/issues/3589)) - ([0f4c15c](https://github.com/n0-computer/iroh/commit/0f4c15cbcad1fac13b3b60aba825d975a8843e46))
+- [**breaking**] Update redb to version 3 ([#3562](https://github.com/n0-computer/iroh/issues/3562)) - ([b057b91](https://github.com/n0-computer/iroh/commit/b057b91b26162b6e6aadac48eb82e6567acf7ef3))
+
+## [0.94.1](https://github.com/n0-computer/iroh/compare/v0.94.0..v0.94.1) - 2025-10-22
+
+### 🐛 Bug Fixes
+
+- *(iroh-base)* Add serde support for Signature ([#3568](https://github.com/n0-computer/iroh/issues/3568)) - ([ad23e1a](https://github.com/n0-computer/iroh/commit/ad23e1aa6b0c5e92b5a6e66f3e26c3dd0946379e))
+
+### ⚙️ Miscellaneous Tasks
+
+- Release - ([edd4fc7](https://github.com/n0-computer/iroh/commit/edd4fc749921d979170c236f668fe93d9d844fd9))
+
+## [0.94.0](https://github.com/n0-computer/iroh/compare/v0.93.2..v0.94.0) - 2025-10-21
 
 ### ⛰️  Features
 
@@ -39,6 +76,7 @@ All notable changes to iroh will be documented in this file.
 - *(dpes)* Bump iroh-relay deps ([#3547](https://github.com/n0-computer/iroh/issues/3547)) - ([4ed700e](https://github.com/n0-computer/iroh/commit/4ed700e8da8daf6bb3d897ceadea52a4dad6952c))
 - Update copyright dates ([#3543](https://github.com/n0-computer/iroh/issues/3543)) - ([5eaf52a](https://github.com/n0-computer/iroh/commit/5eaf52adc4097894dc3f6f08c23cfcdfef024fab))
 - Update deps & remove unused deps ([#3564](https://github.com/n0-computer/iroh/issues/3564)) - ([a63bcfd](https://github.com/n0-computer/iroh/commit/a63bcfdfe588fb9a9682a26a2f4c5e2ae2ce8a97))
+- Release - ([dd99737](https://github.com/n0-computer/iroh/commit/dd99737c12c553ece2607e5e74d605751a637397))
 
 ## [0.93.2](https://github.com/n0-computer/iroh/compare/v0.93.1..v0.93.2) - 2025-10-13
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "iroh-base"
-version = "0.94.1"
+version = "0.95.0"
 edition = "2024"
 readme = "README.md"
 description = "base type and utilities for Iroh"

iroh-base/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "iroh-dns-server"
-version = "0.94.0"
+version = "0.95.0"
 edition = "2024"
 description = "A pkarr relay and DNS server"
 license = "MIT OR Apache-2.0"

iroh-dns-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "iroh-relay"
-version = "0.94.0"
+version = "0.95.0"
 edition = "2024"
 readme = "README.md"
 description = "Iroh's relay server and client"
@@ -31,7 +31,7 @@ http = "1"
 http-body-util = "0.1.0"
 hyper = { version = "1", features = ["server", "client", "http1"] }
 hyper-util = "0.1.1"
-iroh-base = { version = "0.94.1", path = "../iroh-base", default-features = false, features = ["key", "relay"] }
+iroh-base = { version = "0.95.0", path = "../iroh-base", default-features = false, features = ["key", "relay"] }
 iroh-metrics = { version = "0.37", default-features = false }
 n0-future = "0.3.0"
 num_enum = "0.7"

iroh-relay/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "iroh"
-version = "0.94.0"
+version = "0.95.0"
 edition = "2024"
 readme = "README.md"
 description = "p2p quic connections dialed by public key"
@@ -36,8 +36,8 @@ derive_more = { version = "2.0.1", features = [
 ] }
 ed25519-dalek = { version = "3.0.0-pre.1", features = ["serde", "rand_core", "zeroize", "pkcs8", "pem"] }
 http = "1"
-iroh-base = { version = "0.94.1", default-features = false, features = ["key", "relay"], path = "../iroh-base" }
-iroh-relay = { version = "0.94", path = "../iroh-relay", default-features = false }
+iroh-base = { version = "0.95.0", default-features = false, features = ["key", "relay"], path = "../iroh-base" }
+iroh-relay = { version = "0.95", path = "../iroh-relay", default-features = false }
 n0-future = "0.3.0"
 n0-error = "0.1.0"
 n0-watcher = "0.5"
@@ -142,7 +142,7 @@ tracing-subscriber = { version = "0.3", features = [
 ] }
 indicatif = { version = "0.18", features = ["tokio"] }
 parse-size = { version = "1.1.0", features = ['std'] }
-iroh-base = { version = "0.94.1", default-features = false, features = ["key", "relay"], path = "../iroh-base" }
+iroh-base = { version = "0.95.0", default-features = false, features = ["key", "relay"], path = "../iroh-base" }
 
 # wasm-in-browser test/dev dependencies
 [target.'cfg(all(target_family = "wasm", target_os = "unknown"))'.dev-dependencies]

iroh/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "iroh-bench"
-version = "0.94.0"
+version = "0.95.0"
 edition = "2024"
 license = "MIT OR Apache-2.0"
 publish = false

iroh/bench/Cargo.toml

@@ -249,16 +249,16 @@ pub async fn server(endpoint: Endpoint, opt: Opt) -> Result<()> {
     // Handle only the expected amount of clients
     for _ in 0..opt.clients {
         let incoming = endpoint.accept().await.unwrap();
-        let connecting = match incoming.accept() {
-            Ok(connecting) => connecting,
+        let accepting = match incoming.accept() {
+            Ok(accepting) => accepting,
             Err(err) => {
                 warn!("incoming connection failed: {err:#}");
                 // we can carry on in these cases:
                 // this can be caused by retransmitted datagrams
                 continue;
             }
         };
-        let connection = connecting.await.std_context("handshake failed")?;
+        let connection = accepting.await.context("handshake failed")?;
 
         server_tasks.push(tokio::spawn(async move {
             loop {

iroh/bench/src/iroh.rs

@@ -220,16 +220,16 @@ pub async fn server(endpoint: Endpoint, opt: Opt) -> Result<()> {
     // Handle only the expected amount of clients
     for _ in 0..opt.clients {
         let incoming = endpoint.accept().await.unwrap();
-        let connecting = match incoming.accept() {
-            Ok(connecting) => connecting,
+        let accepting = match incoming.accept() {
+            Ok(accepting) => accepting,
             Err(err) => {
                 warn!("incoming connection failed: {err:#}");
                 // we can carry on in these cases:
                 // this can be caused by retransmitted datagrams
                 continue;
             }
         };
-        let connection = connecting.await.std_context("handshake failed")?;
+        let connection = accepting.await.std_context("handshake failed")?;
 
         server_tasks.push(tokio::spawn(async move {
             loop {

iroh/bench/src/quinn.rs

@@ -1,14 +1,11 @@
-use std::{env, future::Future, str::FromStr, time::Instant};
+use std::{env, str::FromStr, time::Instant};
 
 use clap::Parser;
 use data_encoding::HEXLOWER;
-use iroh::{
-    EndpointId, SecretKey,
-    endpoint::{Connecting, Connection},
-};
-use n0_error::{Result, StackResultExt, StdResultExt, bail_any};
-use n0_future::{StreamExt, future};
-use n0_watcher::Watcher;
+use iroh::{EndpointId, SecretKey, discovery::Discovery, endpoint::ZeroRttStatus};
+use n0_error::{Result, StackResultExt, StdResultExt};
+use n0_future::StreamExt;
+use quinn::{RecvStream, SendStream};
 use tracing::{info, trace};
 
 const PINGPONG_ALPN: &[u8] = b"0rtt-pingpong";
@@ -44,59 +41,39 @@ pub fn get_or_generate_secret_key() -> Result<SecretKey> {
 }
 
 /// Do a simple ping-pong with the given connection.
-///
-/// We send the data on the connection. If `proceed` resolves to true,
-/// read the response immediately. Otherwise, the stream pair is bad and we need
-/// to open a new stream pair.
-async fn pingpong(
-    connection: &Connection,
-    proceed: impl Future<Output = bool>,
-    x: u64,
-) -> Result<()> {
-    let (mut send, recv) = connection.open_bi().await.anyerr()?;
+async fn pingpong(send: SendStream, recv: RecvStream, x: u64) -> Result<()> {
+    ping(send, x).await?;
+    pong(recv, x).await
+}
+
+async fn ping(mut send: SendStream, x: u64) -> Result<()> {
     let data = x.to_be_bytes();
     send.write_all(&data).await.anyerr()?;
-    send.finish().anyerr()?;
-    let mut recv = if proceed.await {
-        // use recv directly if we can proceed
-        recv
-    } else {
-        // proceed returned false, so we have learned that the 0-RTT send was rejected.
-        // at this point we have a fully handshaked connection, so we try again.
-        let (mut send, recv) = connection.open_bi().await.anyerr()?;
-        send.write_all(&data).await.anyerr()?;
-        send.finish().anyerr()?;
-        recv
-    };
+    send.finish().anyerr()
+}
+
+async fn pong(mut recv: RecvStream, x: u64) -> Result<()> {
+    let data = x.to_be_bytes();
     let echo = recv.read_to_end(8).await.anyerr()?;
     assert!(echo == data);
     Ok(())
 }
 
-async fn pingpong_0rtt(connecting: Connecting, i: u64) -> Result<Connection> {
-    let connection = match connecting.into_0rtt() {
-        Ok((connection, accepted)) => {
-            trace!("0-RTT possible from our side");
-            pingpong(&connection, accepted, i).await?;
-            connection
-        }
-        Err(connecting) => {
-            trace!("0-RTT not possible from our side");
-            let connection = connecting.await.anyerr()?;
-            pingpong(&connection, future::ready(true), i).await?;
-            connection
-        }
-    };
-    Ok(connection)
-}
-
 async fn connect(args: Args) -> Result<()> {
-    let remote_id = args.endpoint_id.context("Missing endpoint id")?;
+    let remote_id = args.endpoint_id.unwrap();
     let endpoint = iroh::Endpoint::builder()
         .relay_mode(iroh::RelayMode::Disabled)
         .keylog(true)
         .bind()
         .await?;
+    // ensure we have resolved the remote_id before connecting
+    // so we get a more accurate connection timing
+    let mut discovery_stream = endpoint
+        .discovery()
+        .resolve(remote_id)
+        .expect("discovery to be enabled");
+    let _ = discovery_stream.next().await;
+
     let t0 = Instant::now();
     for i in 0..args.rounds {
         let t0 = Instant::now();
@@ -106,18 +83,40 @@ async fn connect(args: Args) -> Result<()> {
         let connection = if args.disable_0rtt {
             let connection = connecting.await.anyerr()?;
             trace!("connecting without 0-RTT");
-            pingpong(&connection, future::ready(true), i).await?;
+            let (send, recv) = connection.open_bi().await.anyerr()?;
+            pingpong(send, recv, i).await?;
             connection
         } else {
-            pingpong_0rtt(connecting, i).await?
+            match connecting.into_0rtt() {
+                Ok(zrtt_connection) => {
+                    trace!("0-RTT possible from our side");
+                    let (send, recv) = zrtt_connection.open_bi().await.anyerr()?;
+                    // before we get the full handshake, attempt to send 0-RTT data
+                    let zrtt_task = tokio::spawn(ping(send, i));
+                    match zrtt_connection.handshake_completed().await? {
+                        ZeroRttStatus::Accepted(conn) => {
+                            let _ = zrtt_task.await.anyerr()?;
+                            pong(recv, i).await?;
+                            conn
+                        }
+                        ZeroRttStatus::Rejected(conn) => {
+                            zrtt_task.abort();
+                            let (send, recv) = conn.open_bi().await.anyerr()?;
+                            pingpong(send, recv, i).await?;
+                            conn
+                        }
+                    }
+                }
+                Err(connecting) => {
+                    trace!("0-RTT not possible from our side");
+                    let conn = connecting.await.anyerr()?;
+                    let (send, recv) = conn.open_bi().await.anyerr()?;
+                    pingpong(send, recv, i).await?;
+                    conn
+                }
+            }
         };
-        tokio::spawn(async move {
-            // wait for some time for the handshake to complete and the server
-            // to send a NewSessionTicket. This is less than ideal, but we
-            // don't have a better way to wait for the handshake to complete.
-            tokio::time::sleep(connection.rtt() * 2).await;
-            connection.close(0u8.into(), b"");
-        });
+        connection.close(0u8.into(), b"");
         let elapsed = t0.elapsed();
         println!("round {i}: {} us", elapsed.as_micros());
     }
@@ -138,24 +137,13 @@ async fn accept(_args: Args) -> Result<()> {
         .relay_mode(iroh::RelayMode::Disabled)
         .bind()
         .await?;
-    let mut addrs = endpoint.watch_addr().stream();
-    let addr = loop {
-        let Some(addr) = addrs.next().await else {
-            bail_any!("Address stream closed");
-        };
-        if !addr.ip_addrs().count() == 0 {
-            break addr;
-        }
-    };
-    println!("Listening on: {addr:?}");
+    println!("endpoint id: {}", endpoint.id());
 
     let accept = async move {
         while let Some(incoming) = endpoint.accept().await {
             tokio::spawn(async move {
-                let connecting = incoming.accept().anyerr()?;
-                let (connection, _zero_rtt_accepted) = connecting
-                    .into_0rtt()
-                    .expect("accept into 0.5 RTT always succeeds");
+                let accepting = incoming.accept().anyerr()?;
+                let connection = accepting.into_0rtt();
                 let (mut send, mut recv) = connection.accept_bi().await.anyerr()?;
                 trace!("recv.is_0rtt: {}", recv.is_0rtt());
                 let data = recv.read_to_end(8).await.anyerr()?;