chore: update iroh from 0.33.0 to 0.35.0 (#6687)

Cargo.toml

@@ -56,14 +56,14 @@ fd-lock = "4"
 futures-lite = { workspace = true }
 futures = { workspace = true }
 hex = "0.4.0"
-hickory-resolver = "=0.25.0-alpha.5"
+hickory-resolver = "0.25.2"
 http-body-util = "0.1.3"
 humansize = "2"
 hyper = "1"
 hyper-util = "0.1.11"
 image = { version = "0.25.6", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
-iroh-gossip = { version = "0.33", default-features = false, features = ["net"] }
+iroh-gossip = { version = "0.35", default-features = false, features = ["net"] }
-iroh = { version = "0.33", default-features = false }
+iroh = { version = "0.35", default-features = false }
 kamadak-exif = "0.6.1"
 libc = { workspace = true }
 mail-builder = { version = "0.4.2", default-features = false }

deny.toml

@@ -10,9 +10,6 @@ ignore = [
     # Unmaintained instant
     "RUSTSEC-2024-0384",
 
-    # Unmaintained backoff
-    "RUSTSEC-2025-0012",
-
     # Unmaintained paste
     "RUSTSEC-2024-0436",
 ]
@@ -25,7 +22,6 @@ ignore = [
 skip = [
      { name = "async-channel", version = "1.9.0" },
      { name = "bitflags", version = "1.3.2" },
-     { name = "core-foundation", version = "0.9.4" },
      { name = "event-listener", version = "2.5.3" },
      { name = "generator", version = "0.7.5" },
      { name = "getrandom", version = "0.2.12" },
@@ -33,21 +29,19 @@ skip = [
      { name = "http", version = "0.2.12" },
      { name = "linux-raw-sys", version = "0.4.14" },
      { name = "loom", version = "0.5.6" },
+     { name = "miniz_oxide", version = "0.7.4" },
      { name = "netlink-packet-route", version = "0.17.1" },
-     { name = "nix", version = "0.26.4" },
-     { name = "nix", version = "0.27.1" },
      { name = "rand_chacha", version = "0.3.1" },
      { name = "rand_core", version = "0.6.4" },
      { name = "rand", version = "0.8.5" },
      { name = "redox_syscall", version = "0.3.5" },
      { name = "regex-automata", version = "0.1.10" },
      { name = "regex-syntax", version = "0.6.29" },
-     { name = "rtnetlink", version = "0.13.1" },
      { name = "rustix", version = "0.38.44" },
-     { name = "security-framework", version = "2.11.1" },
      { name = "strum_macros", version = "0.26.2" },
      { name = "strum", version = "0.26.2" },
      { name = "syn", version = "1.0.109" },
+     { name = "lru", version = "0.12.3" },
      { name = "thiserror-impl", version = "1.0.69" },
      { name = "thiserror", version = "1.0.69" },
      { name = "wasi", version = "0.11.0+wasi-snapshot-preview1" },
@@ -84,6 +78,7 @@ allow = [
     "MPL-2.0",
     "Unicode-3.0",
     "Unicode-DFS-2016",
+    "Unlicense",
     "Zlib",
 ]
 

src/imex/transfer.rs

@@ -95,6 +95,7 @@ impl BackupProvider {
     pub async fn prepare(context: &Context) -> Result<Self> {
         let relay_mode = RelayMode::Disabled;
         let endpoint = Endpoint::builder()
+            .tls_x509() // For compatibility with iroh <0.34.0
             .alpns(vec![BACKUP_ALPN.to_vec()])
             .relay_mode(relay_mode)
             .bind()
@@ -301,7 +302,11 @@ pub async fn get_backup2(
 ) -> Result<()> {
     let relay_mode = RelayMode::Disabled;
 
-    let endpoint = Endpoint::builder().relay_mode(relay_mode).bind().await?;
+    let endpoint = Endpoint::builder()
+        .tls_x509() // For compatibility with iroh <0.34.0
+        .relay_mode(relay_mode)
+        .bind()
+        .await?;
 
     let conn = endpoint.connect(node_addr, BACKUP_ALPN).await?;
     let (mut send_stream, mut recv_stream) = conn.open_bi().await?;

src/peer_channels.rs

@@ -26,7 +26,7 @@
 use anyhow::{anyhow, bail, Context as _, Result};
 use data_encoding::BASE32_NOPAD;
 use futures_lite::StreamExt;
-use iroh::{Endpoint, NodeAddr, NodeId, PublicKey, RelayMap, RelayMode, RelayUrl, SecretKey};
+use iroh::{Endpoint, NodeAddr, NodeId, PublicKey, RelayMode, RelayUrl, SecretKey};
 use iroh_gossip::net::{Event, Gossip, GossipEvent, JoinOptions, GOSSIP_ALPN};
 use iroh_gossip::proto::TopicId;
 use parking_lot::Mutex;
@@ -245,7 +245,7 @@ impl Context {
             .as_ref()
             .and_then(|conf| conf.iroh_relay.clone())
         {
-            RelayMode::Custom(RelayMap::from_url(RelayUrl::from(relay_url)))
+            RelayMode::Custom(RelayUrl::from(relay_url).into())
         } else {
             // FIXME: this should be RelayMode::Disabled instead.
             // Currently using default relays because otherwise Rust tests fail.
@@ -253,6 +253,7 @@ impl Context {
         };
 
         let endpoint = Endpoint::builder()
+            .tls_x509() // For compatibility with iroh <0.34.0
             .secret_key(secret_key)
             .alpns(vec![GOSSIP_ALPN.to_vec()])
             .relay_mode(relay_mode)
@@ -271,8 +272,7 @@ impl Context {
 
         let router = iroh::protocol::Router::builder(endpoint)
             .accept(GOSSIP_ALPN, gossip.clone())
-            .spawn()
+            .spawn();
-            .await?;
 
         Ok(Iroh {
             router,

src/provider.rs

@@ -4,6 +4,7 @@ pub(crate) mod data;
 
 use anyhow::Result;
 use deltachat_contact_tools::EmailAddress;
+use hickory_resolver::name_server::TokioConnectionProvider;
 use hickory_resolver::{config, Resolver, TokioResolver};
 use serde::{Deserialize, Serialize};
 
@@ -179,14 +180,14 @@ impl ProviderOptions {
 /// This does not work at least on some Androids, therefore we fallback
 /// to the default `ResolverConfig` which uses eg. to google's `8.8.8.8` or `8.8.4.4`.
 fn get_resolver() -> Result<TokioResolver> {
-    if let Ok(resolver) = Resolver::tokio_from_system_conf() {
+    if let Ok(resolver) = TokioResolver::builder_tokio() {
-        return Ok(resolver);
+        return Ok(resolver.build());
     }
-    let resolver = Resolver::tokio(
+    let resolver = Resolver::builder_with_config(
         config::ResolverConfig::default(),
-        config::ResolverOpts::default(),
+        TokioConnectionProvider::default(),
     );
-    Ok(resolver)
+    Ok(resolver.build())
 }
 
 /// Returns provider for the given an e-mail address.