cleanup and update to non patched versions

Author: dignifiedquire

Cargo.lock

@@ -40,8 +40,3 @@ unexpected_cfgs = { level = "warn", check-cfg = ["cfg(iroh_docsrs)", "cfg(iroh_l
 
 [workspace.lints.clippy]
 unused-async = "warn"
-
-
-[patch.crates-io]
-crypto_box = { git = "https://github.com/dignifiedquire/nacl-compat", branch = "rand-09" }
-mainline = { git = "https://github.com/dignifiedquire/mainline", branch = "feat-rand-09" }

Cargo.toml

@@ -32,7 +32,7 @@ iroh-metrics = { version = "0.35", features = ["service"] }
 lru = "0.13"
 n0-future = "0.1.2"
 n0-snafu = "0.2.2"
-pkarr = { version = "4", features = ["relays", "dht"], default-features = false }
+pkarr = { version = "5", features = ["relays", "dht"], default-features = false }
 rcgen = "0.13"
 redb = "2.6.3"
 regex = "1.10.3"

iroh-dns-server/Cargo.toml

@@ -36,7 +36,7 @@ iroh-metrics = { version = "0.35", default-features = false }
 n0-future = "0.1.2"
 num_enum = "0.7"
 pin-project = "1"
-pkarr = { version = "4", default-features = false, features = ["signed_packet"] }
+pkarr = { version = "5", default-features = false, features = ["signed_packet"] }
 postcard = { version = "1", default-features = false, features = [
     "alloc",
     "use-std",

iroh-relay/Cargo.toml

@@ -24,7 +24,7 @@ workspace = true
 aead = { version = "=0.6.0-rc.2", features = ["bytes"] }
 backon = { version = "1.4" }
 bytes = "1.7"
-crypto_box = { version = "0.9.1", features = ["serde", "chacha20"] }
+crypto_box = { version = "0.10.0-pre.0", features = ["serde", "chacha20"] }
 data-encoding = "2.2"
 der = { version = "0.8.0-rc.9", features = ["alloc", "derive"] }
 derive_more = { version = "2.0.1", features = [
@@ -45,9 +45,7 @@ n0-watcher = "0.3"
 nested_enum_utils = "0.2.1"
 netwatch = { version = "0.9" }
 pin-project = "1"
-pkarr = { version = "4", default-features = false, features = [
-    "relays",
-] }
+pkarr = { version = "5", default-features = false, features = ["relays"] }
 quinn = { package = "iroh-quinn", version = "0.14.0", default-features = false, features = ["rustls-ring"] }
 quinn-proto = { package = "iroh-quinn-proto", version = "0.13.0" }
 quinn-udp = { package = "iroh-quinn-udp", version = "0.5.7" }

iroh/Cargo.toml

@@ -781,15 +781,16 @@ mod tests {
     #[tokio::test]
     #[traced_test]
     async fn endpoint_discovery_simple_shared_with_arc() -> Result {
+        let mut rng = rand_chacha::ChaCha8Rng::seed_from_u64(0u64);
         let disco_shared = TestDiscoveryShared::default();
         let (ep1, _guard1) = {
-            let secret = SecretKey::generate(rand::thread_rng());
+            let secret = SecretKey::generate(&mut rng);
             let disco = disco_shared.create_discovery(secret.public());
             let disco = Arc::new(disco);
             new_endpoint(secret, disco).await
         };
         let (ep2, _guard2) = {
-            let secret = SecretKey::generate(rand::thread_rng());
+            let secret = SecretKey::generate(&mut rng);
             let disco = disco_shared.create_discovery(secret.public());
             let disco = Arc::new(disco);
             new_endpoint(secret, disco).await

iroh/src/discovery.rs

@@ -2193,25 +2193,17 @@ fn is_cgi() -> bool {
 // https://github.com/n0-computer/iroh/issues/1183
 #[cfg(test)]
 mod tests {
-    use std::time::{Duration, Instant};
+    use std::time::Duration;
 
-    use iroh_base::{NodeAddr, NodeId, SecretKey};
-    use n0_future::{BufferedStreamExt, StreamExt, stream, task::AbortOnDropHandle};
+    use iroh_base::{NodeAddr, SecretKey};
     use n0_snafu::{Error, Result, ResultExt};
     use n0_watcher::Watcher;
-    use quinn::ConnectionError;
     use rand::SeedableRng;
-    use tracing::{Instrument, error_span, info, info_span};
+    use tracing::{Instrument, info, info_span};
     use tracing_test::traced_test;
 
     use super::Endpoint;
-    use crate::{
-        RelayMode,
-        discovery::static_provider::StaticProvider,
-        endpoint::{ConnectOptions, Connection, ConnectionType},
-        protocol::{AcceptError, ProtocolHandler, Router},
-        test_utils::{run_relay_server, run_relay_server_with},
-    };
+    use crate::{RelayMode, test_utils::run_relay_server};
 
     const TEST_ALPN: &[u8] = b"n0/iroh/test";
 

iroh/src/endpoint.rs

@@ -46,7 +46,7 @@ impl Debug for SharedSecret {
 
 impl SharedSecret {
     pub fn new(this: &crypto_box::SecretKey, other: &crypto_box::PublicKey) -> Self {
-        SharedSecret(crypto_box::ChaChaBox::from_clamped(other, this))
+        SharedSecret(crypto_box::ChaChaBox::new_from_clamped(other, this))
     }
 
     /// Seals the provided cleartext.

iroh/src/key.rs

@@ -3051,7 +3051,7 @@ mod tests {
     #[traced_test]
     async fn test_direct_addresses() {
         let mut rng = rand_chacha::ChaCha8Rng::seed_from_u64(0u64);
-        let ms = Handle::new(Default::default()).await.unwrap();
+        let ms = Handle::new(default_options(&mut rng)).await.unwrap();
 
         // See if we can get endpoints.
         let eps0 = ms.direct_addresses().initialized().await;