chore: update iroh

Author: dpc

Cargo.lock

@@ -55,14 +55,14 @@ data-encoding = "2.7"
 directories = "5"
 divan = "0.1.18"
 duct = "*"
-ed25519-dalek = "2.1.1"
+ed25519-dalek = "^3.0.0-pre.1"
 futures = "0.3.31"
 futures-lite = "2.6.1"
 bytes = "*"
 listenfd = "1.0.2"
 futures-util = "*"
-iroh = { version = "0.92.0", default-features = false }
-iroh-base = { version = "0.92.0", default-features = false }
+iroh = { version = "0.93.2", default-features = false }
+iroh-base = { version = "0.93.2", default-features = false }
 iroh-io = "0.6.0"
 itertools = "0.13.0"
 jotdown = "0.7.0"
@@ -71,7 +71,7 @@ proptest = "1.6.0"
 maud = "*"
 tempfile = "3.14.0"
 test-log = { version = "0.2.16", features = ["trace"] }
-rand = "0.8"
+rand = "0.9"
 redb = "2.3.0"
 redb-bincode = "0.3.0"
 rostra-core = { path = "crates/rostra-core" }

Cargo.toml

@@ -2,7 +2,7 @@ use std::collections::{HashMap, HashSet};
 
 use ids::{IdsFollowersRecord, IdsUnfollowedRecord};
 use itertools::Itertools as _;
-use rand::{Rng as _, thread_rng};
+use rand::Rng as _;
 use redb::StorageError;
 use redb_bincode::{ReadableTable, Table};
 use rostra_core::event::{
@@ -94,7 +94,7 @@ impl Database {
             .map(|g| g.value())
         {
             Some(prev_missing) => {
-                // if the missing was marked as deleted, we'll record it
+                // If the missing was marked as deleted, we'll record it.
                 (
                     true,
                     if let Some(deleted_by) = prev_missing.deleted_by {
@@ -107,7 +107,7 @@ impl Database {
                 )
             }
             _ => {
-                // since nothing was expecting this event yet, it must be a "head"
+                // Since nothing was expecting this event yet, it must be a "head".
                 events_heads_table.insert(&(author, event_id), &EventsHeadsTableRecord)?;
                 (false, false)
             }
@@ -153,18 +153,18 @@ impl Database {
                         });
                 }
             } else {
-                // we do not have this parent yet, so we mark it as missing
+                // We do not have this parent yet, so we mark it as missing
                 events_missing_table.insert(
                     &(author, parent_id),
                     &EventsMissingRecord {
-                        // potentially mark that the missing event was already deleted
+                        // Potentially mark that the missing event was already deleted.
                         deleted_by: (event.is_delete_parent_aux_content_set() && parent_is_aux)
                             .then_some(event_id),
                     },
                 )?;
                 missing_parents.push(parent_id);
             }
-            // if the event was considered a "head", it shouldn't as it has a child
+            // If the event was considered a "head", it shouldn't as it has a child.
             events_heads_table.remove(&(author, parent_id))?;
         }
 
@@ -225,7 +225,7 @@ impl Database {
                     return Ok(true);
                 }
                 EventContentState::Invalid(_) | EventContentState::Present(_) => {
-                    // go ahead and mark as pruned
+                    // Go ahead and mark as pruned
                 }
             }
         }
