feat: update to iroh@0.29.0

Depends on
- n0-computer/iroh-gossip#14
- https://github.com/n0-computer/iroh-blobs/pulls

Author: dignifiedquire

Cargo.lock

@@ -35,11 +35,10 @@ futures-buffered = "0.2.4"
 futures-lite = "2.3.0"
 futures-util = { version = "0.3.25" }
 hex = "0.4"
-iroh-base = "0.28.0"
 iroh-blobs = { version = "0.28.0", optional = true, features = ["downloader"] }
 iroh-gossip = { version = "0.28.0", optional = true }
-iroh-metrics = { version = "0.28.0", default-features = false }
-iroh = { version = "0.28", optional = true }
+iroh-metrics = { version = "0.29.0", default-features = false }
+iroh = { version = "0.29", optional = true }
 num_enum = "0.7"
 postcard = { version = "1", default-features = false, features = ["alloc", "use-std", "experimental-derive"] }
 rand = "0.8.5"
@@ -67,12 +66,13 @@ portable-atomic = { version = "1.9.0", optional = true }
 clap = { version = "4", features = ["derive"], optional = true }
 console = { version = "0.15", optional = true }
 indicatif = { version = "0.17", features = ["tokio"], optional = true }
+iroh-base = { version = "0.29", features = ["base32"], optional = true }
 dialoguer = { version = "0.11", optional = true }
 colored = { version = "2.1", optional = true }
 shellexpand = { version = "3.1", optional = true }
 
 [dev-dependencies]
-iroh-test = "0.28.0"
+iroh-test = "0.29"
 rand_chacha = "0.3.1"
 tokio = { version = "1", features = ["sync", "macros"] }
 proptest = "1.2.0"
@@ -92,7 +92,7 @@ net = ["dep:iroh", "tokio/io-util", "dep:tokio-stream", "dep:tokio-util"]
 metrics = ["iroh-metrics/metrics", "iroh/metrics"]
 engine = ["net", "dep:iroh-gossip", "dep:iroh-blobs"]
 test-utils = ["iroh/test-utils"]
-cli = ["rpc", "dep:clap", "dep:indicatif", "dep:console", "dep:colored", "dep:dialoguer", "dep:shellexpand", "iroh-blobs/rpc"]
+cli = ["rpc", "dep:clap", "dep:indicatif", "dep:console", "dep:colored", "dep:dialoguer", "dep:shellexpand", "iroh-blobs/rpc", "dep:iroh-base"]
 rpc = [
   "engine",
   "dep:nested_enum_utils",
@@ -107,8 +107,5 @@ all-features = true
 rustdoc-args = ["--cfg", "iroh_docsrs"]
 
 [patch.crates-io]
-iroh-metrics = { git = "https://github.com/n0-computer/iroh", branch = "main" }
-iroh-base = { git = "https://github.com/n0-computer/iroh", branch = "main" }
-iroh = { git = "https://github.com/n0-computer/iroh", branch = "main" }
-iroh-blobs = { git = "https://github.com/n0-computer/iroh-blobs", branch = "main" }
-iroh-gossip = { git = "https://github.com/n0-computer/iroh-gossip", branch = "main" }
+iroh-blobs = { git = "https://github.com/n0-computer/iroh-blobs", branch = "iroh-v0-29-0" }
+iroh-gossip = { git = "https://github.com/n0-computer/iroh-gossip", branch = "iroh-v0-29-0" }

Cargo.toml

@@ -11,7 +11,7 @@ use std::{
 use anyhow::{anyhow, Context, Result};
 use bytes::Bytes;
 use futures_util::FutureExt;
-use iroh_base::hash::Hash;
+use iroh::hash::Hash;
 use iroh_metrics::inc;
 use serde::{Deserialize, Serialize};
 use tokio::{sync::oneshot, task::JoinSet};

src/actor.rs

@@ -18,7 +18,8 @@ use dialoguer::Confirm;
 use futures_buffered::BufferedStreamExt;
 use futures_lite::{Stream, StreamExt};
 use indicatif::{HumanBytes, HumanDuration, MultiProgress, ProgressBar, ProgressStyle};
-use iroh_base::{base32::fmt_short, hash::Hash, node_addr::AddrInfoOptions};
+use iroh::{hash::Hash, AddrInfoOptions};
+use iroh_base::base32::fmt_short;
 use iroh_blobs::{
     provider::AddProgress,
     rpc::client::blobs::{self, WrapOption},

src/cli.rs

@@ -294,8 +294,7 @@ impl BobState {
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use iroh::key::SecretKey;
-    use iroh_base::hash::Hash;
+    use iroh::{hash::Hash, key::SecretKey};
     use rand_core::{CryptoRngCore, SeedableRng};
 
     use super::*;

src/net/codec.rs

@@ -12,8 +12,7 @@ use anyhow::{anyhow, Context as _, Result};
 use bytes::Bytes;
 use derive_more::{Display, FromStr};
 use futures_lite::{Stream, StreamExt};
-use iroh::NodeAddr;
-use iroh_base::node_addr::AddrInfoOptions;
+use iroh::{AddrInfoOptions, NodeAddr};
 use iroh_blobs::{export::ExportProgress, store::ExportMode, Hash};
 use portable_atomic::{AtomicBool, Ordering};
 use quic_rpc::{

src/rpc/client/docs.rs

@@ -3,8 +3,7 @@
 use std::path::PathBuf;
 
 use bytes::Bytes;
-use iroh::NodeAddr;
-use iroh_base::node_addr::AddrInfoOptions;
+use iroh::{AddrInfoOptions, NodeAddr};
 use iroh_blobs::{export::ExportProgress, store::ExportMode, Hash};
 use nested_enum_utils::enum_conversions;
 use quic_rpc::pattern::try_server_streaming::StreamCreated;

src/rpc/proto.rs

@@ -11,7 +11,7 @@ use std::{
 
 use anyhow::{anyhow, Result};
 use ed25519_dalek::{SignatureError, VerifyingKey};
-use iroh_base::hash::Hash;
+use iroh::hash::Hash;
 use rand_core::CryptoRngCore;
 use redb::{Database, DatabaseError, ReadableMultimapTable, ReadableTable, ReadableTableMetadata};
 

src/store/fs.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use iroh_base::hash::Hash;
+use iroh::hash::Hash;
 
 use super::{
     bounds::{ByKeyBounds, RecordsBounds},

src/store/fs/query.rs

@@ -16,7 +16,7 @@ use std::{
 
 use bytes::{Bytes, BytesMut};
 use ed25519_dalek::{Signature, SignatureError};
-use iroh_base::hash::Hash;
+use iroh::hash::Hash;
 #[cfg(feature = "metrics")]
 use iroh_metrics::{inc, inc_by};
 use serde::{Deserialize, Serialize};