diff --git a/Cargo.lock b/Cargo.lock index 9bff3cf6..f0ce36b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -27,6 +27,16 @@ dependencies = [ "generic-array", ] +[[package]] +name = "aead" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1973cfbc1a2daf9cf550e74e1f088c28e7f7d8c1e1418fb6c9dc5184b7e84c99" +dependencies = [ + "crypto-common 0.2.2", + "inout 0.2.5", +] + [[package]] name = "aes" version = "0.8.4" @@ -34,7 +44,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", - "cipher", + "cipher 0.4.4", "cpufeatures 0.2.17", ] @@ -44,9 +54,9 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ - "aead", + "aead 0.5.2", "aes", - "cipher", + "cipher 0.4.4", "ctr", "ghash", "subtle", @@ -837,7 +847,7 @@ dependencies = [ [[package]] name = "ant-node" -version = "0.23.1" +version = "0.24.0" dependencies = [ "alloy", "ant-protocol", @@ -895,8 +905,9 @@ dependencies = [ [[package]] name = "ant-protocol" -version = "5.0.1" -source = "git+https://github.com/WithAutonomi/ant-protocol?rev=0c6ae27b6261227a32e6fe0f976163c42bde960e#0c6ae27b6261227a32e6fe0f976163c42bde960e" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28e38869b71a547db27d565d6256c371ec410700d646e0eb7b683684cdaa93de" dependencies = [ "blake3", "bytes", @@ -1316,18 +1327,6 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" -[[package]] -name = "attohttpc" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e2cdb6d5ed835199484bb92bb8b3edd526effe995c61732580439c1a67e2e9" -dependencies = [ - "base64 0.22.1", - "http", - "log", - "url", -] - [[package]] name = "auto_impl" version = "1.3.0" @@ -1682,7 +1681,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" dependencies = [ - "cipher", + "cipher 0.4.4", ] [[package]] @@ -1703,8 +1702,8 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ae3c82e4355234767756212c570e29833699ab63e6ffd161887314cc5b43847" dependencies = [ - "aead", - "cipher", + "aead 0.5.2", + "cipher 0.4.4", "ctr", "subtle", ] @@ -1728,7 +1727,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", - "cipher", + "cipher 0.4.4", "cpufeatures 0.2.17", ] @@ -1739,6 +1738,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06" dependencies = [ "cfg-if", + "cipher 0.5.2", "cpufeatures 0.3.1", "rand_core 0.10.1", ] @@ -1749,13 +1749,25 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ - "aead", + "aead 0.5.2", "chacha20 0.9.1", - "cipher", - "poly1305", + "cipher 0.4.4", + "poly1305 0.8.0", "zeroize", ] +[[package]] +name = "chacha20poly1305" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b89e1c441e926b9c82a8d023f6e1b7ae0adcfaa7d621814e4d60789bac751cb" +dependencies = [ + "aead 0.6.1", + "chacha20 0.10.2", + "cipher 0.5.2", + "poly1305 0.9.1", +] + [[package]] name = "chrono" version = "0.4.45" @@ -1777,10 +1789,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common 0.1.7", - "inout", + "inout 0.1.4", "zeroize", ] +[[package]] +name = "cipher" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf2a2c93cd704877c0858356ed03480ff301ee950b43f1cbe4573b088bfa6c" +dependencies = [ + "block-buffer 0.12.1", + "crypto-common 0.2.2", + "inout 0.2.5", +] + [[package]] name = "clap" version = "4.6.6" @@ -1830,6 +1853,12 @@ dependencies = [ "cc", ] +[[package]] +name = "cmov" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a" + [[package]] name = "cobs" version = "0.3.0" @@ -2093,7 +2122,16 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cipher", + "cipher 0.4.4", +] + +[[package]] +name = "ctutils" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261af4dc7a06ea8a527a8717d8cbba3417530d6ea14e1edb3de6b67806be474f" +dependencies = [ + "cmov", ] [[package]] @@ -2339,6 +2377,15 @@ dependencies = [ "dirs-sys 0.5.0", ] +[[package]] +name = "dirs" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d57d423b3c82e89b9a24ca3091fee61f456a26edbd28d26c65906f4bc1dcd8f" +dependencies = [ + "dirs-sys 0.5.0", +] + [[package]] name = "dirs-sys" version = "0.4.1" @@ -2406,7 +2453,7 @@ dependencies = [ "byteorder", "cbc", "ccm", - "chacha20poly1305", + "chacha20poly1305 0.10.1", "der-parser 9.0.0", "hmac", "log", @@ -2981,9 +3028,9 @@ dependencies = [ [[package]] name = "granit-parser" -version = "1.3.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e20f99e46474f56bd905c56e817ebddcf377a611f94c53ac4649e4d3fa3c0cd0" +checksum = "05f05586d4d4df3d47123207826c40b252728b438a1a07bad3c01ee6bea401df" dependencies = [ "arraydeque", "smallvec", @@ -3411,11 +3458,10 @@ dependencies = [ [[package]] name = "igd-next" -version = "0.17.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de7238d487a9aff61f81b5ab41c0a841532a115a398b5fa92a2fadd0885e2581" +checksum = "c71312255fdc5364bff7eec0adf68146bc4e72aba85075261af40d234c11be99" dependencies = [ - "attohttpc", "bytes", "futures", "http", @@ -3424,8 +3470,10 @@ dependencies = [ "hyper-util", "log", "rand 0.10.2", + "thiserror 2.0.20", "tokio", "url", + "xml-rs", "xmltree", ] @@ -3488,6 +3536,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "inout" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b5cf4372d022092674a83b8febf5865f7a573cc0c5baec5e49c879b6a20978f" +dependencies = [ + "hybrid-array", +] + [[package]] name = "interceptor" version = "0.15.0" @@ -4450,7 +4507,17 @@ checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures 0.2.17", "opaque-debug", - "universal-hash", + "universal-hash 0.5.1", +] + +[[package]] +name = "poly1305" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2d0073b297041425c7c3df6eb4792d598a15323fe63346852b092eca02904c" +dependencies = [ + "cpufeatures 0.3.1", + "universal-hash 0.6.1", ] [[package]] @@ -4462,7 +4529,7 @@ dependencies = [ "cfg-if", "cpufeatures 0.2.17", "opaque-debug", - "universal-hash", + "universal-hash 0.5.1", ] [[package]] @@ -5277,15 +5344,16 @@ dependencies = [ [[package]] name = "saorsa-core" -version = "0.29.2" -source = "git+https://github.com/WithAutonomi/saorsa-core?rev=c3c4c81e63db7e3048f488f7cf0fec4cff3131d4#c3c4c81e63db7e3048f488f7cf0fec4cff3131d4" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25e3b19c7be5ab56d900ce4c0af1029f4009ef9142d4bb229e0370db0d31b131" dependencies = [ "anyhow", "async-trait", "blake3", "bytes", "dashmap", - "dirs", + "dirs 6.0.0", "futures", "hex", "libc", @@ -5313,12 +5381,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "211578bef9588f0f57162139f1c214bcc6207fb632e9368040d52e4e36471938" dependencies = [ - "aead", + "aead 0.5.2", "aes-gcm", "anyhow", "blake3", "bytes", - "chacha20poly1305", + "chacha20poly1305 0.10.1", "fips203", "fips204", "fips205", @@ -5345,21 +5413,20 @@ dependencies = [ [[package]] name = "saorsa-transport" -version = "0.38.2" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd334b3d02ba2d0bcac8a30d07c3e79004fc504a193813aaa7bf89c11f0f44d0" +checksum = "beeb14b4a6d7a652dc0433eec1db536901c12c9532f0aaa922b1dd7e0fb58841" dependencies = [ "anyhow", "async-trait", "aws-lc-rs", - "base64 0.22.1", + "base64 0.23.1", "blake3", "bytes", - "chacha20poly1305", + "chacha20poly1305 0.11.0", "chrono", - "clap", "dashmap", - "dirs", + "dirs 7.0.0", "enum_dispatch", "futures-util", "hex", @@ -5377,7 +5444,6 @@ dependencies = [ "rcgen 0.13.2", "rcgen 0.14.10", "regex", - "reqwest", "rustc-hash", "rustls", "rustls-native-certs", @@ -5391,7 +5457,7 @@ dependencies = [ "serde_json", "slab", "socket2 0.6.5", - "stun 0.7.0", + "stun 0.17.2", "thiserror 2.0.20", "time", "tinyvec", @@ -5560,7 +5626,7 @@ dependencies = [ "blake3", "brotli", "bytes", - "chacha20poly1305", + "chacha20poly1305 0.10.1", "hex", "rand 0.8.8", "rand_chacha 0.3.1", @@ -5608,9 +5674,9 @@ dependencies = [ [[package]] name = "serde-saphyr" -version = "1.3.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8050abb251097357e24aff63ba2c52a6309ecb7d23a5474023df960a02694d8" +checksum = "3f4dc2714fc5632417a6e979602d7044bad8f2880c63fc7217087180acec31b6" dependencies = [ "annotate-snippets", "encoding_rs_io", @@ -5947,28 +6013,28 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "stun" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea256fb46a13f9204e9dee9982997b2c3097db175a9fddaa8350310d03c4d5a3" +checksum = "1a512c5d501e3e3b5a4bb3e8e31462d56d54a66b95a28b8596e14422bf21c32b" dependencies = [ "base64 0.22.1", "crc", "lazy_static", "md-5", - "rand 0.8.8", + "rand 0.9.5", "ring", "subtle", "thiserror 1.0.69", "tokio", "url", - "webrtc-util 0.10.0", + "webrtc-util 0.12.0", ] [[package]] name = "stun" -version = "0.9.0" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a512c5d501e3e3b5a4bb3e8e31462d56d54a66b95a28b8596e14422bf21c32b" +checksum = "2e3b8d5ad1dd4c8cd0595440f26521a71dd593cb5873ee8e06b91510b7d97269" dependencies = [ "base64 0.22.1", "crc", @@ -5980,7 +6046,7 @@ dependencies = [ "thiserror 1.0.69", "tokio", "url", - "webrtc-util 0.12.0", + "webrtc-util 0.17.2", ] [[package]] @@ -6626,6 +6692,16 @@ dependencies = [ "subtle", ] +[[package]] +name = "universal-hash" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4987bdc12753382e0bec4a65c50738ffaabc998b9cdd1f952fb5f39b0048a96" +dependencies = [ + "crypto-common 0.2.2", + "ctutils", +] + [[package]] name = "untrusted" version = "0.9.0" @@ -6964,7 +7040,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66d8cdc33413f1d0192670a80ce93d17cb78d57fe3a2414be30d6f6dff121123" dependencies = [ - "aead", + "aead 0.5.2", "aes", "aes-gcm", "byteorder", @@ -6983,20 +7059,19 @@ dependencies = [ [[package]] name = "webrtc-util" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1438a8fd0d69c5775afb4a71470af92242dbd04059c61895163aa3c1ef933375" +checksum = "d1c0c7e0c8f280f2bbfae442701465777ac07adaf46ce0c5863cd58e13fe472a" dependencies = [ "async-trait", "bitflags 1.3.2", "bytes", "ipnet", "lazy_static", - "libc", "log", "nix 0.26.4", "portable-atomic", - "rand 0.8.8", + "rand 0.9.5", "thiserror 1.0.69", "tokio", "winapi", @@ -7004,9 +7079,9 @@ dependencies = [ [[package]] name = "webrtc-util" -version = "0.12.0" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c0c7e0c8f280f2bbfae442701465777ac07adaf46ce0c5863cd58e13fe472a" +checksum = "1beae0b4f24969741c26ca282a257dc5823bd9cbe608f7e3ca3775102d323ad9" dependencies = [ "async-trait", "bitflags 1.3.2", @@ -7054,7 +7129,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.48.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index bac2be3d..7192f204 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ant-node" -version = "0.23.1" +version = "0.24.0" edition = "2021" authors = ["David Irvine "] description = "Pure quantum-proof network node for the Autonomi decentralized network" @@ -35,10 +35,10 @@ mimalloc = "0.1" # node-only DHT internals (DHTNode, TrustEvent, DhtNetworkEvent), which # Cargo unifies with ant-protocol's version constraint. # -ant-protocol = "5.0.1" +ant-protocol = "6.0.0" # Core (provides EVERYTHING: networking, DHT, security, trust, storage) -saorsa-core = "0.29.2" +saorsa-core = "0.30.0" saorsa-pqc = "0.5.2" # Payment verification - autonomi network lookup + EVM payment @@ -113,7 +113,7 @@ bao = "0.13.1" # Shared portable browser profile. The native listener is enabled separately # by the `webrtc-direct` feature. -saorsa-transport = { version = "0.38.2", default-features = false, features = ["webrtc"] } +saorsa-transport = { version = "0.39.0", default-features = false, features = ["webrtc"] } # Only the test-utils devnet helper that seeds public files for browser tests # uses it, so release builds do not link it. self_encryption = { version = "0.36", optional = true } @@ -220,13 +220,6 @@ webrtc-direct = [ "saorsa-transport/webrtc-direct", ] -[patch.crates-io] -# ADR-0020 (V2-1358): saorsa-core's closer-peers encoding and -# ant-protocol's get-or-closer request, each rebased onto its main. Drop -# both once releases include them. -saorsa-core = { git = "https://github.com/WithAutonomi/saorsa-core", rev = "c3c4c81e63db7e3048f488f7cf0fec4cff3131d4" } -ant-protocol = { git = "https://github.com/WithAutonomi/ant-protocol", rev = "0c6ae27b6261227a32e6fe0f976163c42bde960e" } - [profile.release] lto = true codegen-units = 1 diff --git a/scripts/third_party_notices/config.toml b/scripts/third_party_notices/config.toml index 617ba3e5..d85737f5 100644 --- a/scripts/third_party_notices/config.toml +++ b/scripts/third_party_notices/config.toml @@ -108,7 +108,7 @@ text_sha256 = "b05785f9f18e6716bab63424b11454513b9943a222595b70411009202fc592b5" note = "its COPYING, reproduced with its copyright lines, refers to LICENSE-MIT and LICENSE-APACHE files that neither the crate nor its repository contain; the MIT text is reproduced from the SPDX licence list." [missing.granit-parser] -version = "1.3.0" +version = "2.1.0" text_url = "https://raw.githubusercontent.com/spdx/license-list-data/v3.29.0/text/MIT.txt" text_sha256 = "b05785f9f18e6716bab63424b11454513b9943a222595b70411009202fc592b5" note = "its root LICENSE, reproduced with its notices for Chen Yuheng, Ethiraric and Bourumir Wyngs, refers to licence texts the crate ships under a hidden .licenses directory, which is not searched for licence files; the MIT text is reproduced from the SPDX licence list."