@@ -396,7 +396,7 @@ impl Database {
     ) -> DbResult<IdSelfAccountRecord> {
         let id_self_record = IdSelfAccountRecord {
             rostra_id: self_id,
-            iroh_secret: thread_rng().r#gen(),
+            iroh_secret: rand::rng().random(),
         };
         let _ = id_self_table.insert(&(), &id_self_record)?;
         Ok(id_self_record)
@@ -438,7 +438,7 @@ impl Database {
         let before_pivot = (ShortEventId::ZERO)..(pivot);
         let after_pivot = (pivot)..=(ShortEventId::MAX);
 
-        Ok(Some(if thread_rng().r#gen() {
+        Ok(Some(if rand::rng().random() {
             match get_first_in_range(events_self_table, after_pivot)? {
                 Some(k) => k,
                 _ => match get_last_in_range(events_self_table, before_pivot)? {

crates/rostra-client-db/src/tx_ops.rs

@@ -11,10 +11,10 @@ use std::sync::{Arc, Weak};
 use std::time::Duration;
 
 use backon::Retryable as _;
+use iroh::NodeAddr;
 use iroh::discovery::ConcurrentDiscovery;
 use iroh::discovery::dns::DnsDiscovery;
 use iroh::discovery::pkarr::PkarrPublisher;
-use iroh::{NodeAddr, Watcher as _};
 use itertools::Itertools as _;
 use rostra_client_db::{Database, DbResult, IdsFolloweesRecord, IdsFollowersRecord};
 use rostra_core::event::{
@@ -358,7 +358,7 @@ impl Client {
         use iroh::{Endpoint, SecretKey};
         let secret_key = iroh_secret
             .into()
-            .unwrap_or_else(|| SecretKey::generate(&mut rand::thread_rng()));
+            .unwrap_or_else(|| SecretKey::generate(&mut rand::rng()));
 
         let discovery = ConcurrentDiscovery::from_services(vec![
             Box::new(PkarrPublisher::n0_dns().build(secret_key.clone())),
@@ -448,9 +448,7 @@ impl Client {
             }
         }
 
-        Ok(sanitize_node_addr(
-            self.endpoint.node_addr().initialized().await,
-        ))
+        Ok(sanitize_node_addr(self.endpoint.node_addr()))
     }
 
     pub fn self_head_subscribe(&self) -> watch::Receiver<Option<ShortEventId>> {

crates/rostra-client/src/client.rs

@@ -37,7 +37,7 @@ impl HeadMerger {
             // To avoid two active nodes merging heads together at the same time, producing
             // more heads, that require more merging, etc., we just sleep a random period of
             // time here, which should be enough to propagate and eventually desynchronize.
-            let rand_secs = rand::thread_rng().gen_range(0..60);
+            let rand_secs = rand::rng().random_range(0..60);
             tokio::time::sleep(Duration::from_secs(rand_secs)).await;
 
             let Ok(client) = self.client.client_ref() else {

crates/rostra-client/src/task/head_merger.rs

@@ -181,7 +181,7 @@ impl PkarrIdPublisher {
                 trace!(target: LOG_TARGET, "Detect other peer alive, waiting");
                 failures_count = 0;
             }
-            let secs = rand::thread_rng().gen_range(1..10);
+            let secs = rand::rng().random_range(1..10);
             tokio::time::sleep(Duration::from_secs(secs)).await;
         }
     }

crates/rostra-client/src/task/pkarr_id_publisher.rs

@@ -1,5 +1,4 @@
-use ed25519_dalek::ed25519::signature::SignerMut as _;
-use ed25519_dalek::{SignatureError, VerifyingKey};
+use ed25519_dalek::{SignatureError, Signer, VerifyingKey};
 
 use super::{Event, EventSignature, SignedEvent};
 use crate::bincode::STD_BINCODE_CONFIG;

crates/rostra-core/src/event/ed25519.rs

@@ -1,12 +1,10 @@
 use ed25519_dalek::{SigningKey, VerifyingKey};
-use rand::rngs::OsRng;
 
 use super::{RostraId, RostraIdSecretKey};
 
 impl RostraIdSecretKey {
     pub fn generate() -> Self {
-        let mut csprng = OsRng;
-        SigningKey::generate(&mut csprng).into()
+        SigningKey::generate(&mut rand::rng()).into()
     }
 
     pub fn id(self) -> RostraId {

crates/rostra-core/src/id/ed25519.rs

@@ -1,9 +1,8 @@
 use rand::Rng as _;
-use rand::rngs::OsRng;
 
 use super::ShortEventId;
 
-impl rand::distributions::Distribution<ShortEventId> for rand::distributions::Standard {
+impl rand::distr::Distribution<ShortEventId> for rand::distr::StandardUniform {
     fn sample<R: rand::Rng + ?Sized>(&self, rng: &mut R) -> ShortEventId {
         let mut bytes = [0u8; 16];
         rng.fill_bytes(&mut bytes);
@@ -12,7 +11,6 @@ impl rand::distributions::Distribution<ShortEventId> for rand::distributions::St
 }
 impl ShortEventId {
     pub fn random() -> Self {
-        let mut csprng = OsRng;
-        csprng.r#gen()
+        rand::rng().random()
     }
 }

crates/rostra-core/src/rand.rs

@@ -38,7 +38,7 @@ pub async fn get_single_post(
     Path((author, event_id)): Path<(RostraId, ShortEventId)>,
 ) -> RequestResult<impl IntoResponse> {
     // Render raw post if it's an HTMX request or raw=true query parameter
-    if hx_request.is_htmx_request() || dbg!(query.raw) {
+    if hx_request.is_htmx_request() || query.raw {
         let client_handle = state.client(session.id()).await?;
         let client_ref = client_handle.client_ref()?;
         let db = client_ref.db();
@@ -199,7 +199,7 @@ impl UiState {
         timestamp: Option<Timestamp>,
         ro: RoMode,
     ) -> RequestResult<Markup> {
-        // Note: we are actually not doing pagiantion, and just ignore
+        // Note: we are actually not doing pagination, and just ignore
         // everything after first page
         let (reactions, _) = if let Some(event_id) = event_id {
             client
@@ -299,7 +299,7 @@ impl UiState {
         let external_event_id = event_id.map(|e| ExternalEventId::new(author, e));
         let user_profile = self.get_social_profile_opt(author, client).await;
 
-        // Note: we are actually not doing pagiantion, and just ignore
+        // Note: we are actually not doing pagination, and just ignore
         // everything after first page
         let (reactions, _) = if let Some(event_id) = event_id {
             client