Upstream iroh 1.1.0 / noq 1.2.0; experiments on released noq and the lannbot forks

README.md

@@ -241,7 +241,7 @@ streams as resources — over three wires behind one surface: the relay
 via `wasi:sockets`, and WebRTC data channels as a background upgrade
 (a relay-dialed connection moves onto the channel when it opens;
 `connection.path` reports the move). Upstream interop is proven both
-ways over UDP against iroh v1.0.3, and against n0's production relay
+ways over UDP against iroh v1.1.0, and against n0's production relay
 infrastructure over wss. `endpoint-demo/` is the first consumer,
 composed via `wac plug` and driven by
 `host-wasmtime/src/bin/endpoint-demo.rs`. Internally: one detached pump

endpoint/Cargo.toml

@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
 [dependencies]
 iroh-endpoint-core = { path = "../core" }
 polymorph-tls-quic.workspace = true
-noq-proto = { version = "=1.1.0", default-features = false }
+noq-proto = { version = "=1.2.0", default-features = false }
 rustls = { version = "=0.23.43", default-features = false, features = ["std", "custom-provider"] }
 getrandom = "0.4"
 bytes = "1"

endpoint/src/endpoint_impl.rs

@@ -239,21 +239,21 @@
 /// Deadline on every relay dial (`bind`, `ensure-relay`, the home
 /// redial): a relay that accepts the socket and then stalls the
 /// handshake fails the dial instead of pinning it (issue #93). The
-/// value matches upstream's relay connect timeout (iroh-1.0.3
+/// value matches upstream's relay connect timeout (iroh-1.1.0
 /// src/socket/transports/relay/actor.rs, CONNECT_TIMEOUT) and sits
 /// well under `ensure_relay`'s 30s claim-wait, so a stalled dial
 /// resolves its waiters before they give up.
 const DIAL_TIMEOUT: Duration = Duration::from_secs(10);
 
 /// How much inbound silence on a relay wire elicits a liveness ping
-/// (issue #96): matches upstream's ping cadence (iroh-1.0.3
+/// (issue #96): matches upstream's ping cadence (iroh-1.1.0
 /// src/socket/transports/relay/actor.rs, PING_INTERVAL, reset on any
 /// inbound message), chosen there as half QUIC's default 30s
 /// max-idle-timeout so a dead home wire is caught with time to recover.
 const RELAY_PING_INTERVAL: Duration = Duration::from_secs(15);
 
 /// How long an unanswered liveness ping is allowed before the wire is
-/// declared dead: upstream's maximum pong bound (iroh-relay-1.0.3
+/// declared dead: upstream's maximum pong bound (iroh-relay-1.1.0
 /// src/ping_tracker.rs, PING_TIMEOUT). Upstream shrinks the bound by
 /// measured RTT; this client tracks no RTT and uses the cap.
 const RELAY_PING_TIMEOUT: Duration = Duration::from_secs(5);
@@ -2353,7 +2353,7 @@
             // ever will be, and the stream did not reach its FIN — a
             // connection close must not read as one (issue #13,
             // finding A2).
             Err(ReadError::Blocked) => match conn_failure {
                 Some(err) => Some(Err(err)),
                 None => None,
             },