diff --git a/Cargo.lock b/Cargo.lock index f0675c76..a076cdef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2017,8 +2017,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "iroh" -version = "0.34.1" -source = "git+https://github.com/n0-computer/iroh?branch=main#a62a2bd25f5280a8d1512bcd261e666731de5d95" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ca758f4ce39ae3f07de922be6c73de6a48a07f39554e78b5745585652ce38f5" dependencies = [ "aead", "anyhow", @@ -2080,8 +2081,9 @@ dependencies = [ [[package]] name = "iroh-base" -version = "0.34.1" -source = "git+https://github.com/n0-computer/iroh?branch=main#a62a2bd25f5280a8d1512bcd261e666731de5d95" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91ac4aaab68153d726c4e6b39c30f9f9253743f0e25664e52f4caeb46f48d11" dependencies = [ "curve25519-dalek", "data-encoding", @@ -2257,8 +2259,9 @@ dependencies = [ [[package]] name = "iroh-relay" -version = "0.34.1" -source = "git+https://github.com/n0-computer/iroh?branch=main#a62a2bd25f5280a8d1512bcd261e666731de5d95" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c63f122cdfaa4b4e0e7d6d3921d2b878f42a0c6d3ee5a29456dc3f5ab5ec931f" dependencies = [ "ahash", "anyhow", @@ -3445,9 +3448,9 @@ dependencies = [ [[package]] name = "quic-rpc" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89561e5343bcad1c9f84321d9d9bd1619128ad44293faad55a0001b0e52d312b" +checksum = "18bad98bd048264ceb1361ff9d77a031535d8c1e3fe8f12c6966ec825bf68eb7" dependencies = [ "anyhow", "bytes", @@ -3473,9 +3476,9 @@ dependencies = [ [[package]] name = "quic-rpc-derive" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a99f334af6f23b3de91f6df9ac17237e8b533b676f596c69dcb3b58c3cf8dea" +checksum = "abf13f1bced5f2f2642d9d89a29d75f2d81ab34c4acfcb434c209d6094b9b2b7" dependencies = [ "proc-macro2", "quic-rpc", diff --git a/Cargo.toml b/Cargo.toml index fd42d813..eef0ca0c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,10 +40,10 @@ genawaiter = { version = "0.99.1", features = ["futures03"] } hashlink = { version = "0.9.0", optional = true } hex = "0.4.3" indicatif = { version = "0.17.8", optional = true } -iroh-base = { git = "https://github.com/n0-computer/iroh", branch = "main" } +iroh-base = "0.35" iroh-io = { version = "0.6.0", features = ["stats"] } iroh-metrics = { version = "0.34", default-features = false } -iroh = { git = "https://github.com/n0-computer/iroh", branch = "main" } +iroh = "0.35" nested_enum_utils = { version = "0.1.0", optional = true } num_cpus = "1.15.0" oneshot = "0.1.8" @@ -54,8 +54,8 @@ postcard = { version = "1", default-features = false, features = [ "use-std", "experimental-derive", ] } -quic-rpc = { version = "0.19", optional = true } -quic-rpc-derive = { version = "0.19", optional = true } +quic-rpc = { version = "0.20", optional = true } +quic-rpc-derive = { version = "0.20", optional = true } rand = "0.8" range-collections = "0.4.0" redb = { version = "=2.4", optional = true } @@ -80,7 +80,7 @@ tracing-test = "0.2.5" [dev-dependencies] http-body = "1.0" -iroh = { git = "https://github.com/n0-computer/iroh", branch = "main", features = ["test-utils"] } +iroh = { version = "0.35", features = ["test-utils"] } quinn = { package = "iroh-quinn", version = "0.13", features = ["ring"] } futures-buffered = "0.2.4" proptest = "1.0.0" diff --git a/README.md b/README.md index e93564fa..a87df9fb 100644 --- a/README.md +++ b/README.md @@ -51,8 +51,7 @@ async fn main() -> anyhow::Result<()> { // build the router let router = Router::builder(endpoint) .accept(iroh_blobs::ALPN, blobs.clone()) - .spawn() - .await?; + .spawn(); // do fun stuff with the blobs protocol! router.shutdown().await?; diff --git a/deny.toml b/deny.toml index 1395c24b..8f6f1224 100644 --- a/deny.toml +++ b/deny.toml @@ -1,44 +1,43 @@ +[advisories] +ignore = [ + "RUSTSEC-2024-0370", + "RUSTSEC-2024-0384", + "RUSTSEC-2024-0436", + "RUSTSEC-2023-0089", +] + [bans] -multiple-versions = "allow" deny = [ - "aws-lc", - "aws-lc-rs", - "aws-lc-sys", - "native-tls", - "openssl", + "aws-lc", + "aws-lc-rs", + "aws-lc-sys", + "native-tls", + "openssl", ] +multiple-versions = "allow" [licenses] allow = [ - "Apache-2.0", - "Apache-2.0 WITH LLVM-exception", - "BSD-2-Clause", - "BSD-3-Clause", - "BSL-1.0", # BOSL license - "ISC", - "MIT", - "Zlib", - "MPL-2.0", # https://fossa.com/blog/open-source-software-licenses-101-mozilla-public-license-2-0/ - "Unicode-3.0", - "Unlicense", # https://unlicense.org/ + "Apache-2.0", + "Apache-2.0 WITH LLVM-exception", + "BSD-2-Clause", + "BSD-3-Clause", + "BSL-1.0", + "ISC", + "MIT", + "Zlib", + "MPL-2.0", + "Unicode-3.0", + "Unlicense", ] [[licenses.clarify]] -name = "ring" expression = "MIT AND ISC AND OpenSSL" -license-files = [ - { path = "LICENSE", hash = 0xbd0eed23 }, -] +name = "ring" -[advisories] -ignore = [ - "RUSTSEC-2024-0370", # unmaintained, no upgrade available - "RUSTSEC-2024-0384", # unmaintained, no upgrade available - "RUSTSEC-2024-0436", # unmaintained paste - "RUSTSEC-2023-0089", # unmaintained, no upgrade available yet -] +[[licenses.clarify.license-files]] +hash = 3171872035 +path = "LICENSE" [sources] -allow-git = [ - "https://github.com/n0-computer/iroh.git", -] +allow-git = [] diff --git a/examples/custom-protocol.rs b/examples/custom-protocol.rs index 2537562f..f3255f8a 100644 --- a/examples/custom-protocol.rs +++ b/examples/custom-protocol.rs @@ -97,7 +97,7 @@ async fn main() -> Result<()> { // Add our protocol, identified by our ALPN, to the node, and spawn the node. let builder = builder.accept(ALPN, proto.clone()); - let node = builder.spawn().await?; + let node = builder.spawn(); match args.command { Command::Listen { text } => { diff --git a/examples/discovery-local-network.rs b/examples/discovery-local-network.rs index 44ef6e9b..bf8fccbc 100644 --- a/examples/discovery-local-network.rs +++ b/examples/discovery-local-network.rs @@ -73,7 +73,7 @@ async fn main() -> anyhow::Result<()> { let builder = Router::builder(endpoint); let blobs = Blobs::memory().build(builder.endpoint()); let builder = builder.accept(iroh_blobs::ALPN, blobs.clone()); - let node = builder.spawn().await?; + let node = builder.spawn(); let blobs_client = blobs.client(); match &cli.command { diff --git a/examples/hello-world-fetch.rs b/examples/hello-world-fetch.rs index 74c494c4..93ae9bde 100644 --- a/examples/hello-world-fetch.rs +++ b/examples/hello-world-fetch.rs @@ -39,7 +39,7 @@ async fn main() -> Result<()> { let builder = Router::builder(endpoint); let blobs = Blobs::memory().build(builder.endpoint()); let builder = builder.accept(iroh_blobs::ALPN, blobs.clone()); - let node = builder.spawn().await?; + let node = builder.spawn(); let blobs_client = blobs.client(); println!("fetching hash: {}", ticket.hash()); diff --git a/examples/hello-world-provide.rs b/examples/hello-world-provide.rs index aa9fc773..a8980304 100644 --- a/examples/hello-world-provide.rs +++ b/examples/hello-world-provide.rs @@ -27,7 +27,7 @@ async fn main() -> anyhow::Result<()> { let blobs = Blobs::memory().build(builder.endpoint()); let builder = builder.accept(iroh_blobs::ALPN, blobs.clone()); let blobs_client = blobs.client(); - let node = builder.spawn().await?; + let node = builder.spawn(); // add some data and remember the hash let res = blobs_client.add_bytes("Hello, world!").await?; diff --git a/examples/transfer.rs b/examples/transfer.rs index 960274db..60f9e387 100644 --- a/examples/transfer.rs +++ b/examples/transfer.rs @@ -22,8 +22,7 @@ async fn main() -> Result<()> { // to the blobs protocol. let router = Router::builder(endpoint) .accept(iroh_blobs::ALPN, blobs.clone()) - .spawn() - .await?; + .spawn(); // We use a blobs client to interact with the blobs protocol we're running locally: let blobs_client = blobs.client(); diff --git a/src/rpc/client/blobs.rs b/src/rpc/client/blobs.rs index e5f5acee..f7e484c3 100644 --- a/src/rpc/client/blobs.rs +++ b/src/rpc/client/blobs.rs @@ -1083,7 +1083,7 @@ mod tests { router = router.accept(crate::ALPN, blobs.clone()); // Build the router - let router = router.spawn().await?; + let router = router.spawn(); // Setup RPC let (internal_rpc, controller) = quic_rpc::transport::flume::channel(32); diff --git a/tests/gc.rs b/tests/gc.rs index dcf76b4e..24404ad1 100644 --- a/tests/gc.rs +++ b/tests/gc.rs @@ -101,9 +101,7 @@ async fn node(store: S, gc_period: Duration) -> (Node, async_channe let blobs = Blobs::builder(store.clone()).build(&endpoint); let router = Router::builder(endpoint) .accept(iroh_blobs::ALPN, blobs.clone()) - .spawn() - .await - .unwrap(); + .spawn(); blobs .start_gc(GcConfig { period: gc_period, diff --git a/tests/rpc.rs b/tests/rpc.rs index 7dc12e7b..9e515144 100644 --- a/tests/rpc.rs +++ b/tests/rpc.rs @@ -25,8 +25,7 @@ impl Node { let blobs = Blobs::builder(store).build(&endpoint); let router = iroh::protocol::Router::builder(endpoint) .accept(iroh_blobs::ALPN, blobs.clone()) - .spawn() - .await?; + .spawn(); let (config, key) = quic_rpc::transport::quinn::configure_server()?; let endpoint = quinn::Endpoint::server(config, "127.0.0.1:0".parse().unwrap())?; let local_addr = endpoint.local_addr()?;