Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
275 changes: 87 additions & 188 deletions content-discovery/Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions content-discovery/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ missing_debug_implementations = "warn"
unused-async = "warn"

[workspace.dependencies]
iroh = { version ="0.90", features = ["discovery-pkarr-dht"] }
iroh-base = "0.90"
iroh-blobs = { version = "0.91" }
iroh = { version ="0.91", features = ["discovery-pkarr-dht"] }
iroh-base = "0.91"
iroh-blobs = { version = "0.93" }
# explicitly specified until iroh minimal crates issues are solved, see https://github.com/n0-computer/iroh/pull/3255
tokio = { version = "1.44.1" }
tokio-stream = { version = "0.1.17" }
Expand Down
4 changes: 2 additions & 2 deletions content-discovery/iroh-content-tracker/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ macro_rules! log {
async fn await_relay_region(endpoint: &Endpoint) -> anyhow::Result<()> {
let t0 = Instant::now();
loop {
let addr = endpoint.node_addr().initialized().await?;
let addr = endpoint.node_addr().initialized().await;
if addr.relay_url().is_some() {
break;
}
Expand Down Expand Up @@ -113,7 +113,7 @@ async fn server(args: Args) -> anyhow::Result<()> {
let db = Tracker::new(options, endpoint.clone())?;
db.dump().await?;
await_relay_region(&endpoint).await?;
let addr = endpoint.node_addr().initialized().await?;
let addr = endpoint.node_addr().initialized().await;
println!("tracker addr: {}\n", addr.node_id);
info!("listening on {:?}", addr);
// let db2 = db.clone();
Expand Down
4 changes: 2 additions & 2 deletions h3-iroh/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ http-body = { version = "1", optional = true }
http-body-util = { version = "0.1", optional = true }
hyper = { version = "1.5", optional = true }
hyper-util = { version = "0.1", optional = true }
iroh = "0.90"
iroh-base = { version = "0.90", features = ["ticket"] }
iroh = "0.91"
iroh-base = { version = "0.91", features = ["ticket"] }
tokio = { version = "1", features = ["io-util"], default-features = false}
tokio-util = "0.7"
tower = { version = "0.5", optional = true }
Expand Down
6 changes: 3 additions & 3 deletions h3-iroh/examples/server-axum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ async fn main() -> Result<()> {
info!("accepting connections on node: {}", ep.node_id());

// Wait for direct addresses and a RelayUrl before printing a NodeTicket.
ep.direct_addresses().initialized().await?;
ep.home_relay().initialized().await?;
let ticket = NodeTicket::new(ep.node_addr().initialized().await?);
ep.direct_addresses().initialized().await;
ep.home_relay().initialized().await;
let ticket = NodeTicket::new(ep.node_addr().initialized().await);
info!("node ticket: {ticket}");
info!("run: cargo run --example client -- iroh+h3://{ticket}/");

Expand Down
6 changes: 3 additions & 3 deletions h3-iroh/examples/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ async fn main() -> Result<()> {
info!("accepting connections on node: {}", ep.node_id());

// Wait for direct addresses and a RelayUrl before printing a NodeTicket.
ep.direct_addresses().initialized().await?;
ep.home_relay().initialized().await?;
let ticket = NodeTicket::new(ep.node_addr().initialized().await?);
ep.direct_addresses().initialized().await;
ep.home_relay().initialized().await;
let ticket = NodeTicket::new(ep.node_addr().initialized().await);
info!("node ticket: {ticket}");
info!("run e.g.: cargo run --example client -- iroh+h3://{ticket}/Cargo.toml");

Expand Down
8 changes: 4 additions & 4 deletions iroh-dag-sync/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ version = "0.1.0"
edition = "2021"

[dependencies]
iroh-blobs = "0.90"
iroh-gossip = "0.90"
iroh = "0.90"
iroh-base = { version ="0.90", features = ["ticket"] }
iroh-blobs = "0.93"
iroh-gossip = "0.91"
iroh = "0.91"
iroh-base = { version ="0.91", features = ["ticket"] }
iroh-car = "0.5.0"
redb = "2.1.1"
clap = { version = "4.5.7", features = ["derive"] }
Expand Down
4 changes: 2 additions & 2 deletions iroh-dag-sync/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ async fn main() -> anyhow::Result<()> {
args::SubCommand::Node(args) => {
let endpoint =
create_endpoint(args.net.iroh_ipv4_addr, args.net.iroh_ipv6_addr).await?;
endpoint.home_relay().initialized().await?;
let addr = endpoint.node_addr().initialized().await?;
endpoint.home_relay().initialized().await;
let addr = endpoint.node_addr().initialized().await;
println!("Node id:\n{}", addr.node_id);
println!(
"Listening on {:#?}, {:#?}",
Expand Down
4 changes: 2 additions & 2 deletions iroh-pkarr-naming-system/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ edition = "2021"
[dependencies]
anyhow = "1.0.79"
derive_more = "0.99.17"
iroh = "0.90"
iroh-blobs = "0.90"
iroh = "0.91"
iroh-blobs = "0.93"
pkarr = { version = "2.3.1", features = ["async", "dht"] }
tokio = "1.35.1"
tokio-util = "0.7.12"
Expand Down
Loading