chore: remove git deps from deny, finish conversion to latest iroh api

Author: “ramfox”

Cargo.lock

@@ -18,7 +18,7 @@ bytes = { version = "1", features = ["serde"] }
 derive_more = { version = "2.0.1", features = ["from", "try_from", "into", "debug", "display", "deref", "deref_mut"] }
 futures-lite = "2.6.0"
 quinn = { package = "iroh-quinn", version = "0.14.0" }
-n0-future = "0.2.0"
+n0-future = "0.3.0"
 n0-snafu = "0.2.2"
 range-collections = { version = "0.4.6", features = ["serde"] }
 smallvec = { version = "1", features = ["serde", "const_new"] }
@@ -36,11 +36,12 @@ chrono = "0.4.39"
 nested_enum_utils = "0.2.1"
 ref-cast = "1.0.24"
 arrayvec = "0.7.6"
-iroh = "0.93"
+iroh = "0.94"
 self_cell = "1.1.0"
 genawaiter = { version = "0.99.1", features = ["futures03"] }
-iroh-base = "0.93"
-irpc = { version = "0.9.0", features = ["rpc", "quinn_endpoint_setup", "spans", "stream", "derive"], default-features = false }
+iroh-base = "0.94"
+iroh-tickets = "0.1"
+irpc = { version = "0.10.0", features = ["rpc", "quinn_endpoint_setup", "spans", "stream", "derive"], default-features = false }
 iroh-metrics = { version = "0.36" }
 redb = { version = "2.6.3", optional = true }
 reflink-copy = { version = "0.1.24", optional = true }
@@ -59,7 +60,7 @@ tracing-subscriber = { version = "0.3.20", features = ["fmt"] }
 tracing-test = "0.2.5"
 walkdir = "2.5.0"
 atomic_refcell = "0.1.13"
-iroh = { version = "0.93", features = ["discovery-local-network"]}
+iroh = { version = "0.94", features = ["discovery-local-network"]}
 async-compression = { version = "0.4.30", features = ["lz4", "tokio"] }
 concat_const = "0.2.0"
 
@@ -68,8 +69,3 @@ hide-proto-docs = []
 metrics = []
 default = ["hide-proto-docs", "fs-store"]
 fs-store = ["dep:redb", "dep:reflink-copy"]
-
-[patch.crates-io]
-iroh = { git = "https://github.com/n0-computer/iroh.git", branch = "main" }
-irpc = { git = "https://github.com/n0-computer/irpc.git", branch = "main" }
-iroh-base = { git = "https://github.com/n0-computer/iroh.git", branch = "main" }

Cargo.toml

@@ -39,9 +39,3 @@ name = "ring"
 [[licenses.clarify.license-files]]
 hash = 3171872035
 path = "LICENSE"
-
-[sources]
-allow-git = [
-    "https://github.com/n0-computer/irpc.git",
-    "https://github.com/n0-computer/iroh.git",
-]

deny.toml

@@ -37,9 +37,7 @@ async fn main() -> anyhow::Result<()> {
         ticket.format() == BlobFormat::Raw,
         "This example only supports raw blobs."
     );
