diff --git a/Cargo.lock b/Cargo.lock index 9a100a63..071cca65 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -346,14 +346,14 @@ dependencies = [ [[package]] name = "bao-tree" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f7a89a8ee5889d2593ae422ce6e1bb03e48a0e8a16e4fa0882dfcbe7e182ef" +checksum = "ed75ed308ae4f69cf727de0068b967c97f2d62b5430408849ecda8ca06620bd9" dependencies = [ + "blake3", "bytes", "futures-lite", "genawaiter", - "iroh-blake3", "iroh-io", "positioned-io", "range-collections", @@ -412,6 +412,19 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" +[[package]] +name = "blake3" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34a796731680be7931955498a16a10b2270c7762963d5d570fdbfe02dcbf314f" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] + [[package]] name = "block-buffer" version = "0.10.4" @@ -2071,19 +2084,6 @@ dependencies = [ "url", ] -[[package]] -name = "iroh-blake3" -version = "1.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbba31f40a650f58fa28dd585a8ca76d8ae3ba63aacab4c8269004a0c803930" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if", - "constant_time_eq", -] - [[package]] name = "iroh-blobs" version = "0.34.0" @@ -2091,6 +2091,7 @@ dependencies = [ "anyhow", "async-channel", "bao-tree", + "blake3", "bytes", "chrono", "clap", @@ -2107,7 +2108,6 @@ dependencies = [ "indicatif", "iroh", "iroh-base", - "iroh-blake3", "iroh-io", "iroh-metrics", "iroh-quinn", diff --git a/Cargo.toml b/Cargo.toml index d7fbfe83..43c8d0fb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,11 +15,11 @@ rust-version = "1.81" [dependencies] anyhow = { version = "1" } async-channel = "2.3.1" -bao-tree = { version = "0.13", features = [ +bao-tree = { version = "0.15", features = [ "tokio_fsm", "validate", ], default-features = false } -blake3 = { version = "1.4.5", package = "iroh-blake3" } +blake3 = { version = "1.8" } bytes = { version = "1.7", features = ["serde"] } chrono = "0.4.31" clap = { version = "4.5.20", features = ["derive"], optional = true }