diff --git a/Cargo.lock b/Cargo.lock index a5b5246..28125af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -829,7 +829,7 @@ dependencies = [ [[package]] name = "ant-cli" -version = "0.2.2" +version = "0.2.3" dependencies = [ "ant-core", "anyhow", @@ -849,11 +849,11 @@ dependencies = [ [[package]] name = "ant-core" -version = "0.2.3" +version = "0.2.4" dependencies = [ "alloy", "ant-node", - "ant-protocol 2.0.3 (git+https://github.com/WithAutonomi/ant-protocol.git?rev=93e63b8a41a97c37c24d1164a3ee5525e002ddcd)", + "ant-protocol", "anyhow", "async-stream", "axum", @@ -906,11 +906,12 @@ dependencies = [ [[package]] name = "ant-node" -version = "0.11.2" -source = "git+https://github.com/WithAutonomi/ant-node.git?rev=8b68b2d7f4662faf67ed7812dc6cb37de0c74a8b#8b68b2d7f4662faf67ed7812dc6cb37de0c74a8b" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f7a31a3e5b79a8f362d77daae46bc2253cc22744dd5294e7805f8ad581137f4" dependencies = [ "aes-gcm-siv", - "ant-protocol 2.0.3 (git+https://github.com/WithAutonomi/ant-protocol?branch=main)", + "ant-protocol", "blake3", "bytes", "chrono", @@ -956,26 +957,9 @@ dependencies = [ [[package]] name = "ant-protocol" -version = "2.0.3" -source = "git+https://github.com/WithAutonomi/ant-protocol?branch=main#93e63b8a41a97c37c24d1164a3ee5525e002ddcd" -dependencies = [ - "blake3", - "bytes", - "evmlib", - "hex", - "postcard", - "rmp-serde", - "saorsa-core", - "saorsa-pqc 0.5.1", - "serde", - "tokio", - "tracing", -] - -[[package]] -name = "ant-protocol" -version = "2.0.3" -source = "git+https://github.com/WithAutonomi/ant-protocol.git?rev=93e63b8a41a97c37c24d1164a3ee5525e002ddcd#93e63b8a41a97c37c24d1164a3ee5525e002ddcd" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1aa2c58065ac6486b506fab559e4cebdbc18e416ed697112d268f3c440ba08f" dependencies = [ "blake3", "bytes", @@ -1324,9 +1308,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-lc-rs" -version = "1.16.3" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ec6fb3fe69024a75fa7e1bfb48aa6cf59706a101658ea01bfd33b2b248a038f" +checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00" dependencies = [ "aws-lc-sys", "zeroize", @@ -1334,9 +1318,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.40.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50037ee5e1e41e7b8f9d161680a725bd1626cb6f8c7e901f91f942850852fe7" +checksum = "1a2f9779ce85b93ab6170dd940ad0169b5766ff848247aff13bb788b832fe3f4" dependencies = [ "cc", "cmake", @@ -3636,9 +3620,9 @@ dependencies = [ [[package]] name = "keccak-asm" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa468878266ad91431012b3e5ef1bf9b170eab22883503a318d46857afa4579a" +checksum = "1766b89733097006f3a1388a02849865d6bc98c89273cb622e29fdd209922183" dependencies = [ "digest 0.10.7", "sha3-asm", @@ -4313,18 +4297,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.12" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf0d9e68100b3a7989b4901972f265cd542e560a3a8a724e1e20322f4d06ce9" +checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.12" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a990e22f43e84855daf260dded30524ef4a9021cc7541c26540500a50b624389" +checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b" dependencies = [ "proc-macro2", "quote", @@ -5213,8 +5197,9 @@ dependencies = [ [[package]] name = "saorsa-core" -version = "0.24.2" -source = "git+https://github.com/saorsa-labs/saorsa-core?branch=fix%2Fstability-improvements#5586795740eafd9818e827baa2eb2677ff3ba942" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7d172c24312750ed8196ec9d58eb763e8aca259f836ce1f5c21cf70023a93e" dependencies = [ "anyhow", "async-trait", @@ -5327,8 +5312,9 @@ dependencies = [ [[package]] name = "saorsa-transport" -version = "0.34.1" -source = "git+https://github.com/saorsa-labs/saorsa-transport?branch=fix%2Fstability-improvements#55f423ca5e3312e31ba22475b68a76f4ffd50285" +version = "0.34.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852400712537856ab6fec5293be4290daf0130df0dbcb249a6e8280f9257665f" dependencies = [ "anyhow", "async-trait", @@ -5753,9 +5739,9 @@ dependencies = [ [[package]] name = "sha3-asm" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59cbb88c189d6352cc8ae96a39d19c7ecad8f7330b29461187f2587fdc2988d5" +checksum = "9f3f15d4e239ebe08413eed880e0f9b5af4b40ee0472543320efa91d488e96a7" dependencies = [ "cc", "cfg-if", diff --git a/Cargo.toml b/Cargo.toml index b3bbb58..ec8f5ce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,18 +2,3 @@ members = ["ant-core", "ant-cli"] resolver = "2" -# Pin ant-protocol to WithAutonomi/ant-protocol `main` so ChunkPutRequest's -# `content` field is `Bytes` (not `Vec`), letting the close-group fan-out -# in `ant-core/src/data/client/chunk.rs` share a single backing buffer across -# peer sends instead of `to_vec()`-copying the 4 MB payload per peer. -# The `Bytes` change landed in https://github.com/WithAutonomi/ant-protocol/pull/6. -# Remove once a crates.io release containing it is published. -# -# ant-node (a dev-dep of ant-core) was updated to the new `Bytes`-typed -# `ChunkPutRequest::content` on `main` but no crates.io release yet exists -# that includes it. Without this patch, the transitive `ant-node 0.11.2` -# fails to build under `cargo clippy --all-targets` / `cargo test`. -[patch.crates-io] -ant-protocol = { git = "https://github.com/WithAutonomi/ant-protocol.git", rev = "93e63b8a41a97c37c24d1164a3ee5525e002ddcd" } -ant-node = { git = "https://github.com/WithAutonomi/ant-node.git", rev = "8b68b2d7f4662faf67ed7812dc6cb37de0c74a8b" } - diff --git a/ant-cli/Cargo.toml b/ant-cli/Cargo.toml index db8105f..05ecc83 100644 --- a/ant-cli/Cargo.toml +++ b/ant-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ant-cli" -version = "0.2.2" +version = "0.2.3" edition = "2021" description = "Unified CLI (`ant`) for the Autonomi network: store and retrieve data, and manage local nodes." license = "MIT OR Apache-2.0" diff --git a/ant-core/Cargo.toml b/ant-core/Cargo.toml index 073b354..50bb609 100644 --- a/ant-core/Cargo.toml +++ b/ant-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ant-core" -version = "0.2.3" +version = "0.2.4" edition = "2021" description = "Headless Rust library for the Autonomi network: data storage and retrieval with self-encryption and EVM payments, plus node lifecycle management." license = "MIT OR Apache-2.0" @@ -36,7 +36,7 @@ tower-http = { version = "0.6.8", features = ["cors"] } # under `ant_protocol::{evm, transport, pqc}`. This is the ONE pin for # those three deps — do not add direct evmlib/saorsa-core/saorsa-pqc # deps here or the version can skew between ant-client and ant-node. -ant-protocol = { git = "https://github.com/WithAutonomi/ant-protocol", rev = "93e63b8a41a97c37c24d1164a3ee5525e002ddcd" } +ant-protocol = "2.1.0" xor_name = "5" self_encryption = "0.35.0" futures = "0.3" @@ -56,7 +56,7 @@ sysinfo = { version = "0.32", default-features = false, features = ["system"] } # ant-node is optional. It is only linked for the `LocalDevnet` wrapper # that spawns a local in-process network for development and testing. # Enable with `--features devnet`. -ant-node = { git = "https://github.com/WithAutonomi/ant-node", rev = "8b68b2d7f4662faf67ed7812dc6cb37de0c74a8b", optional = true } +ant-node = { version = "0.11.3", optional = true } tracing-subscriber = { version = "0.3", features = ["env-filter"] } [target.'cfg(unix)'.dependencies] @@ -82,7 +82,7 @@ devnet = ["dep:ant-node"] # in-process to exercise the wire protocol end-to-end. ant-node is a # dev-dep here (separate from the optional runtime dep above) so tests # always compile even without the `devnet` feature. -ant-node = { git = "https://github.com/WithAutonomi/ant-node", rev = "8b68b2d7f4662faf67ed7812dc6cb37de0c74a8b" } +ant-node = "0.11.3" serial_test = "3" anyhow = "1" alloy = { version = "1.6", features = ["node-bindings"] } @@ -92,7 +92,7 @@ rmp-serde = "1" # which populates a cache via `add_peer_trusted` (bypasses Sybil rate limits) # and then verifies reload after save. Test-only — no runtime version-pin # concern. Tracks ant-node's transitive saorsa-core dep. -saorsa-core = { git = "https://github.com/saorsa-labs/saorsa-core", branch = "fix/stability-improvements" } +saorsa-core = "0.24.3" [[example]] name = "start-local-devnet"