refactor(iroh-cli)!: Use blobs and tags cli from iroh-blobs crate

Cargo.toml

@@ -57,4 +57,4 @@ iroh-router = { path = "./iroh-router" }
 
 iroh-gossip = { git = "https://github.com/n0-computer/iroh-gossip", branch = "main" }
 iroh-docs = { git = "https://github.com/n0-computer/iroh-docs", branch = "main" }
-iroh-blobs = { git = "https://github.com/n0-computer/iroh-blobs", branch = "main" }
+iroh-blobs = { git = "https://github.com/n0-computer/iroh-blobs", branch = "cli" }

iroh-cli/Cargo.toml

@@ -44,6 +44,7 @@ iroh = { version = "0.28.1", path = "../iroh", features = ["metrics"] }
 iroh-gossip = "0.28.1"
 iroh-docs = { version = "0.28.0", features = ["rpc"]}
 iroh-metrics = { version = "0.28.0" }
+iroh-blobs = { version = "0.28.1", features = ["cli"] }
 parking_lot = "0.12.1"
 pkarr = { version = "2.2.0", default-features = false }
 portable-atomic = "1"

iroh-cli/src/commands.rs

@@ -6,24 +6,20 @@ use std::{
 use anyhow::{ensure, Context, Result};
 use clap::Parser;
 use iroh::client::Iroh;
+use iroh_blobs::cli::{BlobAddOptions, BlobSource};
 
-use self::{
-    blobs::{BlobAddOptions, BlobSource},
-    rpc::RpcCommands,
-    start::RunType,
-};
+use self::{rpc::RpcCommands, start::RunType};
 use crate::config::{ConsoleEnv, NodeConfig};
 
 pub(crate) mod authors;
-pub(crate) mod blobs;
 pub(crate) mod console;
 pub(crate) mod docs;
 pub(crate) mod doctor;
 pub(crate) mod gossip;
 pub(crate) mod net;
 pub(crate) mod rpc;
 pub(crate) mod start;
-pub(crate) mod tags;
+pub use iroh_blobs::{cli as blobs, cli::tags};
 
 /// iroh is a tool for building distributed apps.
 ///
@@ -191,7 +187,10 @@ impl Cli {
                     |client| async move {
                         match add_command {
                             None => Ok(()),
-                            Some(command) => command.run(&client).await,
+                            Some(command) => {
+                                let node_addr = client.net().node_addr().await?;
+                                command.run(&client.blobs(), node_addr).await
+                            }
                         }
                     },
                 )