feat(iroh-dag-sync): update to iroh@0.94

Author: dignifiedquire

iroh-dag-sync/Cargo.toml

@@ -4,12 +4,12 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-iroh-blobs = "0.95"
-iroh-gossip = "0.93"
-iroh = "0.93"
-iroh-base = { version ="0.93", features = ["ticket"] }
+iroh-blobs = "0.96"
+iroh-gossip = "0.94"
+iroh = "0.94"
+iroh-tickets = "0.1"
 iroh-car = "0.5"
-redb = "2.1.1"
+redb = "2.6"
 clap = { version = "4.5.7", features = ["derive"] }
 tracing-subscriber = "0.3.18"
 anyhow = "1.0.86"
@@ -23,7 +23,7 @@ bao-tree = "0.15.1"
 genawaiter = "0.99.1"
 bytes = "1.6.0"
 hex = "0.4.3"
-ron = "0.8.1"
+ron = "0.11"
 rand = "0.9.2"
 tracing = "0.1.40"
 serde_bytes = "0.11.14"

iroh-dag-sync/src/args.rs

@@ -4,7 +4,7 @@ use std::{
 };
 
 use clap::Parser;
-use iroh::NodeId;
+use iroh::EndpointId;
 
 use crate::protocol::Cid;
 
@@ -18,7 +18,7 @@ pub struct Args {
 pub enum SubCommand {
     Import(ImportArgs),
     Export(ExportArgs),
-    Node(NodeArgs),
+    Endpoint(EndpointArgs),
     Sync(SyncArgs),
 }
 
@@ -41,7 +41,7 @@ pub struct ExportArgs {
 }
 
 #[derive(Debug, Parser)]
-pub struct NodeArgs {
+pub struct EndpointArgs {
     #[clap(flatten)]
     pub net: NetArgs,
 }
@@ -66,6 +66,6 @@ pub struct SyncArgs {
     pub traversal: Option<String>,
     #[clap(long, help = "Which data to send inline")]
     pub inline: Option<String>,
-    #[clap(long, help = "The node to sync from")]
-    pub from: NodeId,
+    #[clap(long, help = "The endpoint to sync from")]
+    pub from: EndpointId,
 }

iroh-dag-sync/src/main.rs

@@ -5,17 +5,17 @@ use anyhow::Context;
 use clap::Parser;
 use futures_lite::StreamExt;
 use ipld_core::codec::Links;
-use iroh::discovery::{dns::DnsDiscovery, pkarr::PkarrPublisher, ConcurrentDiscovery};
-use iroh::NodeAddr;
-use iroh_base::ticket::NodeTicket;
+use iroh::EndpointAddr;
+use iroh::discovery::{ConcurrentDiscovery, dns::DnsDiscovery, pkarr::PkarrPublisher};
 use iroh_car::CarReader;
-use protocol::{ron_parser, Cid, Request};
+use iroh_tickets::endpoint::EndpointTicket;
+use protocol::{Cid, Request, ron_parser};
 use serde::{Deserialize, Serialize};
 use sync::{handle_request, handle_sync_response};
 use tables::{ReadOnlyTables, ReadableTables, Tables};
 use tokio::io::AsyncWriteExt;
 use tokio_util::task::LocalPoolHandle;
-use traversal::{get_traversal, Traversal};
+use traversal::{Traversal, get_traversal};
 
 mod args;
 mod protocol;
@@ -120,17 +120,17 @@ async fn main() -> anyhow::Result<()> {
                 None => print_traversal(traversal, &store).await?,
             }
         }
-        args::SubCommand::Node(args) => {
+        args::SubCommand::Endpoint(args) => {
             let endpoint =
                 create_endpoint(args.net.iroh_ipv4_addr, args.net.iroh_ipv6_addr).await?;
             endpoint.online().await;
-            let addr = endpoint.node_addr();
-            println!("Node id:\n{}", addr.node_id);
-            println!(
-                "Listening on {:#?}, {:#?}",
-                addr.relay_url, addr.direct_addresses
-            );
-            println!("ticket:\n{}", NodeTicket::new(addr.clone()));
+            let addr = endpoint.addr();
+            println!("Endpoint id:\n{}", addr.id);
+            println!("Listening on:");
+            for addr in &addr.addrs {
+                println!("- {addr:?}");
+            }
+            println!("ticket:\n{}", EndpointTicket::new(addr.clone()));
             while let Some(incoming) = endpoint.accept().await {
                 let mut connecting = incoming.accept()?;
                 let alpn = connecting.alpn().await?;
@@ -161,8 +161,8 @@ async fn main() -> anyhow::Result<()> {
             let mut tables = Tables::new(&tx)?;
             let store = store.clone();
             let endpoint = Arc::new(endpoint);
-            let node = NodeAddr::from(args.from);
-            let connection = endpoint.connect(node, SYNC_ALPN).await?;
+            let addr = EndpointAddr::from(args.from);
+            let connection = endpoint.connect(addr, SYNC_ALPN).await?;
             let request = protocol::Request::Sync(protocol::SyncRequest {
                 traversal: traversal.clone(),
                 inline,
@@ -253,7 +253,7 @@ where
             .await
             .context("data not found")?;
         let mut block_bytes = cid.to_bytes(); // postcard::to_extend(&RawCidHeader::from_cid(&cid), Vec::new())?;
-                                              // block_bytes.extend_from_slice(&cid.hash().digest()); // hash
+        // block_bytes.extend_from_slice(&cid.hash().digest()); // hash
         block_bytes.extend_from_slice(&data);
         let size: u64 = block_bytes.len() as u64;
         file.write_all(postcard::to_slice(&size, &mut buffer)?)