-    let connection = endpoint
-        .connect(ticket.addr().endpoint_id, iroh_blobs::ALPN)
-        .await?;
+    let connection = endpoint.connect(ticket.addr().id, iroh_blobs::ALPN).await?;
     let mut progress = iroh_blobs::get::request::get_blob(connection, ticket.hash());
     let stats = if cli.progress {
         loop {

examples/get-blob.rs

@@ -3,14 +3,14 @@ use std::{env, path::PathBuf, str::FromStr};
 use anyhow::{Context, Result};
 use clap::{Parser, Subcommand};
 use iroh::{discovery::static_provider::StaticProvider, SecretKey};
-use iroh_base::ticket::EndpointTicket;
 use iroh_blobs::{
     api::downloader::Shuffled,
     provider::events::{AbortReason, EventMask, EventSender, ProviderMessage},
     store::fs::FsStore,
     test::{add_hash_sequences, create_random_blobs},
     HashAndFormat,
 };
+use iroh_tickets::endpoint::EndpointTicket;
 use irpc::RpcMessage;
 use n0_future::StreamExt;
 use rand::{rngs::StdRng, Rng, SeedableRng};
@@ -277,7 +277,7 @@ async fn request(args: RequestArgs) -> anyhow::Result<()> {
     let nodes = args
         .nodes
         .iter()
-        .map(|ticket| ticket.endpoint_addr().endpoint_id)
+        .map(|ticket| ticket.endpoint_addr().id)
         .collect::<Vec<_>>();
     for content in args.content {
         let mut progress = downloader

examples/random_store.rs

@@ -94,7 +94,7 @@ impl Node {
     /// retrieve an entire collection from a given hash and provider
     async fn get_collection(&self, hash: Hash, provider: EndpointAddr) -> Result<()> {
         let req = HashAndFormat::hash_seq(hash);
-        let addrs = Shuffled::new(vec![provider.endpoint_id]);
+        let addrs = Shuffled::new(vec![provider.id]);
         self.store
             .downloader(self.router.endpoint())
             .download(req, addrs)

examples/transfer-collection.rs

@@ -63,7 +63,7 @@ async fn main() -> anyhow::Result<()> {
             println!("Starting download.");
 
             downloader
-                .download(ticket.hash(), Some(ticket.addr().endpoint_id))
+                .download(ticket.hash(), Some(ticket.addr().id))
                 .await?;
 
             println!("Finished download.");

examples/transfer.rs

@@ -549,9 +549,9 @@ mod tests {
         let tt1 = store1.add_slice("hello world").await?;
         let tt2 = store2.add_slice("hello world 2").await?;
         let node1_addr = r1.endpoint().addr();
-        let node1_id = node1_addr.endpoint_id;
+        let node1_id = node1_addr.id;
         let node2_addr = r2.endpoint().addr();
-        let node2_id = node2_addr.endpoint_id;
+        let node2_id = node2_addr.id;
         let swarm = Downloader::new(&store3, r3.endpoint());
         sp3.add_endpoint_info(node1_addr.clone());
         sp3.add_endpoint_info(node2_addr.clone());
@@ -586,9 +586,9 @@ mod tests {
             })
             .await?;
         let node1_addr = r1.endpoint().addr();
-        let node1_id = node1_addr.endpoint_id;
+        let node1_id = node1_addr.id;
         let node2_addr = r2.endpoint().addr();
-        let node2_id = node2_addr.endpoint_id;
+        let node2_id = node2_addr.id;
         let swarm = Downloader::new(&store3, r3.endpoint());
         sp3.add_endpoint_info(node1_addr.clone());
         sp3.add_endpoint_info(node2_addr.clone());
@@ -653,9 +653,9 @@ mod tests {
             })
             .await?;
         let node1_addr = r1.endpoint().addr();
-        let node1_id = node1_addr.endpoint_id;
+        let node1_id = node1_addr.id;
         let node2_addr = r2.endpoint().addr();
-        let node2_id = node2_addr.endpoint_id;
+        let node2_id = node2_addr.id;
         let swarm = Downloader::new(&store3, r3.endpoint());
         sp3.add_endpoint_info(node1_addr.clone());
         sp3.add_endpoint_info(node2_addr.clone());

src/api/downloader.rs

@@ -3,7 +3,7 @@ use std::{collections::BTreeSet, net::SocketAddr, str::FromStr};
 
 use anyhow::Result;
 use iroh::{EndpointAddr, EndpointId, RelayUrl};
-use iroh_base::ticket::{self, Ticket};
+use iroh_tickets::{ParseError, Ticket};
 use serde::{Deserialize, Serialize};
 
 use crate::{BlobFormat, Hash, HashAndFormat};
@@ -67,10 +67,10 @@ impl Ticket for BlobTicket {
     fn to_bytes(&self) -> Vec<u8> {
         let data = TicketWireFormat::Variant0(Variant0BlobTicket {
             node: Variant0NodeAddr {
-                endpoint_id: self.addr.endpoint_id,
+                endpoint_id: self.addr.id,
                 info: Variant0AddrInfo {
-                    relay_url: self.addr.relay_url.clone(),
-                    direct_addresses: self.addr.direct_addresses.clone(),
+                    relay_url: self.addr.relay_urls().next().cloned(),
+                    direct_addresses: self.addr.ip_addrs().cloned().collect(),
                 },
             },
             format: self.format,
@@ -79,23 +79,22 @@ impl Ticket for BlobTicket {
         postcard::to_stdvec(&data).expect("postcard serialization failed")
     }
 
-    fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, ticket::ParseError> {
+    fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, ParseError> {
         let res: TicketWireFormat = postcard::from_bytes(bytes)?;
         let TicketWireFormat::Variant0(Variant0BlobTicket { node, format, hash }) = res;
-        Ok(Self {
-            addr: EndpointAddr {
-                endpoint_id: node.endpoint_id,
-                relay_url: node.info.relay_url,
-                direct_addresses: node.info.direct_addresses,
-            },
-            format,
-            hash,
-        })
+        let mut addr = EndpointAddr::new(node.endpoint_id);
+        if let Some(relay_url) = node.info.relay_url {
+            addr = addr.with_relay_url(relay_url);
+        }
+        for ip_addr in node.info.direct_addresses {
+            addr = addr.with_ip_addr(ip_addr);
+        }
+        Ok(Self { addr, format, hash })
     }
 }
 
 impl FromStr for BlobTicket {
-    type Err = ticket::ParseError;
+    type Err = ParseError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         Ticket::deserialize(s)
@@ -173,7 +172,7 @@ impl<'de> Deserialize<'de> for BlobTicket {
 mod tests {
     use std::net::SocketAddr;
 
-    use iroh::{PublicKey, SecretKey};
+    use iroh::{PublicKey, SecretKey, TransportAddr};
     use iroh_test::{assert_eq_hex, hexdump::parse_hexdump};
 
     use super::*;
@@ -182,10 +181,9 @@ mod tests {
         let hash = Hash::new(b"hi there");
         let peer = SecretKey::generate(&mut rand::rng()).public();
         let addr = SocketAddr::from_str("127.0.0.1:1234").unwrap();
-        let relay_url = None;
         BlobTicket {
             hash,
-            addr: EndpointAddr::from_parts(peer, relay_url, [addr]),
+            addr: EndpointAddr::from_parts(peer, [TransportAddr::Ip(addr)]),
             format: BlobFormat::HashSeq,
         }
     }
@@ -211,12 +209,12 @@ mod tests {
         let hash =
             Hash::from_str("0b84d358e4c8be6c38626b2182ff575818ba6bd3f4b90464994be14cb354a072")
                 .unwrap();
-        let node_id =
+        let endpoint_id =
             PublicKey::from_str("ae58ff8833241ac82d6ff7611046ed67b5072d142c588d0063e942d9a75502b6")
                 .unwrap();
 
         let ticket = BlobTicket {
-            addr: EndpointAddr::from_parts(node_id, None, []),
+            addr: EndpointAddr::new(endpoint_id),
             format: BlobFormat::Raw,
             hash,
         };

src/ticket.rs

@@ -545,7 +545,7 @@ mod tests {
         discovery::static_provider::StaticProvider,
         endpoint::{Connection, ConnectionType},
         protocol::{AcceptError, ProtocolHandler, Router},
-        Endpoint, EndpointAddr, EndpointId, RelayMode, SecretKey, Watcher,
+        Endpoint, EndpointAddr, EndpointId, RelayMode, SecretKey, TransportAddr, Watcher,
     };
     use n0_future::{io, stream, BufferedStreamExt, StreamExt};
     use n0_snafu::ResultExt;
@@ -616,7 +616,7 @@ mod tests {
             .await;
         let res: Vec<(EndpointAddr, Router)> = res.into_iter().collect::<TestResult<Vec<_>>>()?;
         let (addrs, routers): (Vec<_>, Vec<_>) = res.into_iter().unzip();
-        let ids = addrs.iter().map(|a| a.endpoint_id).collect::<Vec<_>>();
+        let ids = addrs.iter().map(|a| a.id).collect::<Vec<_>>();
         let discovery = StaticProvider::from_endpoint_info(addrs);
         Ok((ids, routers, discovery))
     }
@@ -679,9 +679,8 @@ mod tests {
             let non_listening = SecretKey::from_bytes(&[0; 32]).public();
             // make up fake node info
             discovery.add_endpoint_info(EndpointAddr {
-                endpoint_id: non_listening,
-                relay_url: None,
-                direct_addresses: vec!["127.0.0.1:12121".parse().unwrap()]
+                id: non_listening,
+                addrs: vec![TransportAddr::Ip("127.0.0.1:12121".parse().unwrap())]
                     .into_iter()
                     .collect(),
             });