diff --git a/.cargo-deny.toml b/.cargo-deny.toml index bbdcf102..dd428b9d 100644 --- a/.cargo-deny.toml +++ b/.cargo-deny.toml @@ -19,7 +19,7 @@ # this list would mean the nix crate, as well as any of its exclusive # dependencies not shared by any other crates, would be ignored, as the target # list here is effectively saying which targets you are building for. -targets = [ +#targets = [ # The triple can be any string, but only the target triples built in to # rustc (as of 1.40) can be checked against actual config expressions #{ triple = "x86_64-unknown-linux-musl" }, @@ -27,7 +27,7 @@ targets = [ # particular target. target_features are currently not validated against # the actual valid features supported by the target architecture. #{ triple = "wasm32-unknown-unknown", features = ["atomics"] }, -] +#] # When creating the dependency graph used as the source of truth when checks are # executed, this field can be used to prune crates from the graph, removing them # from the view of cargo-deny. This is an extremely heavy hammer, as if a crate @@ -39,7 +39,7 @@ targets = [ # If true, metadata will be collected with `--all-features`. Note that this can't # be toggled off if true, if you want to conditionally enable `--all-features` it # is recommended to pass `--all-features` on the cmd line instead -all-features = true +# all-features = true # If true, metadata will be collected with `--no-default-features`. The same # caveat with `all-features` applies # no-default-features = false @@ -51,7 +51,7 @@ all-features = true # This option is included since the graphs can be quite large and the addition # of features from the crate(s) to all of the graph roots can be far too verbose. # This option can be overridden via `--feature-depth` on the cmd line -feature-depth = 1 +# feature-depth = 1 # This section is considered when running `cargo deny check advisories` # More documentation for the advisories section can be found here: @@ -62,15 +62,15 @@ db-path = "~/.cargo/advisory-db" # The url(s) of the advisory databases to use db-urls = ["https://github.com/rustsec/advisory-db"] # The lint level for security vulnerabilities -vulnerability = "deny" +# vulnerability = "deny" # The lint level for unmaintained crates -unmaintained = "deny" +# unmaintained = "deny" # The lint level for crates that have been yanked from their source registry yanked = "warn" # The lint level for crates with security notices. Note that as of # 2019-12-17 there are no security notice advisories in # https://github.com/rustsec/advisory-db -notice = "warn" +# notice = "warn" # A list of advisory IDs to ignore. Note that ignored advisories will still # output a note when they are encountered. ignore = [ @@ -98,7 +98,7 @@ ignore = [ # https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html [licenses] # The lint level for crates which do not have a detectable license -unlicensed = "allow" +# unlicensed = "allow" # List of explicitly allowed licenses # See https://spdx.org/licenses/ for list of possible licenses # [possible values: any SPDX 3.11 short identifier (+ optional exception)]. @@ -106,27 +106,30 @@ allow = [ "MIT", "Apache-2.0", "Apache-2.0 WITH LLVM-exception", + "Zlib", + "BSD-3-Clause", + "ISC", + "Unicode-DFS-2016", + "LGPL-3.0" ] # List of explicitly disallowed licenses # See https://spdx.org/licenses/ for list of possible licenses # [possible values: any SPDX 3.11 short identifier (+ optional exception)]. -deny = [ - #"Nokia", -] +# deny = ["Nokia"] # Lint level for licenses considered copyleft -copyleft = "allow" +# copyleft = "allow" # Blanket approval or denial for OSI-approved or FSF Free/Libre licenses # * both - The license will be approved if it is both OSI-approved *AND* FSF # * either - The license will be approved if it is either OSI-approved *OR* FSF # * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF # * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved # * neither - This predicate is ignored and the default lint level is used -allow-osi-fsf-free = "either" +# allow-osi-fsf-free = "either" # Lint level used when no other predicates are matched # 1. License isn't in the allow or deny lists # 2. License isn't copyleft # 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither" -default = "deny" +# default = "deny" # The confidence threshold for detecting a license from license text. # The higher the value, the more closely the license text must be to the # canonical license text of a valid SPDX license file. @@ -147,7 +150,7 @@ exceptions = [ # The name of the crate the clarification applies to #name = "ring" # The optional version constraint for the crate -#version = "*" +version = 2 # The SPDX expression for the license requirements of the crate #expression = "MIT AND ISC AND OpenSSL" # One or more files in the crate's source used as the "source of truth" for diff --git a/.github/workflows/pr-verify.yml b/.github/workflows/pr-verify.yml index 048d3cd8..c38468f1 100644 --- a/.github/workflows/pr-verify.yml +++ b/.github/workflows/pr-verify.yml @@ -68,10 +68,11 @@ jobs: - name: Install Rust Toolchain uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af with: - toolchain: stable + toolchain: nightly-2024-03-01 default: true - profile: minimal + profile: default target: wasm32-unknown-unknown + override: true - name: Cargo fmt run: make format-check @@ -121,33 +122,33 @@ jobs: - name: Cargo build run: make build test_binary: - name: Generate bindgen and run c_example - runs-on: ubuntu-latest - needs: [verify, test, lint, build] - steps: - - name: Checkout code - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Install Rust Toolchain - uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af - with: - toolchain: stable - default: true - profile: minimal - target: wasm32-unknown-unknown - - name: Install libsodium - run: sudo apt-get install -y libsodium-dev - - name: Run tests for ffi - run: make test-ffi - - name: Upload artifacts dsnp_graph_sdk_ffi.h and libdsnp_graph_sdk_ffi.a - uses: actions/upload-artifact@v2 - with: - name: dsnp_graph_sdk_ffi - path: | - bridge/ffi/src/c_example/dsnp_graph_sdk_ffi.h - bridge/ffi/src/c_example/libdsnp_graph_sdk_ffi.a - bridge/ffi/src/c_example/main.c + name: Generate bindgen and run c_example + runs-on: ubuntu-latest + needs: [verify, test, lint, build] + steps: + - name: Checkout code + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Install Rust Toolchain + uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af + with: + toolchain: stable + default: true + profile: minimal + target: wasm32-unknown-unknown + - name: Install libsodium + run: sudo apt-get install -y libsodium-dev + - name: Run tests for ffi + run: make test-ffi + - name: Upload artifacts dsnp_graph_sdk_ffi.h and libdsnp_graph_sdk_ffi.a + uses: actions/upload-artifact@v2 + with: + name: dsnp_graph_sdk_ffi + path: | + bridge/ffi/src/c_example/dsnp_graph_sdk_ffi.h + bridge/ffi/src/c_example/libdsnp_graph_sdk_ffi.a + bridge/ffi/src/c_example/main.c generate-docs: name: Generate graph sdk rust docs runs-on: ubuntu-latest @@ -175,7 +176,7 @@ jobs: uses: actions/configure-pages@v3 - name: Build Docs run: | - RUSTDOCFLAGS="--enable-index-page -Zunstable-options" cargo doc --no-deps --all-features + RUSTC_BOOTSTRAP=1 RUSTDOCFLAGS="--enable-index-page -Zunstable-options" cargo doc --no-deps --all-features - name: Fix file permissions shell: sh run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 719e1735..aa31c5ff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,12 +32,20 @@ jobs: with: fetch-depth: 0 - - name: Install Rust Toolchain + - name: Install Rust Toolchain Stable uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af with: toolchain: stable default: true - profile: minimal + profile: default + target: wasm32-unknown-unknown + + - name: Install Rust Toolchain Nightly + uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af + with: + toolchain: nightly-2024-03-01 + default: false + profile: default target: wasm32-unknown-unknown - name: Cargo check @@ -259,7 +267,7 @@ jobs: uses: actions/configure-pages@v3 - name: Build Docs run: | - RUSTDOCFLAGS="--enable-index-page -Zunstable-options" cargo doc --no-deps --all-features + RUSTC_BOOTSTRAP=1 RUSTDOCFLAGS="--enable-index-page -Zunstable-options" cargo doc --no-deps --all-features - name: Fix file permissions shell: sh run: | diff --git a/.tool-versions b/.tool-versions index 331baf6a..89f74c67 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,6 +1,6 @@ -rust 1.71.1 +rust 1.76.0 make 4.3 cmake 3.24.1 -protoc 3.12.4 +protoc 3.21.12 # clang 14.0.6 # only plugin I could find for clang and not some subset of clang did not work, it was located here https://github.com/srivathsanmurali/asdf-clang.git java corretto-17.0.2.8.1 diff --git a/Cargo.lock b/Cargo.lock index a60d753d..1861d7da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -23,15 +23,33 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -41,28 +59,75 @@ dependencies = [ "libc", ] +[[package]] +name = "anstream" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + [[package]] name = "anyhow" -version = "1.0.69" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "apache-avro" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf4144857f9e4d7dd6cc4ba4c78efd2a46bad682b029bd0d91e76a021af1b2a" +checksum = "ceb7c683b2f8f40970b70e39ff8be514c95b96fcb9c4af87e1ed2cb2e10801a0" dependencies = [ - "byteorder", "crc32fast", - "digest 0.10.6", + "digest", "lazy_static", "libflate", "log", "num-bigint", "quad-rand", "rand", - "regex", + "regex-lite", "serde", "serde_json", "snap", @@ -71,18 +136,6 @@ dependencies = [ "thiserror", "typed-builder", "uuid", - "zerocopy", -] - -[[package]] -name = "async-trait" -version = "0.1.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.16", ] [[package]] @@ -93,36 +146,36 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object", "rustc-demangle", ] [[package]] name = "base64" -version = "0.13.1" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "block-buffer" @@ -135,27 +188,21 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "a0ba8f7aaa012f30d5b2861462f6708eccd49c3c39863fe083a308035f63d723" [[package]] name = "cesu8" @@ -171,9 +218,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chacha20" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fc89c7c5b9e7a02dfe45cd2367bae382f9ed31c61ca8debe5f827c420a2f08" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", "cipher", @@ -182,15 +229,15 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ + "android-tzdata", "iana-time-zone", - "num-integer", "num-traits", "serde", - "winapi", + "windows-targets 0.52.4", ] [[package]] @@ -205,14 +252,10 @@ dependencies = [ ] [[package]] -name = "codespan-reporting" -version = "0.11.1" +name = "colorchoice" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "combine" @@ -226,24 +269,33 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" +dependencies = [ + "memchr", +] [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] @@ -260,86 +312,46 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.26" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" dependencies = [ "quote", - "syn 1.0.109", -] - -[[package]] -name = "ctor" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1586fa608b1dab41f667475b4a41faec5ba680aee428bfa5de4ea520fdc6e901" -dependencies = [ - "quote", - "syn 2.0.16", + "syn 2.0.52", ] [[package]] name = "curve25519-dalek" -version = "3.2.0" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "fiat-crypto", + "platforms", + "rustc_version", "subtle", "zeroize", ] [[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.16", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" +name = "curve25519-dalek-derive" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.52", ] [[package]] name = "darling" -version = "0.20.1" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ "darling_core", "darling_macro", @@ -347,49 +359,56 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.1" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.16", + "syn 2.0.52", ] [[package]] name = "darling_macro" -version = "0.20.1" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.16", + "syn 2.0.52", ] [[package]] -name = "diff" -version = "0.1.13" +name = "dary_heap" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" +checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca" [[package]] -name = "digest" -version = "0.9.0" +name = "deranged" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ - "generic-array", + "powerfmt", + "serde", ] +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", @@ -397,9 +416,9 @@ dependencies = [ [[package]] name = "dryoc" -version = "0.4.3" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f8ddb41c5ccec0f9de5e7d72d56112d6651963d2f596ea9a1e09844db58ec3f" +checksum = "d446216f1822c429bbc9f96b4227248fc09a4213897439504a672a1b052d0804" dependencies = [ "bitflags", "chacha20", @@ -407,7 +426,7 @@ dependencies = [ "generic-array", "lazy_static", "libc", - "rand_core 0.6.4", + "rand_core", "salsa20", "sha2", "subtle", @@ -417,7 +436,7 @@ dependencies = [ [[package]] name = "dsnp-graph-config" -version = "1.0.0" +version = "1.0.2" dependencies = [ "anyhow", "apache-avro", @@ -427,19 +446,19 @@ dependencies = [ "pretty_assertions", "serde", "serde_json", - "serde_with 3.0.0", + "serde_with", "test-log", "thiserror", ] [[package]] name = "dsnp-graph-core" -version = "1.0.0" +version = "1.0.2" dependencies = [ "anyhow", "apache-avro", - "base64 0.21.0", - "ctor 0.2.2", + "base64 0.22.0", + "ctor", "dryoc", "dsnp-graph-config", "env_logger", @@ -447,14 +466,14 @@ dependencies = [ "lazy_static", "log", "log-result-proc-macro", - "miniz_oxide 0.7.1", + "miniz_oxide", "ntest", "pretty_assertions", "rand", "serde", "serde_bytes", "serde_json", - "serde_with 2.3.3", + "serde_with", "thiserror", "wasm-bindgen", "zeroize", @@ -462,7 +481,7 @@ dependencies = [ [[package]] name = "dsnp-graph-sdk-common" -version = "1.0.0" +version = "1.0.2" dependencies = [ "dsnp-graph-config", "dsnp-graph-core", @@ -472,7 +491,7 @@ dependencies = [ [[package]] name = "dsnp-graph-sdk-ffi" -version = "1.0.0" +version = "1.0.2" dependencies = [ "anyhow", "dsnp-graph-config", @@ -483,9 +502,8 @@ dependencies = [ [[package]] name = "dsnp-graph-sdk-jni" -version = "1.0.0" +version = "1.0.2" dependencies = [ - "async-trait", "cfg-if", "dsnp-graph-config", "dsnp-graph-core", @@ -498,7 +516,7 @@ dependencies = [ [[package]] name = "dsnp-graph-sdk-node" -version = "1.0.0" +version = "1.0.2" dependencies = [ "dsnp-graph-config", "dsnp-graph-core", @@ -509,38 +527,39 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.10.0" +name = "env_filter" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" dependencies = [ - "humantime", - "is-terminal", "log", "regex", - "termcolor", ] [[package]] -name = "errno" -version = "0.3.1" +name = "env_logger" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6c012a26a7f605efc424dd53697843a72be7dc86ad2d01f7814337794a12231d" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "fiat-crypto" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" [[package]] name = "fnv" @@ -550,9 +569,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -560,31 +579,20 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "gimli" -version = "0.27.2" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "hashbrown" @@ -593,16 +601,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] -name = "heck" -version = "0.4.1" +name = "hashbrown" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash", +] [[package]] -name = "hermit-abi" -version = "0.3.2" +name = "hashbrown" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hex" @@ -618,26 +635,25 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -653,47 +669,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] [[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" +name = "indexmap" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", + "equivalent", + "hashbrown 0.14.3", + "serde", ] [[package]] -name = "is-terminal" -version = "0.4.7" +name = "inout" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ - "hermit-abi", - "io-lifetimes", - "rustix", - "windows-sys 0.48.0", + "generic-array", ] [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jni" @@ -719,9 +723,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -734,63 +738,49 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.140" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libflate" -version = "1.3.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97822bf791bd4d5b403713886a5fbe8bf49520fe78e323b0dc480ca1a03e50b0" +checksum = "9f7d5654ae1795afc7ff76f4365c2c8791b0feb18e8996a96adad8ffd7c3b2bf" dependencies = [ "adler32", + "core2", "crc32fast", + "dary_heap", "libflate_lz77", ] [[package]] name = "libflate_lz77" -version = "1.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf" +checksum = "be5f52fb8c451576ec6b79d3f4deb327398bc05bbdbd99021a6e77a4c855d524" dependencies = [ + "core2", + "hashbrown 0.13.2", "rle-decode-fast", ] [[package]] name = "libloading" -version = "0.6.7" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" +checksum = "2caa5afb8bf9f3a2652760ce7d4f62d21c4d5a423e68466fca30df82f2330164" dependencies = [ "cfg-if", - "winapi", + "windows-targets 0.52.4", ] -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "log" -version = "0.4.17" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "log-panics" @@ -804,101 +794,69 @@ dependencies = [ [[package]] name = "log-result-proc-macro" -version = "1.0.0" +version = "1.0.2" dependencies = [ "log", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.52", ] [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "neon" -version = "0.10.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28e15415261d880aed48122e917a45e87bb82cf0260bb6db48bbab44b7464373" +checksum = "7d75440242411c87dc39847b0e33e961ec1f10326a9d8ecf9c1ea64a3b3c13dc" dependencies = [ - "neon-build", + "libloading", "neon-macros", - "neon-runtime", + "once_cell", "semver", + "send_wrapper", "smallvec", ] -[[package]] -name = "neon-build" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bac98a702e71804af3dacfde41edde4a16076a7bbe889ae61e56e18c5b1c811" - [[package]] name = "neon-macros" -version = "0.10.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7288eac8b54af7913c60e0eb0e2a7683020dffa342ab3fd15e28f035ba897cf" +checksum = "c6813fde79b646e47e7ad75f480aa80ef76a5d9599e2717407961531169ee38b" dependencies = [ "quote", - "syn 1.0.109", + "syn 2.0.52", "syn-mid", ] -[[package]] -name = "neon-runtime" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4676720fa8bb32c64c3d9f49c47a47289239ec46b4bdb66d0913cc512cb0daca" -dependencies = [ - "cfg-if", - "libloading", - "smallvec", -] - [[package]] name = "ntest" -version = "0.7.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c544e496c816f0a59645c0bb69097e453df203954ae2ed4b3ac4251fad69d44" +checksum = "da8ec6d2b73d45307e926f5af46809768581044384637af6b3f3fe7c3c88f512" dependencies = [ - "ntest_proc_macro_helper", "ntest_test_cases", "ntest_timeout", ] -[[package]] -name = "ntest_proc_macro_helper" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f52e34b414605b77efc95c3f0ecef01df0c324bcc7f68d9a9cb7a7552777e52" - [[package]] name = "ntest_test_cases" -version = "0.7.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99a81eb400abc87063f829560bc5c5c835177703b83d1cd991960db0b2a00abe" +checksum = "be7d33be719c6f4d09e64e27c1ef4e73485dc4cc1f4d22201f89860a7fe22e22" dependencies = [ "proc-macro2", "quote", @@ -907,11 +865,10 @@ dependencies = [ [[package]] name = "ntest_timeout" -version = "0.7.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10db009e117aca57cbfb70ac332348f9a89d09ff7204497c283c0f7a0c96323" +checksum = "066b468120587a402f0b47d8f80035c921f6a46f8209efd0632a89a16f5188a4" dependencies = [ - "ntest_proc_macro_helper", "proc-macro-crate", "proc-macro2", "quote", @@ -920,57 +877,65 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] [[package]] name = "object" -version = "0.30.3" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] -name = "output_vt100" -version = "0.1.3" +name = "platforms" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" @@ -980,13 +945,11 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor 0.1.26", "diff", - "output_vt100", "yansi", ] @@ -1002,18 +965,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.57" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ec6d5fe0b140acb27c9a0444118cf55bfbb4e0b259739429abb4521dd67c16" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "protobuf" -version = "3.2.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55bad9126f378a853655831eb7363b7b01b81d19f8cb1218861086ca4a1a61e" +checksum = "58678a64de2fced2bdec6bca052a6716a0efe692d6e3f53d1bda6a1def64cfc0" dependencies = [ "bytes", "once_cell", @@ -1023,9 +986,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.2.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d4d7b8601c814cfb36bcebb79f0e61e45e1e93640cf778837833bbed05c372" +checksum = "e1ed294a835b0f30810e13616b1cd34943c6d1e84a8f3b0dcfe466d256c3e7e7" dependencies = [ "thiserror", ] @@ -1038,9 +1001,9 @@ checksum = "658fa1faf7a4cc5f057c9ee5ef560f717ad9d8dc66d975267f709624d6e1ab88" [[package]] name = "quote" -version = "1.0.26" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -1053,7 +1016,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -1063,43 +1026,52 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", + "rand_core", ] [[package]] name = "rand_core" -version = "0.5.1" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.1.16", + "getrandom", ] [[package]] -name = "rand_core" -version = "0.6.4" +name = "regex" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ - "getrandom 0.2.8", + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] -name = "regex" -version = "1.7.1" +name = "regex-automata" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", "regex-syntax", ] +[[package]] +name = "regex-lite" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" + [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rle-decode-fast" @@ -1114,30 +1086,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] -name = "rustix" -version = "0.37.7" +name = "rustc_version" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.45.0", + "semver", ] [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "salsa20" @@ -1157,61 +1124,52 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - [[package]] name = "semver" -version = "0.9.0" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] -name = "semver-parser" -version = "0.7.0" +name = "send_wrapper" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.163" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.9" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.52", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -1220,82 +1178,56 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.3.3" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +checksum = "15d167997bd841ec232f5b2b8e0e26606df2e7caa4c31b95ea9ca52b200bd270" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", "chrono", "hex", - "indexmap", - "serde", - "serde_json", - "serde_with_macros 2.3.3", - "time", -] - -[[package]] -name = "serde_with" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02d8aa6e3c385bf084924f660ce2a3a6bd333ba55b35e8590b321f35d88513" -dependencies = [ - "base64 0.21.0", - "chrono", - "hex", - "indexmap", + "indexmap 1.9.3", + "indexmap 2.2.5", "serde", + "serde_derive", "serde_json", - "serde_with_macros 3.0.0", + "serde_with_macros", "time", ] [[package]] name = "serde_with_macros" -version = "2.3.3" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +checksum = "865f9743393e638991566a8b7a479043c2c8da94a33e0a31f18214c9cae0a64d" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.16", -] - -[[package]] -name = "serde_with_macros" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.16", + "syn 2.0.52", ] [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "snap" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "strsim" @@ -1305,28 +1237,28 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" [[package]] name = "strum_macros" -version = "0.24.3" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 1.0.109", + "syn 2.0.52", ] [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -1341,9 +1273,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.16" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -1352,74 +1284,66 @@ dependencies = [ [[package]] name = "syn-mid" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baa8e7560a164edb1621a55d18a0c59abf49d360f47aa7b821061dd7eea7fac9" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "synstructure" -version = "0.12.6" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "b5dc35bb08dd1ca3dfb09dce91fd2d13294d6711c88897d9a9d60acf39bce049" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", - "unicode-xid", + "syn 2.0.52", ] [[package]] -name = "termcolor" -version = "1.2.0" +name = "test-log" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "7b319995299c65d522680decf80f2c108d85b861d81dfe340a10d16cee29d9e6" dependencies = [ - "winapi-util", + "env_logger", + "test-log-macros", ] [[package]] -name = "test-log" -version = "0.2.11" +name = "test-log-macros" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f0c854faeb68a048f0f2dc410c5ddae3bf83854ef0e4977d58306a5edef50e" +checksum = "c8f546451eaa38373f549093fe9fd05e7d2bade739e2ddf834b9968621d60107" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.52", ] [[package]] name = "thiserror" -version = "1.0.39" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.39" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.52", ] [[package]] name = "time" -version = "0.3.20" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ + "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -1427,76 +1351,80 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap", + "indexmap 2.2.5", "toml_datetime", "winnow", ] [[package]] name = "typed-builder" -version = "0.10.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" +checksum = "34085c17941e36627a879208083e25d357243812c30e7d7387c3b954f30ade16" +dependencies = [ + "typed-builder-macro", +] + +[[package]] +name = "typed-builder-macro" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.52", ] [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "unicode-width" -version = "0.1.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] -name = "unicode-xid" -version = "0.2.4" +name = "utf8parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ "serde", ] @@ -1509,20 +1437,14 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -1531,9 +1453,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1541,24 +1463,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.52", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1566,22 +1488,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "winapi" @@ -1601,9 +1523,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -1615,12 +1537,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.52.4", ] [[package]] @@ -1634,11 +1556,11 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.52.4", ] [[package]] @@ -1658,17 +1580,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -1679,9 +1601,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -1691,9 +1613,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -1703,9 +1625,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -1715,9 +1637,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -1727,9 +1649,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -1739,9 +1661,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -1751,15 +1673,15 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.4.1" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] @@ -1772,42 +1694,40 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.6.1" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f188cc1bcf1fe1064b8c58d150f497e697f49774aa846f2dc949d9a25f236" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ - "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.3.2" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6505e6815af7de1746a08f69c69606bb45695a17149517680f3b2149713b19a3" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.52", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.3.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", - "synstructure", + "syn 2.0.52", ] diff --git a/Makefile b/Makefile index 0247e0ed..11ccf9b1 100644 --- a/Makefile +++ b/Makefile @@ -35,10 +35,10 @@ deny: .PHONY: format format: @echo "Running Cargo fmt..." - @cargo fmt --all + @cargo +nightly-2024-03-01 fmt --all format-check: @echo "Running Cargo fmt..." - @cargo fmt --all -- --check + @cargo +nightly-2024-03-01 fmt --all -- --check .PHONY: build build: @@ -61,7 +61,7 @@ build-node-download: .PHONY: doc doc: @echo "Running Cargo doc..." - @RUSTDOCFLAGS="--enable-index-page --check -Zunstable-options" cargo doc --no-deps --all-features + @RUSTC_BOOTSTRAP=1 RUSTDOCFLAGS="--enable-index-page --check -Zunstable-options" cargo doc --no-deps --all-features .PHONY: clean clean: @@ -85,7 +85,10 @@ $(CBINDGEN): .PHONY: bindgen bindgen: $(CBINDGEN) @echo "Running bindgen..." +# cbindgen is only supported in nightly + @rustup override set nightly @( cd ./bridge/ffi && $(CBINDGEN) --config cbindgen.toml --crate dsnp-graph-sdk-ffi --output ./src/c_example/dsnp_graph_sdk_ffi.h ) + @( cd ../.. && rustup override set stable ) .PHONY: clean-ffi-bridge clean-ffi-bridge: diff --git a/bridge/common/Cargo.toml b/bridge/common/Cargo.toml index 502b49e1..29db78ee 100644 --- a/bridge/common/Cargo.toml +++ b/bridge/common/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "dsnp-graph-sdk-common" -version = "1.0.0" +version = "1.0.2" edition = "2021" license = "Apache-2.0" publish = false [dependencies] -dsnp-graph-core = { version = "1.0.0", path = "../../core" } -dsnp-graph-config = { version = "1.0.0", path = "../../config" } -libc = "0.2.0" -protobuf = { version = "3.2.0", features = ["with-bytes"] } +dsnp-graph-core = { version = "1.0.2", path = "../../core" } +dsnp-graph-config = { version = "1.0.2", path = "../../config" } +libc = "0.2.153" +protobuf = { version = "3.4.0", features = ["with-bytes"] } diff --git a/bridge/common/src/proto_types/input.rs b/bridge/common/src/proto_types/input.rs index 2bd9407c..f7b87529 100644 --- a/bridge/common/src/proto_types/input.rs +++ b/bridge/common/src/proto_types/input.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 3.2.0. Do not edit +// This file is generated by rust-protobuf 3.4.0. Do not edit // .proto file is parsed by protoc --rust-out=... // @generated @@ -23,10 +23,10 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_2_0; +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_4_0; -#[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:KeyData) +#[derive(PartialEq,Clone,Default,Debug)] pub struct KeyData { // message fields // @@protoc_insertion_point(field:KeyData.index) @@ -165,8 +165,8 @@ impl ::protobuf::reflect::ProtobufValue for KeyData { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } -#[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:PageData) +#[derive(PartialEq,Clone,Default,Debug)] pub struct PageData { // message fields // @@protoc_insertion_point(field:PageData.page_id) @@ -323,8 +323,8 @@ impl ::protobuf::reflect::ProtobufValue for PageData { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } -#[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:DsnpKeys) +#[derive(PartialEq,Clone,Default,Debug)] pub struct DsnpKeys { // message fields // @@protoc_insertion_point(field:DsnpKeys.dsnp_user_id) @@ -482,8 +482,8 @@ impl ::protobuf::reflect::ProtobufValue for DsnpKeys { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } -#[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:ImportBundles) +#[derive(PartialEq,Clone,Default,Debug)] pub struct ImportBundles { // message fields // @@protoc_insertion_point(field:ImportBundles.bundles) @@ -607,8 +607,8 @@ impl ::protobuf::reflect::ProtobufValue for ImportBundles { /// Nested message and enums of message `ImportBundles` pub mod import_bundles { - #[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:ImportBundles.ImportBundle) + #[derive(PartialEq,Clone,Default,Debug)] pub struct ImportBundle { // message fields // @@protoc_insertion_point(field:ImportBundles.ImportBundle.dsnp_user_id) @@ -806,8 +806,8 @@ pub mod import_bundles { /// Nested message and enums of message `ImportBundle` pub mod import_bundle { - #[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:ImportBundles.ImportBundle.GraphKeyPair) + #[derive(PartialEq,Clone,Default,Debug)] pub struct GraphKeyPair { // message fields // @@protoc_insertion_point(field:ImportBundles.ImportBundle.GraphKeyPair.key_type) @@ -967,8 +967,8 @@ pub mod import_bundles { } /// Action related types -#[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:Connection) +#[derive(PartialEq,Clone,Default,Debug)] pub struct Connection { // message fields // @@protoc_insertion_point(field:Connection.dsnp_user_id) @@ -1107,8 +1107,8 @@ impl ::protobuf::reflect::ProtobufValue for Connection { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } -#[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:Actions) +#[derive(PartialEq,Clone,Default,Debug)] pub struct Actions { // message fields // @@protoc_insertion_point(field:Actions.actions) @@ -1251,8 +1251,8 @@ impl ::protobuf::reflect::ProtobufValue for Actions { /// Nested message and enums of message `Actions` pub mod actions { - #[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:Actions.ActionOptions) + #[derive(PartialEq,Clone,Default,Debug)] pub struct ActionOptions { // message fields // @@protoc_insertion_point(field:Actions.ActionOptions.ignore_existing_connections) @@ -1391,8 +1391,8 @@ pub mod actions { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } - #[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:Actions.Action) + #[derive(PartialEq,Clone,Default,Debug)] pub struct Action { // message oneof groups pub inner: ::std::option::Option, @@ -1737,8 +1737,8 @@ pub mod actions { ::protobuf::reflect::GeneratedOneofDescriptorData::new::("inner") } } - #[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:Actions.Action.ConnectAction) + #[derive(PartialEq,Clone,Default,Debug)] pub struct ConnectAction { // message fields // @@protoc_insertion_point(field:Actions.Action.ConnectAction.owner_dsnp_user_id) @@ -1897,8 +1897,8 @@ pub mod actions { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } - #[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:Actions.Action.DisconnectAction) + #[derive(PartialEq,Clone,Default,Debug)] pub struct DisconnectAction { // message fields // @@protoc_insertion_point(field:Actions.Action.DisconnectAction.owner_dsnp_user_id) @@ -2038,8 +2038,8 @@ pub mod actions { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } - #[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:Actions.Action.AddGraphKey) + #[derive(PartialEq,Clone,Default,Debug)] pub struct AddGraphKey { // message fields // @@protoc_insertion_point(field:Actions.Action.AddGraphKey.owner_dsnp_user_id) @@ -2201,6 +2201,13 @@ impl ::protobuf::Enum for GraphKeyType { } } + fn from_str(str: &str) -> ::std::option::Option { + match str { + "X25519" => ::std::option::Option::Some(GraphKeyType::X25519), + _ => ::std::option::Option::None + } + } + const VALUES: &'static [GraphKeyType] = &[ GraphKeyType::X25519, ]; diff --git a/bridge/common/src/proto_types/output.rs b/bridge/common/src/proto_types/output.rs index 7f076a68..a8505b35 100644 --- a/bridge/common/src/proto_types/output.rs +++ b/bridge/common/src/proto_types/output.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 3.2.0. Do not edit +// This file is generated by rust-protobuf 3.4.0. Do not edit // .proto file is parsed by protoc --rust-out=... // @generated @@ -23,10 +23,10 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_2_0; +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_4_0; -#[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:SchemaConfig) +#[derive(PartialEq,Clone,Default,Debug)] pub struct SchemaConfig { // message fields // @@protoc_insertion_point(field:SchemaConfig.dsnp_version) @@ -165,8 +165,8 @@ impl ::protobuf::reflect::ProtobufValue for SchemaConfig { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } -#[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:Config) +#[derive(PartialEq,Clone,Default,Debug)] pub struct Config { // message fields // @@protoc_insertion_point(field:Config.sdk_max_stale_friendship_days) @@ -412,8 +412,8 @@ impl ::protobuf::reflect::ProtobufValue for Config { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } -#[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:Environment) +#[derive(PartialEq,Clone,Default,Debug)] pub struct Environment { // message fields // @@protoc_insertion_point(field:Environment.environment_type) @@ -553,8 +553,8 @@ impl ::protobuf::reflect::ProtobufValue for Environment { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } -#[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:Updates) +#[derive(PartialEq,Clone,Default,Debug)] pub struct Updates { // message fields // @@protoc_insertion_point(field:Updates.update) @@ -678,8 +678,8 @@ impl ::protobuf::reflect::ProtobufValue for Updates { /// Nested message and enums of message `Updates` pub mod updates { - #[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:Updates.Update) + #[derive(PartialEq,Clone,Default,Debug)] pub struct Update { // message oneof groups pub inner: ::std::option::Option, @@ -1024,8 +1024,8 @@ pub mod updates { ::protobuf::reflect::GeneratedOneofDescriptorData::new::("inner") } } - #[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:Updates.Update.PersistPageUpdate) + #[derive(PartialEq,Clone,Default,Debug)] pub struct PersistPageUpdate { // message fields // @@protoc_insertion_point(field:Updates.Update.PersistPageUpdate.owner_dsnp_user_id) @@ -1218,8 +1218,8 @@ pub mod updates { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } - #[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:Updates.Update.DeletePageUpdate) + #[derive(PartialEq,Clone,Default,Debug)] pub struct DeletePageUpdate { // message fields // @@protoc_insertion_point(field:Updates.Update.DeletePageUpdate.owner_dsnp_user_id) @@ -1394,8 +1394,8 @@ pub mod updates { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } - #[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:Updates.Update.AddKeyUpdate) + #[derive(PartialEq,Clone,Default,Debug)] pub struct AddKeyUpdate { // message fields // @@protoc_insertion_point(field:Updates.Update.AddKeyUpdate.owner_dsnp_user_id) @@ -1554,8 +1554,8 @@ pub mod updates { } } -#[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:DsnpGraphEdges) +#[derive(PartialEq,Clone,Default,Debug)] pub struct DsnpGraphEdges { // message fields // @@protoc_insertion_point(field:DsnpGraphEdges.edge) @@ -1679,8 +1679,8 @@ impl ::protobuf::reflect::ProtobufValue for DsnpGraphEdges { /// Nested message and enums of message `DsnpGraphEdges` pub mod dsnp_graph_edges { - #[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:DsnpGraphEdges.DsnpGraphEdge) + #[derive(PartialEq,Clone,Default,Debug)] pub struct DsnpGraphEdge { // message fields // @@protoc_insertion_point(field:DsnpGraphEdges.DsnpGraphEdge.user_id) @@ -1820,8 +1820,8 @@ pub mod dsnp_graph_edges { } } -#[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:DsnpUsers) +#[derive(PartialEq,Clone,Default,Debug)] pub struct DsnpUsers { // message fields // @@protoc_insertion_point(field:DsnpUsers.user) @@ -1945,8 +1945,8 @@ impl ::protobuf::reflect::ProtobufValue for DsnpUsers { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } -#[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:DsnpPublicKeys) +#[derive(PartialEq,Clone,Default,Debug)] pub struct DsnpPublicKeys { // message fields // @@protoc_insertion_point(field:DsnpPublicKeys.public_key) @@ -2070,8 +2070,8 @@ impl ::protobuf::reflect::ProtobufValue for DsnpPublicKeys { /// Nested message and enums of message `DsnpPublicKeys` pub mod dsnp_public_keys { - #[derive(PartialEq,Clone,Default,Debug)] // @@protoc_insertion_point(message:DsnpPublicKeys.DsnpPublicKey) + #[derive(PartialEq,Clone,Default,Debug)] pub struct DsnpPublicKey { // message fields // @@protoc_insertion_point(field:DsnpPublicKeys.DsnpPublicKey.key) @@ -2235,6 +2235,14 @@ impl ::protobuf::Enum for PrivacyType { } } + fn from_str(str: &str) -> ::std::option::Option { + match str { + "Public" => ::std::option::Option::Some(PrivacyType::Public), + "Private" => ::std::option::Option::Some(PrivacyType::Private), + _ => ::std::option::Option::None + } + } + const VALUES: &'static [PrivacyType] = &[ PrivacyType::Public, PrivacyType::Private, @@ -2295,6 +2303,16 @@ impl ::protobuf::Enum for ConnectionType { } } + fn from_str(str: &str) -> ::std::option::Option { + match str { + "FollowPublic" => ::std::option::Option::Some(ConnectionType::FollowPublic), + "FollowPrivate" => ::std::option::Option::Some(ConnectionType::FollowPrivate), + "FriendshipPublic" => ::std::option::Option::Some(ConnectionType::FriendshipPublic), + "FriendshipPrivate" => ::std::option::Option::Some(ConnectionType::FriendshipPrivate), + _ => ::std::option::Option::None + } + } + const VALUES: &'static [ConnectionType] = &[ ConnectionType::FollowPublic, ConnectionType::FollowPrivate, @@ -2348,6 +2366,13 @@ impl ::protobuf::Enum for DsnpVersion { } } + fn from_str(str: &str) -> ::std::option::Option { + match str { + "Version1_0" => ::std::option::Option::Some(DsnpVersion::Version1_0), + _ => ::std::option::Option::None + } + } + const VALUES: &'static [DsnpVersion] = &[ DsnpVersion::Version1_0, ]; @@ -2404,6 +2429,15 @@ impl ::protobuf::Enum for EnvironmentType { } } + fn from_str(str: &str) -> ::std::option::Option { + match str { + "MainNet" => ::std::option::Option::Some(EnvironmentType::MainNet), + "Rococo" => ::std::option::Option::Some(EnvironmentType::Rococo), + "Dev" => ::std::option::Option::Some(EnvironmentType::Dev), + _ => ::std::option::Option::None + } + } + const VALUES: &'static [EnvironmentType] = &[ EnvironmentType::MainNet, EnvironmentType::Rococo, diff --git a/bridge/ffi/Cargo.toml b/bridge/ffi/Cargo.toml index 57d942e6..a3d118c7 100644 --- a/bridge/ffi/Cargo.toml +++ b/bridge/ffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dsnp-graph-sdk-ffi" -version = "1.0.0" +version = "1.0.2" edition = "2021" license = "Apache-2.0" publish = false @@ -10,9 +10,9 @@ name = "dsnp_graph_sdk_ffi" crate-type = ["staticlib"] [dependencies] -dsnp-graph-core = { version = "1.0.0", path = "../../core" } -dsnp-graph-config = { version = "1.0.0", path = "../../config" } -libc = "0.2.0" +dsnp-graph-core = { version = "1.0.2", path = "../../core" } +dsnp-graph-config = { version = "1.0.2", path = "../../config" } +libc = "0.2.153" lazy_static = "1.4.0" -anyhow = "1.0.40" +anyhow = "1.0.80" diff --git a/bridge/ffi/src/c_example/main.cpp b/bridge/ffi/src/c_example/main.cpp index a3df7676..e5cfd515 100644 --- a/bridge/ffi/src/c_example/main.cpp +++ b/bridge/ffi/src/c_example/main.cpp @@ -2,6 +2,7 @@ #include #include #include +#include extern "C" { #include "dsnp_graph_sdk_ffi.h" } @@ -41,6 +42,7 @@ int test_initialize_and_clear_states() { ImportBundle importbundle; // Set the values of the importbundle struct // ... + memset(&importbundle, 0, sizeof(importbundle)); // Initialize all fields to 0/NULL DsnpGraphBooleanResult_Error importresult = graph_import_users_data(graphstate, &importbundle, 1); ASSERT(importresult.error != NULL, "Expected error to import users data"); diff --git a/bridge/ffi/src/c_example/main.dSYM/Contents/Info.plist b/bridge/ffi/src/c_example/main.dSYM/Contents/Info.plist deleted file mode 100644 index fe7fecda..00000000 --- a/bridge/ffi/src/c_example/main.dSYM/Contents/Info.plist +++ /dev/null @@ -1,20 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleIdentifier - com.apple.xcode.dsym.main - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - dSYM - CFBundleSignature - ???? - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - - diff --git a/bridge/ffi/src/c_example/main.dSYM/Contents/Resources/DWARF/main b/bridge/ffi/src/c_example/main.dSYM/Contents/Resources/DWARF/main deleted file mode 100644 index 69ea35b6..00000000 Binary files a/bridge/ffi/src/c_example/main.dSYM/Contents/Resources/DWARF/main and /dev/null differ diff --git a/bridge/jni/Cargo.toml b/bridge/jni/Cargo.toml index 71f802de..4db06e0e 100644 --- a/bridge/jni/Cargo.toml +++ b/bridge/jni/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dsnp-graph-sdk-jni" -version = "1.0.0" +version = "1.0.2" edition = "2021" license = "Apache-2.0" publish = false @@ -10,12 +10,11 @@ name = "dsnp_graph_sdk_jni" crate-type = ["cdylib"] [dependencies] -dsnp-graph-core = { version = "1.0.0", path = "../../core" } -dsnp-graph-config = { version = "1.0.0", path = "../../config" } -dsnp-graph-sdk-common = { version = "1.0.0", path = "../common" } +dsnp-graph-core = { version = "1.0.2", path = "../../core" } +dsnp-graph-config = { version = "1.0.2", path = "../../config" } +dsnp-graph-sdk-common = { version = "1.0.2", path = "../common" } jni = "0.21.1" -async-trait = "0.1.68" cfg-if = "1.0.0" -log = { version = "^0.4.17", features = ["std", "max_level_debug", "release_max_level_debug"] } +log = { version = "^0.4.21", features = ["std", "max_level_debug", "release_max_level_debug"] } log-panics = { version = "^2.1.0", features = ["with-backtrace"]} -protobuf = { version = "3.2.0", features = ["with-bytes"] } +protobuf = { version = "3.4.0", features = ["with-bytes"] } diff --git a/bridge/jni/src/logger.rs b/bridge/jni/src/logger.rs index a3f2330b..367586dd 100644 --- a/bridge/jni/src/logger.rs +++ b/bridge/jni/src/logger.rs @@ -3,7 +3,6 @@ use jni::{ sys::jint, JNIEnv, JavaVM, }; -use log; use std::{ panic::{catch_unwind, AssertUnwindSafe}, process::abort, diff --git a/bridge/node/Cargo.toml b/bridge/node/Cargo.toml index ac2be068..f458d747 100644 --- a/bridge/node/Cargo.toml +++ b/bridge/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dsnp-graph-sdk-node" -version = "1.0.0" +version = "1.0.2" edition = "2021" license = "Apache-2.0" publish = false @@ -11,9 +11,9 @@ name = "dsnp_graph_sdk_node" crate-type = ["cdylib"] [dependencies] -dsnp-graph-core = { version = "1.0.0", path = "../../core" } -dsnp-graph-config = { version = "1.0.0", path = "../../config" } -neon = { version = "0.10.1", default-features = false, features = ["napi-6"] } -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0.96" -once_cell = "1.18.0" +dsnp-graph-core = { version = "1.0.2", path = "../../core" } +dsnp-graph-config = { version = "1.0.2", path = "../../config" } +neon = { version = "1.0.0", default-features = false, features = ["napi-6"] } +serde = { version = "1.0.197", features = ["derive"] } +serde_json = "1.0.114" +once_cell = "1.19.0" diff --git a/config/Cargo.toml b/config/Cargo.toml index 149bd360..6817e6c4 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -5,7 +5,7 @@ homepage = "https://spec.dsnp.org" license = "Apache-2.0" publish = false repository = "https://github.com/libertyDSNP/graph-sdk/" -version = "1.0.0" +version = "1.0.2" [lib] name = "dsnp_graph_config" @@ -13,19 +13,19 @@ path = "src/lib.rs" doctest = false [dependencies] -anyhow = "1.0.40" -apache-avro = { version = "0.14.0", features = ["snappy"] } +anyhow = "1.0.80" +apache-avro = { version = "0.16.0", features = ["snappy"] } lazy_static = "1.4.0" -log = { version = "^0.4.17", features = ["std", "max_level_debug", "release_max_level_debug"] } -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0.96" -serde_with = "3.0.0" -thiserror = "1.0.24" +log = { version = "^0.4.21", features = ["std", "max_level_debug", "release_max_level_debug"] } +serde = { version = "1.0.197", features = ["derive"] } +serde_json = "1.0.114" +serde_with = "3.6.1" +thiserror = "1.0.57" [dev-dependencies] -pretty_assertions = "1.3.0" -test-log = "^0.2.11" -env_logger = "^0.10.0" +pretty_assertions = "1.4.0" +test-log = "^0.2.15" +env_logger = "^0.11.2" [features] calculate-page-capacity = [] diff --git a/core/Cargo.toml b/core/Cargo.toml index f88c7458..ba9b55b6 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -5,7 +5,7 @@ homepage = "https://spec.dsnp.org" license = "Apache-2.0" publish = false repository = "https://github.com/libertyDSNP/graph-sdk/" -version = "1.0.0" +version = "1.0.2" [lib] name = "dsnp_graph_core" @@ -14,30 +14,30 @@ doctest = false [dependencies] anyhow = "1.0.69" -apache-avro = { version = "0.14.0", features = ["snappy"] } -dryoc = "0.4.3" -dsnp-graph-config = { version = "1.0.0", path = "../config" } +apache-avro = { version = "0.16.0", features = ["snappy"] } +dryoc = "0.5.3" +dsnp-graph-config = { version = "1.0.2", path = "../config" } lazy_static = "1.4.0" -log = { version = "^0.4.17", features = ["std", "max_level_debug", "release_max_level_debug"] } +log = { version = "^0.4.21", features = ["std", "max_level_debug", "release_max_level_debug"] } log-result-proc-macro = { path = "../log-result-proc-macro" } -miniz_oxide = "0.7.1" -serde = { version = "1.0", features = ["derive"] } -serde_bytes = "0.11.9" -serde_with = "2.3.2" -serde_json = "1.0.96" -thiserror = "1.0.39" -wasm-bindgen = {version = "0.2.63", optional = true} -zeroize = "1.5.7" +miniz_oxide = "0.7.2" +serde = { version = "1.0.197", features = ["derive"] } +serde_bytes = "0.11.14" +serde_with = "3.6.1" +serde_json = "1.0.114" +thiserror = "1.0.57" +wasm-bindgen = {version = "0.2.92", optional = true} +zeroize = "1.7.0" [dev-dependencies] -pretty_assertions = "1.3.0" +pretty_assertions = "1.4.0" rand = "0.8.5" hex = "0.4.3" -base64 = "0.21.0" -ntest = "0.7.3" -log = "0.4.17" -env_logger = "^0.10.0" -ctor = "^0.2.2" +base64 = "0.22.0" +ntest = "0.9.0" +log = "0.4.21" +env_logger = "^0.11.2" +ctor = "^0.2.7" [features] wasm = ["wasm-bindgen"] diff --git a/core/src/api/api.rs b/core/src/api/api.rs index d1418cab..8cbbd4a4 100644 --- a/core/src/api/api.rs +++ b/core/src/api/api.rs @@ -583,15 +583,12 @@ impl GraphState { #[cfg(test)] mod test { + use super::*; use crate::{ - api::api_types::{Connection, DsnpKeys, GraphKeyPair, ResolvedKeyPair}, + api::api_types::ResolvedKeyPair, dsnp::{dsnp_configs::KeyPairType, dsnp_types::DsnpPrid}, util::builders::{ImportBundleBuilder, KeyDataBuilder}, }; - use dryoc::keypair::StackKeyPair; - use dsnp_graph_config::{ConnectionType, GraphKeyType}; - - use super::*; #[test] fn graph_contains_false() { diff --git a/core/src/dsnp/dsnp_configs.rs b/core/src/dsnp/dsnp_configs.rs index eaa43bdd..bed313af 100644 --- a/core/src/dsnp/dsnp_configs.rs +++ b/core/src/dsnp/dsnp_configs.rs @@ -79,7 +79,7 @@ impl KeyPairType { impl Into for &'_ KeyPairType { fn into(self) -> PublicKeyType { match self { - KeyPairType::Version1_0(k) => PublicKeyType::Version1_0(k.clone().public_key), + KeyPairType::Version1_0(k) => PublicKeyType::Version1_0(k.public_key.clone()), } } } diff --git a/core/src/dsnp/pseudo_relationship_identifier.rs b/core/src/dsnp/pseudo_relationship_identifier.rs index fbca4009..6c1faa8e 100644 --- a/core/src/dsnp/pseudo_relationship_identifier.rs +++ b/core/src/dsnp/pseudo_relationship_identifier.rs @@ -102,11 +102,9 @@ impl PridProvider for DsnpPrid { #[cfg(test)] mod test { use super::*; - use crate::dsnp::dsnp_types::DsnpPrid; use dryoc::{ dryocsecretbox::Key, keypair::{PublicKey, SecretKey, StackKeyPair}, - types::ByteArray, }; #[test] @@ -120,14 +118,14 @@ mod test { a, b, &SecretKeyType::Version1_0(key_pair_a.clone()), - &PublicKeyType::Version1_0(key_pair_b.clone().public_key), + &PublicKeyType::Version1_0(key_pair_b.public_key.clone()), ) .expect("should create pri"); let pri_a_to_b_2 = DsnpPrid::create_prid( a, b, &SecretKeyType::Version1_0(key_pair_b), - &PublicKeyType::Version1_0(key_pair_a.public_key), + &PublicKeyType::Version1_0(key_pair_a.public_key.clone()), ) .expect("should create pri"); diff --git a/core/src/dsnp/schema.rs b/core/src/dsnp/schema.rs index 4e720f5f..172f8b00 100644 --- a/core/src/dsnp/schema.rs +++ b/core/src/dsnp/schema.rs @@ -83,10 +83,7 @@ impl SchemaHandler { #[cfg(test)] mod test { use super::*; - use crate::dsnp::dsnp_types::{ - DsnpGraphEdge, DsnpInnerGraph, DsnpPrid, DsnpPublicKey, DsnpUserPrivateGraphChunk, - DsnpUserPublicGraphChunk, - }; + use crate::dsnp::dsnp_types::{DsnpGraphEdge, DsnpPrid}; use apache_avro::Error as AvroError; use dryoc::keypair::StackKeyPair; use dsnp_graph_config::errors::DsnpGraphError; diff --git a/core/src/frequency/reader_writer.rs b/core/src/frequency/reader_writer.rs index 6128ebd6..523ad788 100644 --- a/core/src/frequency/reader_writer.rs +++ b/core/src/frequency/reader_writer.rs @@ -79,13 +79,10 @@ impl DsnpWriter for Frequency { #[cfg(test)] mod test { use super::*; - use crate::{ - dsnp::{ - dsnp_configs::KeyPairType, - dsnp_types::{DsnpGraphEdge, DsnpInnerGraph, DsnpPrid}, - encryption::SealBox, - }, - frequency::Frequency, + use crate::dsnp::{ + dsnp_configs::KeyPairType, + dsnp_types::{DsnpGraphEdge, DsnpPrid}, + encryption::SealBox, }; use dryoc::keypair::StackKeyPair; use rand::Rng; diff --git a/core/src/graph/graph.rs b/core/src/graph/graph.rs index 7bc7502c..627512db 100644 --- a/core/src/graph/graph.rs +++ b/core/src/graph/graph.rs @@ -116,13 +116,8 @@ impl Graph { /// Get next available PageId for this graph pub fn get_next_available_page_id(&self) -> Option { let existing_pages = self.pages.inner().keys().cloned().collect::>(); - for pid in 0..=(self.environment.get_config().max_page_id as PageId) { - if !existing_pages.contains(&pid) { - return Some(pid) - } - } - - None + (0..=(self.environment.get_config().max_page_id as PageId)) + .find(|&pid| !existing_pages.contains(&pid)) } /// Remove all pages from this graph diff --git a/java/example-graphsdk-client/build.gradle.kts b/java/example-graphsdk-client/build.gradle.kts index 6e5e4245..4cedd289 100644 --- a/java/example-graphsdk-client/build.gradle.kts +++ b/java/example-graphsdk-client/build.gradle.kts @@ -35,7 +35,7 @@ repositories { dependencies { implementation("org.slf4j:slf4j-api:2.0.7") implementation("org.slf4j:slf4j-simple:2.0.7") - implementation("io.amplica.graphsdk:lib:0.0.1-SNAPSHOT") + implementation("io.amplica.graphsdk:lib:1.0.1") testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1") testImplementation("org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.21") testImplementation("org.jetbrains.kotlin:kotlin-script-runtime:1.6.21") diff --git a/java/lib/build.gradle.kts b/java/lib/build.gradle.kts index 541e16c9..66eb9831 100644 --- a/java/lib/build.gradle.kts +++ b/java/lib/build.gradle.kts @@ -12,12 +12,12 @@ plugins { } group = "io.amplica.graphsdk" -val uploadedBinariesVersion = "1.0.0" +val uploadedBinariesVersion = "1.0.1" java.sourceCompatibility = JavaVersion.VERSION_17 version = if (project.hasProperty("projVersion")) { project.properties["projVersion"]!! } else { - "1.0.1-SNAPSHOT" + "1.0.2-SNAPSHOT" } repositories { diff --git a/log-result-proc-macro/Cargo.toml b/log-result-proc-macro/Cargo.toml index 26491f94..754d1d48 100644 --- a/log-result-proc-macro/Cargo.toml +++ b/log-result-proc-macro/Cargo.toml @@ -1,13 +1,14 @@ [package] name = "log-result-proc-macro" -version = "1.0.0" +version = "1.0.2" edition = "2021" +license = "Apache-2.0" [lib] proc-macro = true [dependencies] -proc-macro2 = "1.0" -quote = "1.0" -syn = { version = "1.0", features = ["full"] } -log = { version = "^0.4.17", features = ["std", "max_level_debug", "release_max_level_debug"] } +proc-macro2 = "1.0.78" +quote = "1.0.35" +syn = { version = "2.0.52", features = ["full"] } +log = { version = "^0.4.21", features = ["std", "max_level_debug", "release_max_level_debug"] } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index aaa7d463..e9ac4ced 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly-2023-06-01" +channel = "1.76.0" components = [ "clippy", "rust-docs", "rustfmt","rustc-dev", "rustc"] targets = [ "wasm32-unknown-unknown" ] profile = "minimal"