From 36d9c1ed9613ddbae76fb55267059d9d8a03144d Mon Sep 17 00:00:00 2001 From: gmulhearn Date: Tue, 17 Dec 2024 21:07:33 +1000 Subject: [PATCH 01/10] update rust, askar, vdr and general Signed-off-by: gmulhearn --- Cargo.lock | 1154 ++++++++++------- Cargo.toml | 14 +- aries/agents/mediator/Cargo.toml | 2 +- .../src/wallet/askar/askar_did_wallet.rs | 2 +- .../src/wallet/askar/askar_record_wallet.rs | 6 +- .../aries_vcx_wallet/src/wallet/askar/mod.rs | 4 +- .../src/data_types/messages/credential.rs | 34 +- did_core/did_doc/src/schema/did_doc.rs | 2 +- rust-toolchain.toml | 2 +- 9 files changed, 743 insertions(+), 477 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 789b5ffa8b..ce6fd51d1d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "actix-codec" @@ -65,7 +65,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -104,7 +104,7 @@ dependencies = [ "actix-utils", "futures-core", "futures-util", - "mio 1.0.2", + "mio 1.0.3", "socket2", "tokio", "tracing", @@ -182,14 +182,14 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -274,9 +274,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "amcl" @@ -395,9 +395,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -410,43 +410,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" [[package]] name = "arc-swap" @@ -468,19 +468,19 @@ dependencies = [ [[package]] name = "aries-askar" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61df62c8f62c0f850805c2b65f85633cb2c0e334b1376ce98aaaf30616e4657e" +checksum = "7f5c3a110d33351aea93dade55f57447035afe44426bf0ff3366e66641011479" dependencies = [ "askar-crypto", "askar-storage", "async-lock", - "env_logger 0.10.2", + "ciborium", + "env_logger 0.11.5", "ffi-support", "log", "once_cell", "serde", - "serde_cbor", "serde_json", "zeroize", ] @@ -517,13 +517,13 @@ dependencies = [ "actix-web", "anoncreds_types", "aries-vcx-agent", - "clap 4.5.19", + "clap 4.5.23", "derive_more", "display_as_json", "env_logger 0.11.5", "log", "rand", - "reqwest 0.12.8", + "reqwest 0.12.9", "serde", "serde_derive", "serde_json", @@ -691,15 +691,15 @@ dependencies = [ [[package]] name = "askar-crypto" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39746932b19e345196a089e61a0f0175fc4d673db4b624424d8babf505e48a3d" +checksum = "7bd248a7f6490e2e1d2296f24239c51463c441baeb03a8638a58dbb5c17b9144" dependencies = [ "aead", "aes", "aes-gcm", "argon2", - "base64 0.21.7", + "base64 0.22.1", "blake2", "block-modes", "bls12_381", @@ -723,15 +723,16 @@ dependencies = [ "serde-json-core", "sha2", "subtle", + "uuid", "x25519-dalek", "zeroize", ] [[package]] name = "askar-storage" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b82a5c62e62075c68e4504ecc281fccce88f4692df43d50194cbbf918179ee" +checksum = "4f6c679dd0b8313c63dec4a78d74bd6ae9a0f368ace5e4ac07980ad0f21a5557" dependencies = [ "arc-swap", "askar-crypto", @@ -739,6 +740,7 @@ dependencies = [ "async-stream", "bs58", "chrono", + "ciborium", "digest", "futures-lite", "hex", @@ -749,7 +751,6 @@ dependencies = [ "percent-encoding", "rmp-serde", "serde", - "serde_cbor", "serde_json", "sha2", "sqlx", @@ -777,7 +778,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 5.3.1", + "event-listener", "event-listener-strategy", "pin-project-lite", ] @@ -801,7 +802,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -812,7 +813,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -849,18 +850,18 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" -version = "0.7.7" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", "axum-core", "bytes", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.1", + "hyper 1.5.2", "hyper-util", "itoa", "matchit", @@ -873,9 +874,9 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "tokio", - "tower 0.5.1", + "tower 0.5.2", "tower-layer", "tower-service", "tracing", @@ -890,13 +891,13 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "http-body-util", "mime", "pin-project-lite", "rustversion", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "tower-layer", "tower-service", "tracing", @@ -910,7 +911,7 @@ checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -1094,15 +1095,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "bytestring" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72" +checksum = "e465647ae23b2823b0753f50decb2d5a86d2bb2cac04788fafd1f80e45378e5f" dependencies = [ "bytes", ] @@ -1118,9 +1119,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" +checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" dependencies = [ "serde", ] @@ -1150,9 +1151,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.24" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" +checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf" dependencies = [ "jobserver", "libc", @@ -1198,9 +1199,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1211,6 +1212,33 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + [[package]] name = "cipher" version = "0.4.4" @@ -1241,9 +1269,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.19" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" dependencies = [ "clap_builder", "clap_derive 4.5.18", @@ -1251,13 +1279,13 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.19" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" dependencies = [ "anstream", "anstyle", - "clap_lex 0.7.2", + "clap_lex 0.7.4", "strsim 0.11.1", ] @@ -1283,7 +1311,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -1297,9 +1325,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "client-tui" @@ -1312,25 +1340,25 @@ dependencies = [ "log", "mediator", "messages", - "reqwest 0.12.8", + "reqwest 0.12.9", "serde_json", "tokio", ] [[package]] name = "cmake" -version = "0.1.51" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e" dependencies = [ "cc", ] [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "concurrent-queue" @@ -1391,9 +1419,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -1424,9 +1452,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.13" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" dependencies = [ "crossbeam-utils", ] @@ -1442,18 +1470,18 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crossterm" @@ -1480,6 +1508,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "crypto-bigint" version = "0.5.5" @@ -1607,7 +1641,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -1631,7 +1665,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -1642,7 +1676,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -1682,35 +1716,44 @@ dependencies = [ "zeroize", ] +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + [[package]] name = "derive_builder" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] name = "derive_builder_macro" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -1723,7 +1766,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -1893,7 +1936,7 @@ dependencies = [ "async-trait", "did_resolver", "http-body-util", - "hyper 1.5.1", + "hyper 1.5.2", "hyper-tls", "hyper-util", "serde_json", @@ -1941,7 +1984,18 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "syn 2.0.79", + "syn 2.0.90", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", ] [[package]] @@ -2027,9 +2081,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] @@ -2051,7 +2105,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -2072,7 +2126,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -2132,12 +2186,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2175,12 +2229,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - [[package]] name = "event-listener" version = "5.3.1" @@ -2194,19 +2242,19 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" dependencies = [ - "event-listener 5.3.1", + "event-listener", "pin-project-lite", ] [[package]] name = "fastrand" -version = "2.1.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "ff" @@ -2242,9 +2290,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -2252,9 +2300,9 @@ dependencies = [ [[package]] name = "flume" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" dependencies = [ "futures-core", "futures-sink", @@ -2267,6 +2315,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -2324,9 +2378,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -2339,9 +2393,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -2349,15 +2403,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -2377,15 +2431,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1" dependencies = [ "fastrand", "futures-core", @@ -2396,32 +2450,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -2478,9 +2532,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glass_pumpkin" @@ -2536,7 +2590,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.6.0", + "indexmap 2.7.0", "slab", "tokio", "tokio-util", @@ -2545,17 +2599,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "http 1.1.0", - "indexmap 2.6.0", + "http 1.2.0", + "indexmap 2.7.0", "slab", "tokio", "tokio-util", @@ -2564,9 +2618,13 @@ dependencies = [ [[package]] name = "half" -version = "1.8.3" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] [[package]] name = "hashbrown" @@ -2586,15 +2644,20 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] [[package]] name = "hashlink" -version = "0.8.4" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ "hashbrown 0.14.5", ] @@ -2604,9 +2667,6 @@ name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] [[package]] name = "heck" @@ -2623,12 +2683,6 @@ dependencies = [ "libc", ] -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - [[package]] name = "hermit-abi" version = "0.4.0" @@ -2661,11 +2715,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2681,9 +2735,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -2708,7 +2762,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.1.0", + "http 1.2.0", ] [[package]] @@ -2719,7 +2773,7 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "pin-project-lite", ] @@ -2744,9 +2798,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.31" +version = "0.14.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" dependencies = [ "bytes", "futures-channel", @@ -2768,15 +2822,15 @@ dependencies = [ [[package]] name = "hyper" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" +checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.6", - "http 1.1.0", + "h2 0.4.7", + "http 1.2.0", "http-body 1.0.1", "httparse", "httpdate", @@ -2794,10 +2848,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", - "http 1.1.0", - "hyper 1.5.1", + "http 1.2.0", + "hyper 1.5.2", "hyper-util", - "rustls 0.23.13", + "rustls", "rustls-pki-types", "tokio", "tokio-rustls", @@ -2810,7 +2864,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "hyper 1.5.1", + "hyper 1.5.2", "hyper-util", "pin-project-lite", "tokio", @@ -2825,7 +2879,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.5.1", + "hyper 1.5.2", "hyper-util", "native-tls", "tokio", @@ -2842,9 +2896,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", - "hyper 1.5.1", + "hyper 1.5.2", "pin-project-lite", "socket2", "tokio", @@ -2875,6 +2929,124 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -2883,19 +3055,30 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] name = "impl-more" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" +checksum = "aae21c3177a27788957044151cc2800043d127acaa460a47ebb9b84dfa2c6aa0" [[package]] name = "indexmap" @@ -2909,12 +3092,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.15.0", + "hashbrown 0.15.2", ] [[package]] @@ -2967,7 +3150,7 @@ dependencies = [ [[package]] name = "indy-vdr" version = "0.4.3" -source = "git+https://github.com/hyperledger/indy-vdr.git?tag=v0.4.3#16b467de2e8d0b6398e1592aff9299b816912ced" +source = "git+https://github.com/anonyome/indy-vdr.git?rev=34ada55#34ada550152f2e100be6444473a0fe0e6b6c96f5" dependencies = [ "base64 0.21.7", "bs58", @@ -3001,7 +3184,7 @@ dependencies = [ [[package]] name = "indy-vdr-proxy-client" version = "0.1.0" -source = "git+https://github.com/hyperledger/indy-vdr.git?tag=v0.4.3#16b467de2e8d0b6398e1592aff9299b816912ced" +source = "git+https://github.com/anonyome/indy-vdr.git?rev=34ada55#34ada550152f2e100be6444473a0fe0e6b6c96f5" dependencies = [ "indy-vdr", "reqwest 0.11.27", @@ -3030,9 +3213,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" @@ -3062,18 +3245,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jobserver" @@ -3086,10 +3269,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -3131,21 +3315,21 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.159" +version = "0.2.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libsqlite3-sys" -version = "0.27.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ "cc", "pkg-config", @@ -3158,6 +3342,12 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "litemap" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + [[package]] name = "local-channel" version = "0.1.5" @@ -3193,11 +3383,11 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.2", ] [[package]] @@ -3240,7 +3430,7 @@ dependencies = [ "futures", "log", "messages", - "reqwest 0.12.8", + "reqwest 0.12.9", "serde", "serde_json", "sqlx", @@ -3289,7 +3479,7 @@ dependencies = [ "proc-macro2", "quote", "shared", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -3348,11 +3538,10 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi 0.3.9", "libc", "log", "wasi", @@ -3382,7 +3571,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -3490,6 +3679,12 @@ dependencies = [ "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.46" @@ -3541,21 +3736,18 @@ dependencies = [ [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.20.1" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" -dependencies = [ - "portable-atomic", -] +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "opaque-debug" @@ -3565,9 +3757,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -3586,7 +3778,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -3597,9 +3789,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -3695,7 +3887,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.7", + "redox_syscall 0.5.8", "smallvec", "windows-targets 0.52.6", ] @@ -3749,7 +3941,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.6.0", + "indexmap 2.7.0", ] [[package]] @@ -3787,14 +3979,14 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -3859,10 +4051,10 @@ dependencies = [ ] [[package]] -name = "portable-atomic" -version = "1.9.0" +name = "powerfmt" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" @@ -3911,12 +4103,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.22" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -3954,18 +4146,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "prost" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" +checksum = "2c0fef6c4230e4ccf618a35c59d7ede15dea37de8427500f50aff708806e42ec" dependencies = [ "bytes", "prost-derive", @@ -3973,11 +4165,10 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c1318b19085f08681016926435853bbf7858f9c082d0999b80550ff5d9abe15" +checksum = "d0f3e5beed80eb580c68e2c600937ac2c4eedabdfd5ef1e5b7ea4f3fba84497b" dependencies = [ - "bytes", "heck 0.5.0", "itertools", "log", @@ -3988,28 +4179,28 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.79", + "syn 2.0.90", "tempfile", ] [[package]] name = "prost-derive" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" +checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3" dependencies = [ "anyhow", "itertools", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] name = "prost-types" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" +checksum = "cc2f1e56baa61e93533aebc21af4d2134b70f66275e0fcdf3cbe43d77ff7e8fc" dependencies = [ "prost", ] @@ -4084,18 +4275,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -4105,9 +4296,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -4140,7 +4331,7 @@ dependencies = [ "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.31", + "hyper 0.14.32", "ipnet", "js-sys", "log", @@ -4164,9 +4355,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.8" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "base64 0.22.1", "bytes", @@ -4174,11 +4365,11 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.4.6", - "http 1.1.0", + "h2 0.4.7", + "http 1.2.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.1", + "hyper 1.5.2", "hyper-rustls", "hyper-tls", "hyper-util", @@ -4191,11 +4382,11 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls-pemfile 2.2.0", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "system-configuration 0.6.1", "tokio", "tokio-native-tls", @@ -4256,9 +4447,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519" dependencies = [ "const-oid", "digest", @@ -4291,50 +4482,31 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" dependencies = [ "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "ring", - "rustls-webpki 0.101.7", - "sct", + "windows-sys 0.59.0", ] [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" dependencies = [ "once_cell", + "ring", "rustls-pki-types", - "rustls-webpki 0.102.8", + "rustls-webpki", "subtle", "zeroize", ] -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - [[package]] name = "rustls-pemfile" version = "2.2.0" @@ -4346,19 +4518,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" - -[[package]] -name = "rustls-webpki" -version = "0.101.7" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] +checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" [[package]] name = "rustls-webpki" @@ -4373,9 +4535,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "ryu" @@ -4394,9 +4556,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] @@ -4424,17 +4586,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", -] - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", + "syn 2.0.90", ] [[package]] @@ -4465,9 +4617,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", @@ -4475,58 +4627,48 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.210" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" dependencies = [ "serde_derive", ] [[package]] name = "serde-json-core" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c9e1ab533c0bc414c34920ec7e5f097101d126ed5eac1a1aac711222e0bbb33" +checksum = "5b81787e655bd59cecadc91f7b6b8651330b2be6c33246039a65e5cd6f4e0828" dependencies = [ "ryu", "serde", ] -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half", - "serde", -] - [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -4605,7 +4747,7 @@ dependencies = [ "lazy_static", "log", "regex", - "reqwest 0.12.8", + "reqwest 0.12.9", "serde", "serde_json", "thiserror", @@ -4700,12 +4842,15 @@ name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -4742,9 +4887,9 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" +checksum = "93334716a037193fac19df402f8571269c84a00852f6a7066b5d2616dcd64d3e" dependencies = [ "sqlx-core", "sqlx-macros", @@ -4755,11 +4900,10 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" +checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e" dependencies = [ - "ahash", "atoi", "byteorder", "bytes", @@ -4767,22 +4911,23 @@ dependencies = [ "crc", "crossbeam-queue", "either", - "event-listener 2.5.3", + "event-listener", "futures-channel", "futures-core", "futures-intrusive", "futures-io", "futures-util", + "hashbrown 0.14.5", "hashlink", "hex", - "indexmap 2.6.0", + "indexmap 2.7.0", "log", "memchr", "once_cell", "paste", "percent-encoding", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", + "rustls", + "rustls-pemfile", "serde", "serde_json", "sha2", @@ -4798,26 +4943,26 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +checksum = "cac0692bcc9de3b073e8d747391827297e075c7710ff6276d9f7a1f3d58c6657" dependencies = [ "proc-macro2", "quote", "sqlx-core", "sqlx-macros-core", - "syn 1.0.109", + "syn 2.0.90", ] [[package]] name = "sqlx-macros-core" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" +checksum = "1804e8a7c7865599c9c79be146dc8a9fd8cc86935fa641d3ea58e5f0688abaa5" dependencies = [ "dotenvy", "either", - "heck 0.4.1", + "heck 0.5.0", "hex", "once_cell", "proc-macro2", @@ -4829,7 +4974,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 1.0.109", + "syn 2.0.90", "tempfile", "tokio", "url", @@ -4837,12 +4982,12 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" +checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a" dependencies = [ "atoi", - "base64 0.21.7", + "base64 0.22.1", "bitflags 2.6.0", "byteorder", "bytes", @@ -4880,12 +5025,12 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" +checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8" dependencies = [ "atoi", - "base64 0.21.7", + "base64 0.22.1", "bitflags 2.6.0", "byteorder", "chrono", @@ -4919,9 +5064,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" +checksum = "d5b2cf34a45953bfd3daaf3db0f7a7878ab9b7a6b91b422d24a7a9e4c857b680" dependencies = [ "atoi", "chrono", @@ -4935,10 +5080,10 @@ dependencies = [ "log", "percent-encoding", "serde", + "serde_urlencoded", "sqlx-core", "tracing", "url", - "urlencoding", ] [[package]] @@ -4992,7 +5137,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -5014,9 +5159,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -5031,13 +5176,24 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ "futures-core", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "system-configuration" version = "0.5.1" @@ -5088,9 +5244,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", @@ -5155,33 +5311,36 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] name = "time" -version = "0.3.20" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ + "deranged", "itoa", "libc", + "num-conv", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -5189,19 +5348,30 @@ 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.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ + "num-conv", "time-core", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" version = "1.8.0" @@ -5219,14 +5389,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", "libc", - "mio 1.0.2", + "mio 1.0.3", "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", @@ -5243,7 +5413,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -5258,20 +5428,19 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" dependencies = [ - "rustls 0.23.13", - "rustls-pki-types", + "rustls", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -5293,9 +5462,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", @@ -5328,10 +5497,10 @@ dependencies = [ "async-trait", "base64 0.22.1", "bytes", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.1", + "hyper 1.5.2", "hyper-timeout", "hyper-util", "percent-encoding", @@ -5356,7 +5525,7 @@ dependencies = [ "prost-build", "prost-types", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -5381,14 +5550,14 @@ dependencies = [ [[package]] name = "tower" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", "pin-project-lite", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.2", "tokio", "tower-layer", "tower-service", @@ -5404,7 +5573,7 @@ dependencies = [ "bitflags 2.6.0", "bytes", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body 1.0.1", "http-body-util", "pin-project-lite", @@ -5427,9 +5596,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -5439,20 +5608,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", ] @@ -5465,7 +5634,7 @@ checksum = "cea6980daec8f45217d2cc7205c62578c8f2a8b830a4f381949347a0bc1425b4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -5491,7 +5660,7 @@ checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -5502,24 +5671,21 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" @@ -5733,9 +5899,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -5744,10 +5910,16 @@ dependencies = [ ] [[package]] -name = "urlencoding" -version = "2.1.3" +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "utf8parse" @@ -5757,9 +5929,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "getrandom", "serde", @@ -5800,9 +5972,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ "cfg-if", "once_cell", @@ -5811,36 +5983,36 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5848,28 +6020,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" dependencies = [ "js-sys", "wasm-bindgen", @@ -5877,9 +6049,12 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.4" +version = "0.26.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "weedle2" @@ -5896,7 +6071,7 @@ version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" dependencies = [ - "redox_syscall 0.5.7", + "redox_syscall 0.5.8", "wasite", ] @@ -6128,6 +6303,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "wyz" version = "0.5.1" @@ -6160,6 +6347,30 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -6178,7 +6389,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", +] + +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", + "synstructure", ] [[package]] @@ -6198,7 +6430,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.90", ] [[package]] @@ -6210,6 +6442,28 @@ dependencies = [ "cmake", ] +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "zmq" version = "0.9.2" diff --git a/Cargo.toml b/Cargo.toml index 58fa41fa61..e6443373ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -77,10 +77,20 @@ unused_qualifications = "warn" let_underscore_drop = "allow" [workspace.dependencies] +# aries indy-vdr = { git = "https://github.com/hyperledger/indy-vdr.git", tag = "v0.4.3", default-features = false, features = [ "log", ] } indy-vdr-proxy-client = { git = "https://github.com/hyperledger/indy-vdr.git", tag = "v0.4.3" } anoncreds = { git = "https://github.com/hyperledger/anoncreds-rs.git", tag = "v0.2.0" } -aries-askar = { version = "0.3.1" } -askar-crypto = { version = "0.3.1", default-features = false } +aries-askar = { version = "0.4.0" } +askar-crypto = { version = "0.3.3", default-features = false } + +# common + +# TODO - await new indy-vdr release +[patch.'https://github.com/hyperledger/indy-vdr'] +indy-vdr = { git = "https://github.com/anonyome/indy-vdr.git", rev = "34ada55", default-features = false, features = [ + "log", +] } +indy-vdr-proxy-client = { git = "https://github.com/anonyome/indy-vdr.git", rev = "34ada55" } \ No newline at end of file diff --git a/aries/agents/mediator/Cargo.toml b/aries/agents/mediator/Cargo.toml index 7358766c3a..ce21dbda3b 100644 --- a/aries/agents/mediator/Cargo.toml +++ b/aries/agents/mediator/Cargo.toml @@ -27,7 +27,7 @@ messages = { path = "../../messages" } reqwest = { version = "0.12.5", features = ["json"] } serde = "1.0.188" serde_json = "1.0.106" -sqlx = { version = "0.7", features = ["mysql"] } +sqlx = { version = "0.8.2", features = ["mysql"] } thiserror = "1.0.49" tokio = { version = "1", features = ["rt-multi-thread", "macros"] } tower-http = { version = "0.5.2", features = ["catch-panic"] } diff --git a/aries/aries_vcx_wallet/src/wallet/askar/askar_did_wallet.rs b/aries/aries_vcx_wallet/src/wallet/askar/askar_did_wallet.rs index 0a9ffd0db4..c1195fca1f 100644 --- a/aries/aries_vcx_wallet/src/wallet/askar/askar_did_wallet.rs +++ b/aries/aries_vcx_wallet/src/wallet/askar/askar_did_wallet.rs @@ -168,7 +168,7 @@ impl DidWallet for AskarWallet { "recipient keys should not be empty for 'pack_message'".into(), )) } else { - let enc_key = LocalKey::generate(KeyAlg::Chacha20(Chacha20Types::C20P), true)?; + let enc_key = LocalKey::generate_with_rng(KeyAlg::Chacha20(Chacha20Types::C20P), true)?; let base64_data = if let Some(sender_verkey) = sender_vk { let mut session = self.session().await?; diff --git a/aries/aries_vcx_wallet/src/wallet/askar/askar_record_wallet.rs b/aries/aries_vcx_wallet/src/wallet/askar/askar_record_wallet.rs index 0c4922c8f7..6572573c03 100644 --- a/aries/aries_vcx_wallet/src/wallet/askar/askar_record_wallet.rs +++ b/aries/aries_vcx_wallet/src/wallet/askar/askar_record_wallet.rs @@ -105,7 +105,7 @@ impl RecordWallet for AskarWallet { Ok(self .session() .await? - .fetch_all(Some(&category.to_string()), filter, None, false) + .fetch_all(Some(&category.to_string()), filter, None, None, true, false) .await? .into_iter() .map(TryFrom::try_from) @@ -117,7 +117,9 @@ impl RecordWallet for AskarWallet { async fn all_records(&self) -> VcxWalletResult> { let mut session = self.session().await?; - let recs = session.fetch_all(None, None, None, false).await?; + let recs = session + .fetch_all(None, None, None, None, true, false) + .await?; let mut recs = recs .into_iter() diff --git a/aries/aries_vcx_wallet/src/wallet/askar/mod.rs b/aries/aries_vcx_wallet/src/wallet/askar/mod.rs index dcde92610d..0c3b3ce5b8 100644 --- a/aries/aries_vcx_wallet/src/wallet/askar/mod.rs +++ b/aries/aries_vcx_wallet/src/wallet/askar/mod.rs @@ -57,7 +57,7 @@ impl BaseWallet for AskarWallet { let tg: Vec<_> = tags.clone().into(); let key = LocalKey::from_secret_bytes(KeyAlg::Ed25519, &value.signkey().decode()?[0..32])?; Ok(session - .insert_key(name, &key, None, Some(&tg), None) + .insert_key(name, &key, None, None, Some(&tg), None) .await?) } } @@ -145,7 +145,7 @@ impl AskarWallet { let key = LocalKey::from_secret_bytes(alg, seed)?; let key_name = local_key_to_bs58_public_key(&key)?.into_inner(); session - .insert_key(&key_name, &key, None, None, None) + .insert_key(&key_name, &key, None, None, None, None) .await?; Ok((key_name, key)) } diff --git a/aries/misc/anoncreds_types/src/data_types/messages/credential.rs b/aries/misc/anoncreds_types/src/data_types/messages/credential.rs index 5eaf5f714f..23f505513c 100644 --- a/aries/misc/anoncreds_types/src/data_types/messages/credential.rs +++ b/aries/misc/anoncreds_types/src/data_types/messages/credential.rs @@ -1,8 +1,8 @@ use std::collections::HashMap; use serde::{Deserialize, Serialize}; -#[cfg(feature = "zeroize")] -use zeroize::Zeroize; +// #[cfg(feature = "zeroize")] +// use zeroize::Zeroize; use crate::{ cl::{CredentialSignature, RevocationRegistry, SignatureCorrectnessProof, Witness}, @@ -125,12 +125,12 @@ impl Validatable for Credential { #[derive(Clone, Debug, Default, PartialEq, Eq, Deserialize, Serialize)] pub struct CredentialValues(pub HashMap); -#[cfg(feature = "zeroize")] -impl Drop for CredentialValues { - fn drop(&mut self) { - self.zeroize(); - } -} +// #[cfg(feature = "zeroize")] +// impl Drop for CredentialValues { +// fn drop(&mut self) { +// self.zeroize(); +// } +// } impl Validatable for CredentialValues { fn validate(&self) -> Result<(), crate::error::Error> { @@ -145,17 +145,17 @@ impl Validatable for CredentialValues { } } -#[cfg(feature = "zeroize")] -impl Zeroize for CredentialValues { - fn zeroize(&mut self) { - for attr in self.0.values_mut() { - attr.zeroize(); - } - } -} +// #[cfg(feature = "zeroize")] +// impl Zeroize for CredentialValues { +// fn zeroize(&mut self) { +// for attr in self.0.values_mut() { +// attr.zeroize(); +// } +// } +// } #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] -#[cfg_attr(feature = "zeroize", derive(Zeroize))] +// #[cfg_attr(feature = "zeroize", derive(Zeroize))] pub struct AttributeValues { pub raw: String, pub encoded: String, diff --git a/did_core/did_doc/src/schema/did_doc.rs b/did_core/did_doc/src/schema/did_doc.rs index 50423c6eaf..4957c4dfc4 100644 --- a/did_core/did_doc/src/schema/did_doc.rs +++ b/did_core/did_doc/src/schema/did_doc.rs @@ -94,7 +94,7 @@ impl DidDocument { &'a self, vm: &'a VerificationMethodKind, id: &str, - ) -> Option<&VerificationMethod> { + ) -> Option<&'a VerificationMethod> { return match vm { VerificationMethodKind::Resolved(vm) => { if vm.id().fragment() == Some(id) { diff --git a/rust-toolchain.toml b/rust-toolchain.toml index c6e4d7d503..a718dc2fc8 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.79" +channel = "1.83" From 94e0808a16642e49f6e717524fcff03032a5a047 Mon Sep 17 00:00:00 2001 From: gmulhearn Date: Tue, 31 Dec 2024 11:20:38 +1000 Subject: [PATCH 02/10] some common Signed-off-by: gmulhearn --- Cargo.lock | 16 ++++++---------- Cargo.toml | 4 ++++ aries/agents/aath-backchannel/Cargo.toml | 5 ++--- aries/agents/aath-backchannel/src/main.rs | 3 +-- aries/agents/aries-vcx-agent/Cargo.toml | 4 ++-- aries/agents/mediator/Cargo.toml | 4 ++-- aries/agents/mediator/client-tui/Cargo.toml | 2 +- aries/aries_vcx/Cargo.toml | 9 ++++----- aries/aries_vcx/src/lib.rs | 2 +- aries/aries_vcx_anoncreds/Cargo.toml | 4 ++-- aries/aries_vcx_ledger/Cargo.toml | 4 ++-- aries/aries_vcx_wallet/Cargo.toml | 8 ++++---- aries/messages/Cargo.toml | 4 ++-- aries/misc/anoncreds_types/Cargo.toml | 4 ++-- .../misc/indy_ledger_response_parser/Cargo.toml | 4 ++-- aries/misc/legacy/diddoc_legacy/Cargo.toml | 7 +++---- aries/misc/legacy/diddoc_legacy/src/lib.rs | 2 +- aries/misc/shared/Cargo.toml | 6 +++--- aries/misc/test_utils/Cargo.toml | 2 +- aries/wrappers/uniffi-aries-vcx/core/Cargo.toml | 4 ++-- did_core/did_doc/Cargo.toml | 8 ++++---- did_core/did_methods/did_cheqd/Cargo.toml | 4 ++-- did_core/did_methods/did_jwk/Cargo.toml | 6 +++--- did_core/did_methods/did_key/Cargo.toml | 4 ++-- did_core/did_methods/did_peer/Cargo.toml | 8 ++++---- did_core/did_methods/did_resolver_sov/Cargo.toml | 6 +++--- did_core/did_methods/did_resolver_web/Cargo.toml | 2 +- did_core/did_parser_nom/Cargo.toml | 2 +- did_core/did_resolver/Cargo.toml | 4 ++-- did_core/did_resolver_registry/Cargo.toml | 4 ++-- did_core/public_key/Cargo.toml | 8 ++++---- misc/display_as_json/Cargo.toml | 5 ++--- misc/display_as_json/tests/demo.rs | 2 +- 33 files changed, 78 insertions(+), 83 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ce6fd51d1d..38c9983beb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -525,7 +525,6 @@ dependencies = [ "rand", "reqwest 0.12.9", "serde", - "serde_derive", "serde_json", "uuid", ] @@ -564,7 +563,6 @@ dependencies = [ "rand", "regex", "serde", - "serde_derive", "serde_json", "sha2", "shared", @@ -1951,7 +1949,6 @@ version = "0.67.0" dependencies = [ "display_as_json", "serde", - "serde_derive", "serde_json", "shared", "thiserror", @@ -1982,7 +1979,6 @@ version = "0.1.0" dependencies = [ "quote", "serde", - "serde_derive", "serde_json", "syn 2.0.90", ] @@ -4636,9 +4632,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.216" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] @@ -4655,9 +4651,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.216" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", @@ -4666,9 +4662,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" dependencies = [ "itoa", "memchr", diff --git a/Cargo.toml b/Cargo.toml index e6443373ed..e997efe818 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -87,6 +87,10 @@ aries-askar = { version = "0.4.0" } askar-crypto = { version = "0.3.3", default-features = false } # common +base64 = "0.22.1" +bs58 = "0.5.1" +serde = "1.0.217" +serde_json = "1.0.134" # TODO - await new indy-vdr release [patch.'https://github.com/hyperledger/indy-vdr'] diff --git a/aries/agents/aath-backchannel/Cargo.toml b/aries/agents/aath-backchannel/Cargo.toml index b102faa63e..e5f9159210 100644 --- a/aries/agents/aath-backchannel/Cargo.toml +++ b/aries/agents/aath-backchannel/Cargo.toml @@ -11,9 +11,8 @@ derive_more = "0.99.14" clap = { version = "4.5.6", features = ["derive"] } reqwest = { version = "0.12.4", features = ["json", "multipart", "blocking"] } rand = "0.8.5" -serde = "1.0.97" -serde_json = "1.0.40" -serde_derive = "1.0.97" +serde.workspace = true +serde_json.workspace = true log = "^0.4.20" env_logger = "0.11.3" uuid = { version = "1.8.0", features = ["serde", "v4"] } diff --git a/aries/agents/aath-backchannel/src/main.rs b/aries/agents/aath-backchannel/src/main.rs index a73fdfbf71..97dca23ce8 100644 --- a/aries/agents/aath-backchannel/src/main.rs +++ b/aries/agents/aath-backchannel/src/main.rs @@ -3,9 +3,8 @@ mod controllers; mod error; mod setup; -extern crate serde; #[macro_use] -extern crate serde_derive; +extern crate serde; #[macro_use] extern crate serde_json; #[macro_use] diff --git a/aries/agents/aries-vcx-agent/Cargo.toml b/aries/agents/aries-vcx-agent/Cargo.toml index 7921d4fc65..055f91dec2 100644 --- a/aries/agents/aries-vcx-agent/Cargo.toml +++ b/aries/agents/aries-vcx-agent/Cargo.toml @@ -6,7 +6,8 @@ license.workspace = true edition.workspace = true [dependencies] -serde = "1.0.145" +serde.workspace = true +serde_json.workspace = true aries_vcx = { path = "../../aries_vcx" } aries_vcx_wallet = { path = "../../aries_vcx_wallet", features = [ "askar_wallet", @@ -21,7 +22,6 @@ did_peer = { path = "../../../did_core/did_methods/did_peer" } did_key = { path = "../../../did_core/did_methods/did_key" } public_key = { path = "../../../did_core/public_key" } async-trait = "0.1.64" -serde_json = "1.0.85" log = "0.4.17" uuid = "1.2.1" thiserror = "1.0.37" diff --git a/aries/agents/mediator/Cargo.toml b/aries/agents/mediator/Cargo.toml index ce21dbda3b..fdac727f6e 100644 --- a/aries/agents/mediator/Cargo.toml +++ b/aries/agents/mediator/Cargo.toml @@ -25,8 +25,8 @@ futures = "0.3.28" log = "0.4.20" messages = { path = "../../messages" } reqwest = { version = "0.12.5", features = ["json"] } -serde = "1.0.188" -serde_json = "1.0.106" +serde.workspace = true +serde_json.workspace = true sqlx = { version = "0.8.2", features = ["mysql"] } thiserror = "1.0.49" tokio = { version = "1", features = ["rt-multi-thread", "macros"] } diff --git a/aries/agents/mediator/client-tui/Cargo.toml b/aries/agents/mediator/client-tui/Cargo.toml index 0735c525bb..dd9b56209a 100644 --- a/aries/agents/mediator/client-tui/Cargo.toml +++ b/aries/agents/mediator/client-tui/Cargo.toml @@ -16,6 +16,6 @@ log = "0.4.20" mediator = { path = ".." } messages = { path = "../../../messages" } reqwest = "0.12.5" -serde_json = "1.0.107" +serde_json.workspace = true tokio = { version = "1", features = ["rt-multi-thread", "macros"] } diff --git a/aries/aries_vcx/Cargo.toml b/aries/aries_vcx/Cargo.toml index 12d6ffb1fd..f69e767004 100644 --- a/aries/aries_vcx/Cargo.toml +++ b/aries/aries_vcx/Cargo.toml @@ -40,7 +40,7 @@ did_key = { path = "../../did_core/did_methods/did_key" } public_key = { path = "../../did_core/public_key" } did_peer = { path = "../../did_core/did_methods/did_peer" } did_resolver_registry = { path = "../../did_core/did_resolver_registry" } -bs58 = "0.5.0" +bs58.workspace = true async-trait = "0.1.53" env_logger = "0.11.3" log = "0.4.16" @@ -48,11 +48,10 @@ chrono = "0.4.23" time = "0.3.20" lazy_static = "1.3" rand = "0.8.5" -serde = "1.0.97" -serde_json = "1.0.40" -serde_derive = "1.0.97" +serde.workspace = true +serde_json.workspace = true regex = "1.1.0" -base64 = "0.22.1" +base64.workspace = true sha2 = "0.10.7" num-bigint = "0.4.5" futures = { version = "0.3", default-features = false } diff --git a/aries/aries_vcx/src/lib.rs b/aries/aries_vcx/src/lib.rs index 06acc260de..6147358898 100644 --- a/aries/aries_vcx/src/lib.rs +++ b/aries/aries_vcx/src/lib.rs @@ -11,7 +11,7 @@ extern crate lazy_static; extern crate log; #[macro_use] -extern crate serde_derive; +extern crate serde; #[macro_use] extern crate serde_json; diff --git a/aries/aries_vcx_anoncreds/Cargo.toml b/aries/aries_vcx_anoncreds/Cargo.toml index 4a8028f9b9..7168b0bc55 100644 --- a/aries/aries_vcx_anoncreds/Cargo.toml +++ b/aries/aries_vcx_anoncreds/Cargo.toml @@ -20,7 +20,7 @@ async-trait = "0.1.68" thiserror = "1.0.40" log = "0.4.17" uuid = { version = "1.3.0", default-features = false, features = ["v4"] } -serde = { version = "1.0.159", features = ["derive"] } -serde_json = "1.0.95" +serde = { workspace = true, features = ["derive"] } +serde_json.workspace = true time = "0.3.20" bitvec = "1.0.1" diff --git a/aries/aries_vcx_ledger/Cargo.toml b/aries/aries_vcx_ledger/Cargo.toml index 8ddca850b0..fca2edfe3e 100644 --- a/aries/aries_vcx_ledger/Cargo.toml +++ b/aries/aries_vcx_ledger/Cargo.toml @@ -21,13 +21,13 @@ indy-vdr-proxy-client = { workspace = true, optional = true } did_cheqd = { path = "../../did_core/did_methods/did_cheqd", optional = true } did_resolver = { path = "../../did_core/did_resolver", optional = true } url = { version = "2.4.1", optional = true } -serde_json = "1.0.95" +serde_json.workspace = true public_key = { path = "../../did_core/public_key" } async-trait = "0.1.68" time = "0.3.20" indy-ledger-response-parser = { path = "../misc/indy_ledger_response_parser" } log = "0.4.17" -serde = { version = "1.0.159", features = ["derive"] } +serde = { workspace = true, features = ["derive"] } lru = { version = "0.12.0" } tokio = { version = "1.38" } chrono = { version = "0.4", default-features = false, features = ["alloc"] } diff --git a/aries/aries_vcx_wallet/Cargo.toml b/aries/aries_vcx_wallet/Cargo.toml index 582537cbcb..27f7cedd4a 100644 --- a/aries/aries_vcx_wallet/Cargo.toml +++ b/aries/aries_vcx_wallet/Cargo.toml @@ -14,11 +14,11 @@ askar_wallet = ["dep:aries-askar"] anyhow = "1.0" aries-askar = { workspace = true, optional = true } async-trait = "0.1.68" -bs58 = { version = "0.5" } -base64 = "0.22.1" +bs58.workspace = true +base64.workspace = true log = "0.4.17" -serde = { version = "1.0.159", features = ["derive"] } -serde_json = "1.0.95" +serde = { workspace = true, features = ["derive"] } +serde_json.workspace = true public_key = { path = "../../did_core/public_key" } rand = "0.8.5" thiserror = "1.0.40" diff --git a/aries/messages/Cargo.toml b/aries/messages/Cargo.toml index 5dfe8cfd31..3a92594a18 100644 --- a/aries/messages/Cargo.toml +++ b/aries/messages/Cargo.toml @@ -9,10 +9,10 @@ license.workspace = true doctest = false [dependencies] -serde = { version = "1.0.167", features = ["derive"] } +serde = { workspace = true, features = ["derive"] } +serde_json.workspace = true chrono = { version = "0.4.23", features = ["serde"] } lazy_static = "1.3" -serde_json = "1.0.100" url = { version = "2.3", features = ["serde"] } strum = "0.26.3" strum_macros = "0.26.4" diff --git a/aries/misc/anoncreds_types/Cargo.toml b/aries/misc/anoncreds_types/Cargo.toml index 70437c695e..b28d81d3d2 100644 --- a/aries/misc/anoncreds_types/Cargo.toml +++ b/aries/misc/anoncreds_types/Cargo.toml @@ -18,8 +18,8 @@ bitvec = "1.0.1" log = "0.4.22" once_cell = "1.19.0" regex = "1.10.5" -serde = { version = "1.0.203", features = ["derive"] } -serde_json = "1.0.120" +serde = { workspace = true, features = ["derive"] } +serde_json.workspace = true typed-builder = "0.19.1" [dev-dependencies] diff --git a/aries/misc/indy_ledger_response_parser/Cargo.toml b/aries/misc/indy_ledger_response_parser/Cargo.toml index d169a97a36..16296d1c0a 100644 --- a/aries/misc/indy_ledger_response_parser/Cargo.toml +++ b/aries/misc/indy_ledger_response_parser/Cargo.toml @@ -4,8 +4,8 @@ version = "0.1.0" edition = "2021" [dependencies] -serde = { version = "1.0.163", features = ["derive"] } -serde_json = "1.0.96" +serde = { workspace = true, features = ["derive"] } +serde_json.workspace = true time = "0.3.20" indy-vdr.workspace = true thiserror = "1.0.44" diff --git a/aries/misc/legacy/diddoc_legacy/Cargo.toml b/aries/misc/legacy/diddoc_legacy/Cargo.toml index 91aabf224f..604fbd3bde 100644 --- a/aries/misc/legacy/diddoc_legacy/Cargo.toml +++ b/aries/misc/legacy/diddoc_legacy/Cargo.toml @@ -9,13 +9,12 @@ license.workspace = true doctest = false [dependencies] -serde = "1.0.97" -serde_json = "1.0.40" -serde_derive = "1.0.97" +serde.workspace = true +serde_json.workspace = true url = { version = "2.3", features = ["serde"] } thiserror = "1.0.37" shared = { path = "../../shared" } display_as_json = { path = "../../../../misc/display_as_json" } [dev-dependencies] -serde_json = "1.0.91" +serde_json.workspace = true diff --git a/aries/misc/legacy/diddoc_legacy/src/lib.rs b/aries/misc/legacy/diddoc_legacy/src/lib.rs index 3b818989e6..6e30e99a8f 100644 --- a/aries/misc/legacy/diddoc_legacy/src/lib.rs +++ b/aries/misc/legacy/diddoc_legacy/src/lib.rs @@ -6,7 +6,7 @@ #![allow(clippy::large_enum_variant)] #[macro_use] -extern crate serde_derive; +extern crate serde; extern crate shared; pub mod aries; pub mod errors; diff --git a/aries/misc/shared/Cargo.toml b/aries/misc/shared/Cargo.toml index a84c2e61cf..cfde918fd6 100644 --- a/aries/misc/shared/Cargo.toml +++ b/aries/misc/shared/Cargo.toml @@ -12,8 +12,8 @@ doctest = false lazy_static = "1.3" regex = "1.1.0" thiserror = "1.0.37" -bs58 = "0.5.1" -serde = { version = "1.0.97", features = ["derive"] } -serde_json = "1.0.96" +bs58.workspace = true +serde = { workspace = true, features = ["derive"] } +serde_json.workspace = true reqwest = "0.12.5" log = "0.4.17" diff --git a/aries/misc/test_utils/Cargo.toml b/aries/misc/test_utils/Cargo.toml index d9f027d2ac..38a215dd4f 100644 --- a/aries/misc/test_utils/Cargo.toml +++ b/aries/misc/test_utils/Cargo.toml @@ -28,7 +28,7 @@ public_key = { path = "../../../did_core/public_key" } indy-ledger-response-parser = { path = "../indy_ledger_response_parser", optional = true } indy-vdr-proxy-client = { workspace = true, optional = true } lazy_static = "1" -serde_json = "1" +serde_json.workspace = true rand = "0.8" uuid = { version = "1", default-features = false, features = ["v4"] } async-trait = "0.1" diff --git a/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml b/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml index 7732d59334..d09386f240 100644 --- a/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml +++ b/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml @@ -27,8 +27,8 @@ indy-vdr.workspace = true tokio = { version = "1.38.0", features = ["rt-multi-thread"] } once_cell = "1.17.0" thiserror = "1.0.38" -serde_json = "1.0.91" -serde = { version = "1.0.188", features = ["derive"] } +serde_json.workspace = true +serde = { workspace = true, features = ["derive"] } async-trait = "0.1.64" did_parser_nom = { path = "../../../../did_core/did_parser_nom" } diddoc_legacy = { path = "../../../misc/legacy/diddoc_legacy" } diff --git a/did_core/did_doc/Cargo.toml b/did_core/did_doc/Cargo.toml index 061d4fc36f..edd73a1e89 100644 --- a/did_core/did_doc/Cargo.toml +++ b/did_core/did_doc/Cargo.toml @@ -7,15 +7,15 @@ edition = "2021" jwk = ["public_key/jwk"] [dependencies] -base64 = "0.22.1" -bs58 = "0.5.0" +base64.workspace = true +bs58.workspace = true did_parser_nom = { path = "../did_parser_nom" } public_key = { path = "../public_key" } hex = "0.4.3" multibase = "0.9.1" pem = "3.0.4" -serde = { version = "1.0.159", default-features = false, features = ["derive"] } -serde_json = "1.0.95" +serde = { workspace = true, default-features = false, features = ["derive"] } +serde_json.workspace = true uniresid = { version = "0.1.4", default-features = false, features = ["serde"] } url = { version = "2.3.1", features = ["serde"] } display_as_json = { path = "../../misc/display_as_json" } diff --git a/did_core/did_methods/did_cheqd/Cargo.toml b/did_core/did_methods/did_cheqd/Cargo.toml index 22bf389252..509b818fba 100644 --- a/did_core/did_methods/did_cheqd/Cargo.toml +++ b/did_core/did_methods/did_cheqd/Cargo.toml @@ -24,8 +24,8 @@ hyper-tls = "0.6.0" hyper-util = { version = "0.1.10", features = ["client-legacy", "http2"] } http-body-util = "0.1.2" async-trait = "0.1.68" -serde_json = "1.0.96" -serde = { version = "1.0.160", features = ["derive"] } +serde_json.workspace = true +serde = { workspace = true, features = ["derive"] } thiserror = "1.0.40" tokio = { version = "1.38.0" } chrono = { version = "0.4.24", default-features = false, features = ["now"] } diff --git a/did_core/did_methods/did_jwk/Cargo.toml b/did_core/did_methods/did_jwk/Cargo.toml index 97bf2c2ab2..d45bdf3618 100644 --- a/did_core/did_methods/did_jwk/Cargo.toml +++ b/did_core/did_methods/did_jwk/Cargo.toml @@ -9,9 +9,9 @@ did_doc = { path = "../../did_doc" } did_resolver = { path = "../../did_resolver" } public_key = { path = "../../public_key", features = ["jwk"] } async-trait = "0.1.68" -serde = { version = "1.0.164", features = ["derive"] } -serde_json = "1.0.96" -base64 = "0.22.1" +serde = { workspace = true, features = ["derive"] } +serde_json.workspace = true +base64.workspace = true thiserror = "1.0.44" [dev-dependencies] diff --git a/did_core/did_methods/did_key/Cargo.toml b/did_core/did_methods/did_key/Cargo.toml index 61579bd793..afe05ab128 100644 --- a/did_core/did_methods/did_key/Cargo.toml +++ b/did_core/did_methods/did_key/Cargo.toml @@ -6,6 +6,6 @@ edition = "2021" [dependencies] public_key = { path = "../../public_key" } did_parser_nom = { path = "../../did_parser_nom" } -serde = "1.0.175" -serde_json = "1.0.103" +serde.workspace = true +serde_json.workspace = true thiserror = "1.0.44" diff --git a/did_core/did_methods/did_peer/Cargo.toml b/did_core/did_methods/did_peer/Cargo.toml index 7cbf19d9a0..6e46187063 100644 --- a/did_core/did_methods/did_peer/Cargo.toml +++ b/did_core/did_methods/did_peer/Cargo.toml @@ -12,11 +12,11 @@ did_resolver = { path = "../../did_resolver" } public_key = { path = "../../public_key" } thiserror = "1.0.40" regex = "1.8.4" -serde = { version = "1.0.164", features = ["derive"] } -serde_json = "1.0.96" +serde = { workspace = true, features = ["derive"] } +serde_json.workspace = true async-trait = "0.1.68" -base64 = "0.22.1" -bs58 = "0.5.0" +base64.workspace = true +bs58.workspace = true multibase = "0.9.1" unsigned-varint = "0.8.0" once_cell = "1.18.0" diff --git a/did_core/did_methods/did_resolver_sov/Cargo.toml b/did_core/did_methods/did_resolver_sov/Cargo.toml index 4384056e1f..a47f3a61cb 100644 --- a/did_core/did_methods/did_resolver_sov/Cargo.toml +++ b/did_core/did_methods/did_resolver_sov/Cargo.toml @@ -7,13 +7,13 @@ edition = "2021" did_resolver = { path = "../../did_resolver" } aries_vcx_ledger = { path = "../../../aries/aries_vcx_ledger" } async-trait = "0.1.68" -serde_json = "1.0.96" -serde = { version = "1.0.160", features = ["derive"] } +serde_json.workspace = true +serde = { workspace = true, features = ["derive"] } chrono = { version = "0.4.24", default-features = false } thiserror = "1.0.40" url = "2.3.1" log = "0.4.16" -bs58 = "0.5.0" +bs58.workspace = true [dev-dependencies] mockall = "0.13.0" diff --git a/did_core/did_methods/did_resolver_web/Cargo.toml b/did_core/did_methods/did_resolver_web/Cargo.toml index 16cd429759..e096be87c7 100644 --- a/did_core/did_methods/did_resolver_web/Cargo.toml +++ b/did_core/did_methods/did_resolver_web/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] did_resolver = { path = "../../did_resolver" } async-trait = "0.1.68" -serde_json = "1.0.96" +serde_json.workspace = true thiserror = "1.0.40" hyper = { version = "1.5.1" } hyper-tls = "0.6.0" diff --git a/did_core/did_parser_nom/Cargo.toml b/did_core/did_parser_nom/Cargo.toml index dfc4f9eb7e..cf59335de4 100644 --- a/did_core/did_parser_nom/Cargo.toml +++ b/did_core/did_parser_nom/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] nom = "7.1.3" -serde = "1.0.160" +serde.workspace = true log = "0.4.16" percent-encoding = "2" diff --git a/did_core/did_resolver/Cargo.toml b/did_core/did_resolver/Cargo.toml index de135ca6bb..6bedb1791b 100644 --- a/did_core/did_resolver/Cargo.toml +++ b/did_core/did_resolver/Cargo.toml @@ -11,6 +11,6 @@ did_parser_nom = { path = "../did_parser_nom" } did_doc = { path = "../did_doc" } async-trait = "0.1.68" chrono = { version = "0.4.24", default-features = false, features = ["serde"] } -serde = { version = "1.0.160", default-features = false, features = ["derive"] } -serde_json = "1.0.103" +serde = { workspace = true, default-features = false, features = ["derive"] } +serde_json.workspace = true typed-builder = "0.19.1" diff --git a/did_core/did_resolver_registry/Cargo.toml b/did_core/did_resolver_registry/Cargo.toml index c3b8d891d4..ab176b94ae 100644 --- a/did_core/did_resolver_registry/Cargo.toml +++ b/did_core/did_resolver_registry/Cargo.toml @@ -5,8 +5,8 @@ edition = "2021" [dependencies] did_resolver = { path = "../did_resolver" } -serde_json = "1.0.103" -serde = "1.0.174" +serde_json.workspace = true +serde.workspace = true async-trait = "0.1.72" [dev-dependencies] diff --git a/did_core/public_key/Cargo.toml b/did_core/public_key/Cargo.toml index c9baf690e7..d22d1d21ed 100644 --- a/did_core/public_key/Cargo.toml +++ b/did_core/public_key/Cargo.toml @@ -8,10 +8,10 @@ jwk = ["dep:askar-crypto"] [dependencies] thiserror = "1.0.40" -serde = { version = "1.0.164", features = ["derive"] } -serde_json = "1.0.96" -base64 = "0.22.1" -bs58 = "0.5.0" +serde = { workspace = true, features = ["derive"] } +serde_json.workspace = true +base64.workspace = true +bs58.workspace = true multibase = "0.9.1" unsigned-varint = "0.8.0" # askar-crypto used for jwk conversion. maintain minimal feature set diff --git a/misc/display_as_json/Cargo.toml b/misc/display_as_json/Cargo.toml index 3ab966b90e..5bd5cf0701 100644 --- a/misc/display_as_json/Cargo.toml +++ b/misc/display_as_json/Cargo.toml @@ -14,6 +14,5 @@ syn = "2.0.72" quote = "1.0" [dev-dependencies] -serde = "1.0" -serde_derive = "1.0" -serde_json = "1.0" +serde.workspace = true +serde_json.workspace = true diff --git a/misc/display_as_json/tests/demo.rs b/misc/display_as_json/tests/demo.rs index 7737f565cc..705ab3d60e 100644 --- a/misc/display_as_json/tests/demo.rs +++ b/misc/display_as_json/tests/demo.rs @@ -1,7 +1,7 @@ extern crate display_as_json; extern crate serde; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use crate::display_as_json::Display; From 14b9f8a45aef1036b98062be8abd3979384346cc Mon Sep 17 00:00:00 2001 From: gmulhearn Date: Tue, 31 Dec 2024 15:34:45 +1000 Subject: [PATCH 03/10] more common Signed-off-by: gmulhearn --- Cargo.lock | 37 ++++++++++--------- Cargo.toml | 33 +++++++++++++++++ aries/agents/aath-backchannel/Cargo.toml | 12 +++--- aries/agents/aries-vcx-agent/Cargo.toml | 10 ++--- aries/agents/mediator/Cargo.toml | 28 +++++++------- aries/agents/mediator/client-tui/Cargo.toml | 10 ++--- aries/aries_vcx/Cargo.toml | 34 ++++++++--------- aries/aries_vcx_anoncreds/Cargo.toml | 12 +++--- aries/aries_vcx_ledger/Cargo.toml | 23 ++++++------ aries/aries_vcx_wallet/Cargo.toml | 18 ++++----- aries/messages/Cargo.toml | 16 ++++---- aries/misc/anoncreds_types/Cargo.toml | 14 +++---- .../indy_ledger_response_parser/Cargo.toml | 6 +-- aries/misc/legacy/diddoc_legacy/Cargo.toml | 4 +- aries/misc/shared/Cargo.toml | 10 ++--- aries/misc/test_utils/Cargo.toml | 16 ++++---- .../wrappers/uniffi-aries-vcx/core/Cargo.toml | 12 +++--- did_core/did_doc/Cargo.toml | 12 +++--- did_core/did_methods/did_cheqd/Cargo.toml | 12 +++--- did_core/did_methods/did_jwk/Cargo.toml | 6 +-- did_core/did_methods/did_key/Cargo.toml | 2 +- did_core/did_methods/did_peer/Cargo.toml | 25 ++++++------- .../did_methods/did_resolver_sov/Cargo.toml | 16 ++++---- .../did_methods/did_resolver_web/Cargo.toml | 6 +-- did_core/did_parser_nom/Cargo.toml | 4 +- did_core/did_resolver/Cargo.toml | 6 +-- did_core/did_resolver_registry/Cargo.toml | 8 ++-- did_core/public_key/Cargo.toml | 6 +-- 28 files changed, 215 insertions(+), 183 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 38c9983beb..4eea6684f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -444,9 +444,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "arc-swap" @@ -476,7 +476,7 @@ dependencies = [ "askar-storage", "async-lock", "ciborium", - "env_logger 0.11.5", + "env_logger 0.11.6", "ffi-support", "log", "once_cell", @@ -520,10 +520,10 @@ dependencies = [ "clap 4.5.23", "derive_more", "display_as_json", - "env_logger 0.11.5", + "env_logger 0.11.6", "log", "rand", - "reqwest 0.12.9", + "reqwest 0.12.11", "serde", "serde_json", "uuid", @@ -552,7 +552,7 @@ dependencies = [ "did_resolver_registry", "did_resolver_sov", "diddoc_legacy", - "env_logger 0.11.5", + "env_logger 0.11.6", "futures", "lazy_static", "log", @@ -1338,7 +1338,7 @@ dependencies = [ "log", "mediator", "messages", - "reqwest 0.12.9", + "reqwest 0.12.11", "serde_json", "tokio", ] @@ -1798,7 +1798,7 @@ dependencies = [ "did_key", "did_parser_nom", "display_as_json", - "env_logger 0.11.5", + "env_logger 0.11.6", "hex", "log", "multibase", @@ -1844,7 +1844,7 @@ dependencies = [ name = "did_parser_nom" version = "0.1.0" dependencies = [ - "env_logger 0.11.5", + "env_logger 0.11.6", "log", "nom", "percent-encoding", @@ -1863,7 +1863,7 @@ dependencies = [ "did_parser_nom", "did_resolver", "display_as_json", - "env_logger 0.11.5", + "env_logger 0.11.6", "log", "multibase", "once_cell", @@ -2163,9 +2163,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0" dependencies = [ "anstream", "anstyle", @@ -3422,11 +3422,11 @@ dependencies = [ "chrono", "diddoc_legacy", "dotenvy", - "env_logger 0.11.5", + "env_logger 0.11.6", "futures", "log", "messages", - "reqwest 0.12.9", + "reqwest 0.12.11", "serde", "serde_json", "sqlx", @@ -4351,9 +4351,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.9" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" +checksum = "7fe060fe50f524be480214aba758c71f99f90ee8c83c5a36b5e9e1d568eb4eb3" dependencies = [ "base64 0.22.1", "bytes", @@ -4386,6 +4386,7 @@ dependencies = [ "system-configuration 0.6.1", "tokio", "tokio-native-tls", + "tower 0.5.2", "tower-service", "url", "wasm-bindgen", @@ -4743,7 +4744,7 @@ dependencies = [ "lazy_static", "log", "regex", - "reqwest 0.12.9", + "reqwest 0.12.11", "serde", "serde_json", "thiserror", @@ -5287,7 +5288,7 @@ dependencies = [ "async-trait", "chrono", "did_parser_nom", - "env_logger 0.11.5", + "env_logger 0.11.6", "indy-ledger-response-parser", "indy-vdr-proxy-client", "lazy_static", diff --git a/Cargo.toml b/Cargo.toml index e997efe818..fe6a4cdb45 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -83,14 +83,47 @@ indy-vdr = { git = "https://github.com/hyperledger/indy-vdr.git", tag = "v0.4.3" ] } indy-vdr-proxy-client = { git = "https://github.com/hyperledger/indy-vdr.git", tag = "v0.4.3" } anoncreds = { git = "https://github.com/hyperledger/anoncreds-rs.git", tag = "v0.2.0" } +anoncreds-clsignatures = "0.3.2" aries-askar = { version = "0.4.0" } askar-crypto = { version = "0.3.3", default-features = false } # common base64 = "0.22.1" bs58 = "0.5.1" +multibase = "0.9.1" serde = "1.0.217" serde_json = "1.0.134" +derive_more = "0.99.18" +async-trait = "0.1.83" +futures = "0.3.31" +log = "0.4.22" +url = "2.5.4" +uuid = "1.11.0" +chrono = "0.4.39" +typed-builder = "0.19.1" +thiserror = "1.0.69" +anyhow = "1.0.95" +regex = "1.11.1" +lazy_static = "1.5.0" +once_cell = "1.20.2" +rand = "0.8.5" +time = "0.3.37" +bitvec = "1.0.1" +sha2 = "0.10.8" +unsigned-varint = "0.8.0" +strum = "0.26.3" +strum_macros = "0.26.4" + +# common drivers +tokio = "1.42.0" +sqlx = "0.8.2" +reqwest = "0.12.11" +axum = "0.7.9" +axum-macros = "0.4.2" + +# common dev +mockall = "0.13.1" +env_logger = "0.11.6" # TODO - await new indy-vdr release [patch.'https://github.com/hyperledger/indy-vdr'] diff --git a/aries/agents/aath-backchannel/Cargo.toml b/aries/agents/aath-backchannel/Cargo.toml index e5f9159210..3a0377dbda 100644 --- a/aries/agents/aath-backchannel/Cargo.toml +++ b/aries/agents/aath-backchannel/Cargo.toml @@ -7,15 +7,15 @@ description = "Backchannel for aries-vcx" [dependencies] actix-web = "4" -derive_more = "0.99.14" +derive_more.workspace = true clap = { version = "4.5.6", features = ["derive"] } -reqwest = { version = "0.12.4", features = ["json", "multipart", "blocking"] } -rand = "0.8.5" +reqwest = { workspace = true, features = ["json", "multipart", "blocking"] } +rand.workspace = true serde.workspace = true serde_json.workspace = true -log = "^0.4.20" -env_logger = "0.11.3" -uuid = { version = "1.8.0", features = ["serde", "v4"] } +log.workspace = true +env_logger.workspace = true +uuid = { workspace = true, features = ["serde", "v4"] } aries-vcx-agent = { path = "../../../aries/agents/aries-vcx-agent" } anoncreds_types = { path = "../../../aries/misc/anoncreds_types" } display_as_json = { path = "../../../misc/display_as_json" } diff --git a/aries/agents/aries-vcx-agent/Cargo.toml b/aries/agents/aries-vcx-agent/Cargo.toml index 055f91dec2..6ef24d742f 100644 --- a/aries/agents/aries-vcx-agent/Cargo.toml +++ b/aries/agents/aries-vcx-agent/Cargo.toml @@ -21,9 +21,9 @@ did_resolver_sov = { path = "../../../did_core/did_methods/did_resolver_sov" } did_peer = { path = "../../../did_core/did_methods/did_peer" } did_key = { path = "../../../did_core/did_methods/did_key" } public_key = { path = "../../../did_core/public_key" } -async-trait = "0.1.64" -log = "0.4.17" -uuid = "1.2.1" -thiserror = "1.0.37" -url = { version = "2.3.1", features = ["serde"] } +async-trait.workspace = true +log.workspace = true +uuid.workspace = true +thiserror.workspace = true +url = { workspace = true, features = ["serde"] } display_as_json = { path = "../../../misc/display_as_json" } diff --git a/aries/agents/mediator/Cargo.toml b/aries/agents/mediator/Cargo.toml index fdac727f6e..2f9d97f1f2 100644 --- a/aries/agents/mediator/Cargo.toml +++ b/aries/agents/mediator/Cargo.toml @@ -10,31 +10,31 @@ default = ["client"] client = [] [dependencies] -anyhow = "1.0.75" +anyhow.workspace = true aries_vcx = { path = "../../aries_vcx" } aries_vcx_wallet = { path = "../../aries_vcx_wallet", features = [ "askar_wallet", ] } -async-trait = "0.1.73" -axum = "0.7.5" -axum-macros = "0.4.1" +async-trait.workspace = true +axum.workspace = true +axum-macros.workspace = true diddoc_legacy = { path = "../../misc/legacy/diddoc_legacy" } dotenvy = "0.15" -env_logger = "0.11.3" -futures = "0.3.28" -log = "0.4.20" +env_logger.workspace = true +futures.workspace = true +log.workspace = true messages = { path = "../../messages" } -reqwest = { version = "0.12.5", features = ["json"] } +reqwest = { workspace = true, features = ["json"] } serde.workspace = true serde_json.workspace = true -sqlx = { version = "0.8.2", features = ["mysql"] } -thiserror = "1.0.49" -tokio = { version = "1", features = ["rt-multi-thread", "macros"] } +sqlx = { workspace = true, features = ["mysql"] } +thiserror.workspace = true +tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } tower-http = { version = "0.5.2", features = ["catch-panic"] } -url = "2.4.1" -uuid = "1.4.1" +url.workspace = true +uuid.workspace = true test_utils = { path = "../../misc/test_utils" } base64-url = "3.0.0" [dev-dependencies] -chrono = "0.4.31" +chrono.workspace = true diff --git a/aries/agents/mediator/client-tui/Cargo.toml b/aries/agents/mediator/client-tui/Cargo.toml index dd9b56209a..fb6fec6fb3 100644 --- a/aries/agents/mediator/client-tui/Cargo.toml +++ b/aries/agents/mediator/client-tui/Cargo.toml @@ -9,13 +9,13 @@ edition = "2021" aries_vcx_wallet = { path = "../../../aries_vcx_wallet", features = [ "askar_wallet", ] } -axum = "0.7.5" +axum.workspace = true cursive = { version = "0.20.0", features = ["crossterm-backend"] } -futures = "0.3.28" -log = "0.4.20" +futures.workspace = true +log.workspace = true mediator = { path = ".." } messages = { path = "../../../messages" } -reqwest = "0.12.5" +reqwest.workspace = true serde_json.workspace = true -tokio = { version = "1", features = ["rt-multi-thread", "macros"] } +tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } diff --git a/aries/aries_vcx/Cargo.toml b/aries/aries_vcx/Cargo.toml index f69e767004..4f4ff82a85 100644 --- a/aries/aries_vcx/Cargo.toml +++ b/aries/aries_vcx/Cargo.toml @@ -41,32 +41,32 @@ public_key = { path = "../../did_core/public_key" } did_peer = { path = "../../did_core/did_methods/did_peer" } did_resolver_registry = { path = "../../did_core/did_resolver_registry" } bs58.workspace = true -async-trait = "0.1.53" -env_logger = "0.11.3" -log = "0.4.16" -chrono = "0.4.23" -time = "0.3.20" -lazy_static = "1.3" -rand = "0.8.5" +async-trait.workspace = true +env_logger.workspace = true +log.workspace = true +chrono.workspace = true +time.workspace = true +lazy_static.workspace = true +rand.workspace = true serde.workspace = true serde_json.workspace = true -regex = "1.1.0" +regex.workspace = true base64.workspace = true -sha2 = "0.10.7" +sha2.workspace = true num-bigint = "0.4.5" -futures = { version = "0.3", default-features = false } -uuid = { version = "1.4.1", default-features = false, features = ["v4"] } -strum = "0.26.3" -strum_macros = "0.26.4" +futures = { workspace = true, default-features = false } +uuid = { workspace = true, default-features = false, features = ["v4"] } +strum.workspace = true +strum_macros.workspace = true derive_builder = "0.20.0" -tokio = { version = "1.38.0" } -thiserror = "1.0.37" -url = { version = "2.3", features = ["serde"] } +tokio = { workspace = true } +thiserror.workspace = true +url = { workspace = true, features = ["serde"] } backtrace = { optional = true, version = "0.3" } [dev-dependencies] test_utils = { path = "../misc/test_utils" } async-channel = "2.3.1" -tokio = { version = "1.38", features = ["rt", "macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["rt", "macros", "rt-multi-thread"] } pretty_assertions = "1.4.0" did_resolver_sov = { path = "../../did_core/did_methods/did_resolver_sov" } diff --git a/aries/aries_vcx_anoncreds/Cargo.toml b/aries/aries_vcx_anoncreds/Cargo.toml index 7168b0bc55..5c5a59f6f1 100644 --- a/aries/aries_vcx_anoncreds/Cargo.toml +++ b/aries/aries_vcx_anoncreds/Cargo.toml @@ -16,11 +16,11 @@ anoncreds = { workspace = true, optional = true } aries_vcx_wallet = { path = "../aries_vcx_wallet" } anoncreds_types = { path = "../misc/anoncreds_types" } did_parser_nom = { path = "../../did_core/did_parser_nom" } -async-trait = "0.1.68" -thiserror = "1.0.40" -log = "0.4.17" -uuid = { version = "1.3.0", default-features = false, features = ["v4"] } +async-trait.workspace = true +thiserror.workspace = true +log.workspace = true +uuid = { workspace = true, default-features = false, features = ["v4"] } serde = { workspace = true, features = ["derive"] } serde_json.workspace = true -time = "0.3.20" -bitvec = "1.0.1" +time.workspace = true +bitvec.workspace = true diff --git a/aries/aries_vcx_ledger/Cargo.toml b/aries/aries_vcx_ledger/Cargo.toml index fca2edfe3e..4015f7d72c 100644 --- a/aries/aries_vcx_ledger/Cargo.toml +++ b/aries/aries_vcx_ledger/Cargo.toml @@ -15,29 +15,28 @@ cheqd = ["dep:did_cheqd", "dep:did_resolver", "dep:url"] aries_vcx_wallet = { path = "../aries_vcx_wallet" } anoncreds_types = { path = "../misc/anoncreds_types" } did_parser_nom = { path = "../../did_core/did_parser_nom" } -thiserror = "1.0.40" +thiserror.workspace = true indy-vdr.workspace = true indy-vdr-proxy-client = { workspace = true, optional = true } did_cheqd = { path = "../../did_core/did_methods/did_cheqd", optional = true } did_resolver = { path = "../../did_core/did_resolver", optional = true } -url = { version = "2.4.1", optional = true } +url = { workspace = true, optional = true } serde_json.workspace = true public_key = { path = "../../did_core/public_key" } -async-trait = "0.1.68" -time = "0.3.20" +async-trait.workspace = true +time.workspace = true indy-ledger-response-parser = { path = "../misc/indy_ledger_response_parser" } -log = "0.4.17" +log.workspace = true serde = { workspace = true, features = ["derive"] } lru = { version = "0.12.0" } -tokio = { version = "1.38" } -chrono = { version = "0.4", default-features = false, features = ["alloc"] } -bitvec = "1.0.1" +tokio = { workspace = true } +chrono = { workspace = true, default-features = false, features = ["alloc"] } +bitvec.workspace = true [dev-dependencies] -tokio = { version = "1.38.0", default-features = false, features = [ +tokio = { workspace = true, default-features = false, features = [ "macros", "rt", ] } -chrono = { version = "0.4", default-features = true } -mockall = "0.13.1" -uuid = { version = "1.4.1", default-features = false, features = ["v4"] } +mockall.workspace = true +uuid = { workspace = true, default-features = false, features = ["v4"] } diff --git a/aries/aries_vcx_wallet/Cargo.toml b/aries/aries_vcx_wallet/Cargo.toml index 27f7cedd4a..9961125324 100644 --- a/aries/aries_vcx_wallet/Cargo.toml +++ b/aries/aries_vcx_wallet/Cargo.toml @@ -11,20 +11,20 @@ edition.workspace = true askar_wallet = ["dep:aries-askar"] [dependencies] -anyhow = "1.0" +anyhow.workspace = true aries-askar = { workspace = true, optional = true } -async-trait = "0.1.68" +async-trait.workspace = true bs58.workspace = true base64.workspace = true -log = "0.4.17" +log.workspace = true serde = { workspace = true, features = ["derive"] } serde_json.workspace = true public_key = { path = "../../did_core/public_key" } -rand = "0.8.5" -thiserror = "1.0.40" -tokio = { version = "1.38" } -typed-builder = "0.19.1" -uuid = { version = "1.3.0", default-features = false, features = ["v4"] } +rand.workspace = true +thiserror.workspace = true +tokio = { workspace = true } +typed-builder.workspace = true +uuid = { workspace = true, default-features = false, features = ["v4"] } [dev-dependencies] -tokio = { version = "1.38", features = ["rt", "macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["rt", "macros", "rt-multi-thread"] } diff --git a/aries/messages/Cargo.toml b/aries/messages/Cargo.toml index 3a92594a18..35414ea98b 100644 --- a/aries/messages/Cargo.toml +++ b/aries/messages/Cargo.toml @@ -11,16 +11,16 @@ doctest = false [dependencies] serde = { workspace = true, features = ["derive"] } serde_json.workspace = true -chrono = { version = "0.4.23", features = ["serde"] } -lazy_static = "1.3" -url = { version = "2.3", features = ["serde"] } -strum = "0.26.3" -strum_macros = "0.26.4" -thiserror = "1.0.37" -derive_more = "0.99.17" +chrono = { workspace = true, features = ["serde"] } +lazy_static.workspace = true +url = { workspace = true, features = ["serde"] } +strum.workspace = true +strum_macros.workspace = true +thiserror.workspace = true +derive_more.workspace = true transitive = "1.0.1" isolang = { version = "2.2.0" } -typed-builder = "0.19.1" +typed-builder.workspace = true messages_macros = { path = "../messages_macros" } diddoc_legacy = { path = "../misc/legacy/diddoc_legacy" } shared = { path = "../misc/shared" } diff --git a/aries/misc/anoncreds_types/Cargo.toml b/aries/misc/anoncreds_types/Cargo.toml index b28d81d3d2..c0880c289d 100644 --- a/aries/misc/anoncreds_types/Cargo.toml +++ b/aries/misc/anoncreds_types/Cargo.toml @@ -13,14 +13,14 @@ ledger = [] default = ["messages", "ledger"] [dependencies] -anoncreds-clsignatures = "0.3.2" -bitvec = "1.0.1" -log = "0.4.22" -once_cell = "1.19.0" -regex = "1.10.5" +anoncreds-clsignatures.workspace = true +bitvec.workspace = true +log.workspace = true +once_cell.workspace = true +regex.workspace = true serde = { workspace = true, features = ["derive"] } serde_json.workspace = true -typed-builder = "0.19.1" +typed-builder.workspace = true [dev-dependencies] -rand = "0.8.5" +rand.workspace = true diff --git a/aries/misc/indy_ledger_response_parser/Cargo.toml b/aries/misc/indy_ledger_response_parser/Cargo.toml index 16296d1c0a..3ba5f60169 100644 --- a/aries/misc/indy_ledger_response_parser/Cargo.toml +++ b/aries/misc/indy_ledger_response_parser/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] serde = { workspace = true, features = ["derive"] } serde_json.workspace = true -time = "0.3.20" +time.workspace = true indy-vdr.workspace = true -thiserror = "1.0.44" -anoncreds-clsignatures = "0.3.2" +thiserror.workspace = true +anoncreds-clsignatures.workspace = true diff --git a/aries/misc/legacy/diddoc_legacy/Cargo.toml b/aries/misc/legacy/diddoc_legacy/Cargo.toml index 604fbd3bde..3280f8ac87 100644 --- a/aries/misc/legacy/diddoc_legacy/Cargo.toml +++ b/aries/misc/legacy/diddoc_legacy/Cargo.toml @@ -11,8 +11,8 @@ doctest = false [dependencies] serde.workspace = true serde_json.workspace = true -url = { version = "2.3", features = ["serde"] } -thiserror = "1.0.37" +url = { workspace = true, features = ["serde"] } +thiserror.workspace = true shared = { path = "../../shared" } display_as_json = { path = "../../../../misc/display_as_json" } diff --git a/aries/misc/shared/Cargo.toml b/aries/misc/shared/Cargo.toml index cfde918fd6..c3f8c188f4 100644 --- a/aries/misc/shared/Cargo.toml +++ b/aries/misc/shared/Cargo.toml @@ -9,11 +9,11 @@ license.workspace = true doctest = false [dependencies] -lazy_static = "1.3" -regex = "1.1.0" -thiserror = "1.0.37" +lazy_static.workspace = true +regex.workspace = true +thiserror.workspace = true bs58.workspace = true serde = { workspace = true, features = ["derive"] } serde_json.workspace = true -reqwest = "0.12.5" -log = "0.4.17" +reqwest.workspace = true +log.workspace = true diff --git a/aries/misc/test_utils/Cargo.toml b/aries/misc/test_utils/Cargo.toml index 38a215dd4f..c9d9ea37dd 100644 --- a/aries/misc/test_utils/Cargo.toml +++ b/aries/misc/test_utils/Cargo.toml @@ -27,12 +27,12 @@ aries_vcx_ledger = { path = "../../aries_vcx_ledger" } public_key = { path = "../../../did_core/public_key" } indy-ledger-response-parser = { path = "../indy_ledger_response_parser", optional = true } indy-vdr-proxy-client = { workspace = true, optional = true } -lazy_static = "1" +lazy_static.workspace = true serde_json.workspace = true -rand = "0.8" -uuid = { version = "1", default-features = false, features = ["v4"] } -async-trait = "0.1" -chrono = "0.4" -env_logger = "0.11.3" -log = "0.4" -thiserror = "1.0.40" +rand.workspace = true +uuid = { workspace = true, default-features = false, features = ["v4"] } +async-trait.workspace = true +chrono.workspace = true +env_logger.workspace = true +log.workspace = true +thiserror.workspace = true diff --git a/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml b/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml index d09386f240..ae0534f69a 100644 --- a/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml +++ b/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml @@ -24,18 +24,18 @@ aries_vcx = { path = "../../../aries_vcx", features = [ aries_vcx_ledger = { path = "../../../aries_vcx_ledger" } aries_vcx_anoncreds = { path = "../../../aries_vcx_anoncreds" } indy-vdr.workspace = true -tokio = { version = "1.38.0", features = ["rt-multi-thread"] } -once_cell = "1.17.0" -thiserror = "1.0.38" +tokio = { workspace = true, features = ["rt-multi-thread"] } +once_cell.workspace = true +thiserror.workspace = true serde_json.workspace = true serde = { workspace = true, features = ["derive"] } -async-trait = "0.1.64" +async-trait.workspace = true did_parser_nom = { path = "../../../../did_core/did_parser_nom" } diddoc_legacy = { path = "../../../misc/legacy/diddoc_legacy" } shared = { path = "../../../misc/shared" } -url = "2.3.1" +url.workspace = true android_logger = "0.14.1" -log = "0.4.16" +log.workspace = true [build-dependencies] uniffi = { version = "0.23.0", features = ["build", "cli"] } diff --git a/did_core/did_doc/Cargo.toml b/did_core/did_doc/Cargo.toml index edd73a1e89..ba1bc54844 100644 --- a/did_core/did_doc/Cargo.toml +++ b/did_core/did_doc/Cargo.toml @@ -12,19 +12,19 @@ bs58.workspace = true did_parser_nom = { path = "../did_parser_nom" } public_key = { path = "../public_key" } hex = "0.4.3" -multibase = "0.9.1" +multibase.workspace = true pem = "3.0.4" serde = { workspace = true, default-features = false, features = ["derive"] } serde_json.workspace = true uniresid = { version = "0.1.4", default-features = false, features = ["serde"] } -url = { version = "2.3.1", features = ["serde"] } +url = { workspace = true, features = ["serde"] } display_as_json = { path = "../../misc/display_as_json" } did_key = { path = "../did_methods/did_key" } -thiserror = "1.0.40" -typed-builder = "0.19.1" -log = "0.4" +thiserror.workspace = true +typed-builder.workspace = true +log.workspace = true [dev-dependencies] pretty_assertions = "1.4.0" -env_logger = "0.11.3" +env_logger.workspace = true diff --git a/did_core/did_methods/did_cheqd/Cargo.toml b/did_core/did_methods/did_cheqd/Cargo.toml index 509b818fba..8e3d48f8cb 100644 --- a/did_core/did_methods/did_cheqd/Cargo.toml +++ b/did_core/did_methods/did_cheqd/Cargo.toml @@ -23,17 +23,17 @@ native-tls = { version = "0.2.12", features = ["alpn"] } hyper-tls = "0.6.0" hyper-util = { version = "0.1.10", features = ["client-legacy", "http2"] } http-body-util = "0.1.2" -async-trait = "0.1.68" +async-trait.workspace = true serde_json.workspace = true serde = { workspace = true, features = ["derive"] } -thiserror = "1.0.40" -tokio = { version = "1.38.0" } -chrono = { version = "0.4.24", default-features = false, features = ["now"] } -url = { version = "2.3.1", default-features = false } +thiserror.workspace = true +tokio = { workspace = true } +chrono = { workspace = true, default-features = false, features = ["now"] } +url = { workspace = true, default-features = false } bytes = "1.8.0" [dev-dependencies] -tokio = { version = "1.38.0", default-features = false, features = [ +tokio = { workspace = true, default-features = false, features = [ "macros", "rt", ] } diff --git a/did_core/did_methods/did_jwk/Cargo.toml b/did_core/did_methods/did_jwk/Cargo.toml index d45bdf3618..c04445c96b 100644 --- a/did_core/did_methods/did_jwk/Cargo.toml +++ b/did_core/did_methods/did_jwk/Cargo.toml @@ -8,11 +8,11 @@ did_parser_nom = { path = "../../did_parser_nom" } did_doc = { path = "../../did_doc" } did_resolver = { path = "../../did_resolver" } public_key = { path = "../../public_key", features = ["jwk"] } -async-trait = "0.1.68" +async-trait.workspace = true serde = { workspace = true, features = ["derive"] } serde_json.workspace = true base64.workspace = true -thiserror = "1.0.44" +thiserror.workspace = true [dev-dependencies] -tokio = { version = "1.38.0", default-features = false, features = ["macros", "rt"] } +tokio = { workspace = true, default-features = false, features = ["macros", "rt"] } diff --git a/did_core/did_methods/did_key/Cargo.toml b/did_core/did_methods/did_key/Cargo.toml index afe05ab128..4199e30541 100644 --- a/did_core/did_methods/did_key/Cargo.toml +++ b/did_core/did_methods/did_key/Cargo.toml @@ -8,4 +8,4 @@ public_key = { path = "../../public_key" } did_parser_nom = { path = "../../did_parser_nom" } serde.workspace = true serde_json.workspace = true -thiserror = "1.0.44" +thiserror.workspace = true diff --git a/did_core/did_methods/did_peer/Cargo.toml b/did_core/did_methods/did_peer/Cargo.toml index 6e46187063..b2c3bd30e1 100644 --- a/did_core/did_methods/did_peer/Cargo.toml +++ b/did_core/did_methods/did_peer/Cargo.toml @@ -10,24 +10,23 @@ did_parser_nom = { path = "../../did_parser_nom" } did_doc = { path = "../../did_doc" } did_resolver = { path = "../../did_resolver" } public_key = { path = "../../public_key" } -thiserror = "1.0.40" -regex = "1.8.4" +thiserror.workspace = true +regex.workspace = true serde = { workspace = true, features = ["derive"] } serde_json.workspace = true -async-trait = "0.1.68" +async-trait.workspace = true base64.workspace = true bs58.workspace = true -multibase = "0.9.1" -unsigned-varint = "0.8.0" -once_cell = "1.18.0" -sha2 = "0.10.8" -log = "0.4.16" -url = { version = "2.3.1", features = ["serde"] } +multibase.workspace = true +unsigned-varint.workspace = true +once_cell.workspace = true +sha2.workspace = true +log.workspace = true +url = { workspace = true, features = ["serde"] } display_as_json = { path = "../../../misc/display_as_json" } -typed-builder = "0.19.1" +typed-builder.workspace = true [dev-dependencies] -tokio = { version = "1.38.0", default-features = false, features = ["macros", "rt"] } +tokio = { workspace = true, default-features = false, features = ["macros", "rt"] } pretty_assertions = "1.4.0" -env_logger = "0.11.3" -log = "0.4" +env_logger.workspace = true diff --git a/did_core/did_methods/did_resolver_sov/Cargo.toml b/did_core/did_methods/did_resolver_sov/Cargo.toml index a47f3a61cb..0367524d58 100644 --- a/did_core/did_methods/did_resolver_sov/Cargo.toml +++ b/did_core/did_methods/did_resolver_sov/Cargo.toml @@ -6,19 +6,19 @@ edition = "2021" [dependencies] did_resolver = { path = "../../did_resolver" } aries_vcx_ledger = { path = "../../../aries/aries_vcx_ledger" } -async-trait = "0.1.68" +async-trait.workspace = true serde_json.workspace = true serde = { workspace = true, features = ["derive"] } -chrono = { version = "0.4.24", default-features = false } -thiserror = "1.0.40" -url = "2.3.1" -log = "0.4.16" +chrono = { workspace = true, default-features = false } +thiserror.workspace = true +url.workspace = true +log.workspace = true bs58.workspace = true [dev-dependencies] -mockall = "0.13.0" +mockall.workspace = true aries_vcx = { path = "../../../aries/aries_vcx" } -tokio = { version = "1.38.0", default-features = false, features = ["macros", "rt"] } -uuid = "1.3.1" +tokio = { workspace = true, default-features = false, features = ["macros", "rt"] } +uuid.workspace = true test_utils = {path = "../../../aries/misc/test_utils", features = ["askar_wallet"] } aries_vcx_wallet = { path = "../../../aries/aries_vcx_wallet" } diff --git a/did_core/did_methods/did_resolver_web/Cargo.toml b/did_core/did_methods/did_resolver_web/Cargo.toml index e096be87c7..8579c1adb2 100644 --- a/did_core/did_methods/did_resolver_web/Cargo.toml +++ b/did_core/did_methods/did_resolver_web/Cargo.toml @@ -7,9 +7,9 @@ edition = "2021" [dependencies] did_resolver = { path = "../../did_resolver" } -async-trait = "0.1.68" +async-trait.workspace = true serde_json.workspace = true -thiserror = "1.0.40" +thiserror.workspace = true hyper = { version = "1.5.1" } hyper-tls = "0.6.0" hyper-util = { version = "0.1.10", features = ["client-legacy", "http1", "http2"] } @@ -18,7 +18,7 @@ http-body-util = "0.1.2" [dev-dependencies] hyper = { version = "1.5.1", features = ["server"] } hyper-util = { version = "0.1.10", features = ["server"] } -tokio = { version = "1.38.0", default-features = false, features = [ +tokio = { workspace = true, default-features = false, features = [ "macros", "rt", ] } diff --git a/did_core/did_parser_nom/Cargo.toml b/did_core/did_parser_nom/Cargo.toml index cf59335de4..8a67d3b53f 100644 --- a/did_core/did_parser_nom/Cargo.toml +++ b/did_core/did_parser_nom/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" [dependencies] nom = "7.1.3" serde.workspace = true -log = "0.4.16" +log.workspace = true percent-encoding = "2" [dev-dependencies] serde_test = "1.0.176" -env_logger = "0.11.3" +env_logger.workspace = true diff --git a/did_core/did_resolver/Cargo.toml b/did_core/did_resolver/Cargo.toml index 6bedb1791b..4b354b7b77 100644 --- a/did_core/did_resolver/Cargo.toml +++ b/did_core/did_resolver/Cargo.toml @@ -9,8 +9,8 @@ default = [] [dependencies] did_parser_nom = { path = "../did_parser_nom" } did_doc = { path = "../did_doc" } -async-trait = "0.1.68" -chrono = { version = "0.4.24", default-features = false, features = ["serde"] } +async-trait.workspace = true +chrono = { workspace = true, default-features = false, features = ["serde"] } serde = { workspace = true, default-features = false, features = ["derive"] } serde_json.workspace = true -typed-builder = "0.19.1" +typed-builder.workspace = true diff --git a/did_core/did_resolver_registry/Cargo.toml b/did_core/did_resolver_registry/Cargo.toml index ab176b94ae..e4420c6c0d 100644 --- a/did_core/did_resolver_registry/Cargo.toml +++ b/did_core/did_resolver_registry/Cargo.toml @@ -7,9 +7,9 @@ edition = "2021" did_resolver = { path = "../did_resolver" } serde_json.workspace = true serde.workspace = true -async-trait = "0.1.72" +async-trait.workspace = true [dev-dependencies] -tokio = { version = "1.38.0", default-features = false, features = ["macros", "rt"] } -mockall = "0.13.0" -async-trait = "0.1.68" +tokio = { workspace = true, default-features = false, features = ["macros", "rt"] } +mockall.workspace = true +async-trait.workspace = true diff --git a/did_core/public_key/Cargo.toml b/did_core/public_key/Cargo.toml index d22d1d21ed..ef75b155ce 100644 --- a/did_core/public_key/Cargo.toml +++ b/did_core/public_key/Cargo.toml @@ -7,13 +7,13 @@ edition = "2021" jwk = ["dep:askar-crypto"] [dependencies] -thiserror = "1.0.40" +thiserror.workspace = true serde = { workspace = true, features = ["derive"] } serde_json.workspace = true base64.workspace = true bs58.workspace = true -multibase = "0.9.1" -unsigned-varint = "0.8.0" +multibase.workspace = true +unsigned-varint.workspace = true # askar-crypto used for jwk conversion. maintain minimal feature set askar-crypto = { workspace = true, features = [ "std", From 14c0dc184fd12e9bb53294eb869983a1685c1c7f Mon Sep 17 00:00:00 2001 From: gmulhearn Date: Tue, 31 Dec 2024 15:40:43 +1000 Subject: [PATCH 04/10] common Signed-off-by: gmulhearn --- Cargo.lock | 100 +++++++++--------- Cargo.toml | 8 ++ aries/agents/mediator/Cargo.toml | 2 +- aries/messages_macros/Cargo.toml | 4 +- .../wrappers/uniffi-aries-vcx/core/Cargo.toml | 4 +- .../did_methods/did_resolver_web/Cargo.toml | 12 +-- misc/display_as_json/Cargo.toml | 4 +- 7 files changed, 71 insertions(+), 63 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4eea6684f4..04cb08a134 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -65,7 +65,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -182,7 +182,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -800,7 +800,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -811,7 +811,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -909,7 +909,7 @@ checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -1309,7 +1309,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -1639,7 +1639,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -1663,7 +1663,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -1674,7 +1674,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -1741,7 +1741,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -1751,7 +1751,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -1764,7 +1764,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -1980,7 +1980,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -1991,7 +1991,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -2101,7 +2101,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -2122,7 +2122,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -2452,7 +2452,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -3040,7 +3040,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -3475,7 +3475,7 @@ dependencies = [ "proc-macro2", "quote", "shared", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -3567,7 +3567,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -3774,7 +3774,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -3975,7 +3975,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -4104,7 +4104,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -4175,7 +4175,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.90", + "syn 2.0.93", "tempfile", ] @@ -4189,7 +4189,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -4217,9 +4217,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -4583,7 +4583,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -4658,7 +4658,7 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -4948,7 +4948,7 @@ dependencies = [ "quote", "sqlx-core", "sqlx-macros-core", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -4971,7 +4971,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 2.0.90", + "syn 2.0.93", "tempfile", "tokio", "url", @@ -5134,7 +5134,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -5156,9 +5156,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.90" +version = "2.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" +checksum = "9c786062daee0d6db1132800e623df74274a0a87322d8e183338e01b3d98d058" dependencies = [ "proc-macro2", "quote", @@ -5188,7 +5188,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -5323,7 +5323,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -5410,7 +5410,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -5522,7 +5522,7 @@ dependencies = [ "prost-build", "prost-types", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -5563,9 +5563,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.5.2" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697" dependencies = [ "bitflags 2.6.0", "bytes", @@ -5611,7 +5611,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -5631,7 +5631,7 @@ checksum = "cea6980daec8f45217d2cc7205c62578c8f2a8b830a4f381949347a0bc1425b4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -5657,7 +5657,7 @@ checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -5988,7 +5988,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", "wasm-bindgen-shared", ] @@ -6023,7 +6023,7 @@ checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6364,7 +6364,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", "synstructure", ] @@ -6386,7 +6386,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -6406,7 +6406,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", "synstructure", ] @@ -6427,7 +6427,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] @@ -6458,7 +6458,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.93", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index fe6a4cdb45..b76eabb9b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -113,6 +113,8 @@ sha2 = "0.10.8" unsigned-varint = "0.8.0" strum = "0.26.3" strum_macros = "0.26.4" +syn = "2.0.93" +quote = "1.0.38" # common drivers tokio = "1.42.0" @@ -120,10 +122,16 @@ sqlx = "0.8.2" reqwest = "0.12.11" axum = "0.7.9" axum-macros = "0.4.2" +tower-http = "0.6.2" +hyper= "1.5.2" +hyper-tls = "0.6.0" +hyper-util = "0.1.10" +http-body-util = "0.1.2" # common dev mockall = "0.13.1" env_logger = "0.11.6" +uniffi = "0.23.0" # TODO - await new indy-vdr release [patch.'https://github.com/hyperledger/indy-vdr'] diff --git a/aries/agents/mediator/Cargo.toml b/aries/agents/mediator/Cargo.toml index 2f9d97f1f2..12dda61973 100644 --- a/aries/agents/mediator/Cargo.toml +++ b/aries/agents/mediator/Cargo.toml @@ -30,7 +30,7 @@ serde_json.workspace = true sqlx = { workspace = true, features = ["mysql"] } thiserror.workspace = true tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } -tower-http = { version = "0.5.2", features = ["catch-panic"] } +tower-http = { workspace = true, features = ["catch-panic"] } url.workspace = true uuid.workspace = true test_utils = { path = "../../misc/test_utils" } diff --git a/aries/messages_macros/Cargo.toml b/aries/messages_macros/Cargo.toml index b2cfcc37ce..612a971e89 100644 --- a/aries/messages_macros/Cargo.toml +++ b/aries/messages_macros/Cargo.toml @@ -10,7 +10,7 @@ proc-macro = true [dependencies] proc-macro2 = "1.0.58" -quote = "1.0.27" -syn = "2.0.16" +quote.workspace = true +syn.workspace = true darling = "0.20.1" shared = { path = "../misc/shared" } diff --git a/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml b/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml index ae0534f69a..e2813ec957 100644 --- a/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml +++ b/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml @@ -16,7 +16,7 @@ path = "uniffi-bindgen.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -uniffi = { version = "0.23.0", features = ["cli"] } +uniffi = { workspace = true, features = ["cli"] } aries_vcx = { path = "../../../aries_vcx", features = [ "anoncreds", "askar_wallet" @@ -38,4 +38,4 @@ android_logger = "0.14.1" log.workspace = true [build-dependencies] -uniffi = { version = "0.23.0", features = ["build", "cli"] } +uniffi = { workspace = true, features = ["build", "cli"] } diff --git a/did_core/did_methods/did_resolver_web/Cargo.toml b/did_core/did_methods/did_resolver_web/Cargo.toml index 8579c1adb2..e4179e7b0d 100644 --- a/did_core/did_methods/did_resolver_web/Cargo.toml +++ b/did_core/did_methods/did_resolver_web/Cargo.toml @@ -10,14 +10,14 @@ did_resolver = { path = "../../did_resolver" } async-trait.workspace = true serde_json.workspace = true thiserror.workspace = true -hyper = { version = "1.5.1" } -hyper-tls = "0.6.0" -hyper-util = { version = "0.1.10", features = ["client-legacy", "http1", "http2"] } -http-body-util = "0.1.2" +hyper.workspace = true +hyper-tls.workspace = true +hyper-util = { workspace = true, features = ["client-legacy", "http1", "http2"] } +http-body-util.workspace = true [dev-dependencies] -hyper = { version = "1.5.1", features = ["server"] } -hyper-util = { version = "0.1.10", features = ["server"] } +hyper = { workspace = true, features = ["server"] } +hyper-util = { workspace = true, features = ["server"] } tokio = { workspace = true, default-features = false, features = [ "macros", "rt", diff --git a/misc/display_as_json/Cargo.toml b/misc/display_as_json/Cargo.toml index 5bd5cf0701..83c9201ec7 100644 --- a/misc/display_as_json/Cargo.toml +++ b/misc/display_as_json/Cargo.toml @@ -10,8 +10,8 @@ license = "MIT" proc-macro = true [dependencies] -syn = "2.0.72" -quote = "1.0" +syn.workspace = true +quote.workspace = true [dev-dependencies] serde.workspace = true From fef2e9f65ecfee4ad25194e7838de0f7e4defb81 Mon Sep 17 00:00:00 2001 From: gmulhearn Date: Tue, 31 Dec 2024 15:47:00 +1000 Subject: [PATCH 05/10] update some common major vers Signed-off-by: gmulhearn --- Cargo.lock | 121 ++++++++++++++------- Cargo.toml | 6 +- aries/agents/aath-backchannel/Cargo.toml | 12 +- aries/agents/aath-backchannel/src/error.rs | 20 ++-- aries/messages/Cargo.toml | 7 +- 5 files changed, 113 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 04cb08a134..3ea26cae20 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -35,7 +35,7 @@ dependencies = [ "brotli", "bytes", "bytestring", - "derive_more", + "derive_more 0.99.18", "encoding_rs", "flate2", "futures-core", @@ -151,7 +151,7 @@ dependencies = [ "bytestring", "cfg-if", "cookie", - "derive_more", + "derive_more 0.99.18", "encoding_rs", "futures-core", "futures-util", @@ -336,7 +336,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror", + "thiserror 1.0.69", "zeroize", ] @@ -505,7 +505,7 @@ dependencies = [ "serde", "serde_json", "shared", - "thiserror", + "thiserror 2.0.9", "url", "uuid", ] @@ -518,7 +518,7 @@ dependencies = [ "anoncreds_types", "aries-vcx-agent", "clap 4.5.23", - "derive_more", + "derive_more 1.0.0", "display_as_json", "env_logger 0.11.6", "log", @@ -569,7 +569,7 @@ dependencies = [ "strum", "strum_macros", "test_utils", - "thiserror", + "thiserror 2.0.9", "time", "tokio", "url", @@ -589,7 +589,7 @@ dependencies = [ "log", "serde", "serde_json", - "thiserror", + "thiserror 2.0.9", "time", "uuid", ] @@ -615,7 +615,7 @@ dependencies = [ "public_key", "serde", "serde_json", - "thiserror", + "thiserror 2.0.9", "time", "tokio", "url", @@ -636,7 +636,7 @@ dependencies = [ "rand", "serde", "serde_json", - "thiserror", + "thiserror 2.0.9", "tokio", "typed-builder", "uuid", @@ -1135,7 +1135,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1767,6 +1767,27 @@ dependencies = [ "syn 2.0.93", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.93", + "unicode-xid", +] + [[package]] name = "did_cheqd" version = "0.1.0" @@ -1783,7 +1804,7 @@ dependencies = [ "prost-types", "serde", "serde_json", - "thiserror", + "thiserror 2.0.9", "tokio", "tonic", "url", @@ -1807,7 +1828,7 @@ dependencies = [ "public_key", "serde", "serde_json", - "thiserror", + "thiserror 2.0.9", "typed-builder", "uniresid", "url", @@ -1825,7 +1846,7 @@ dependencies = [ "public_key", "serde", "serde_json", - "thiserror", + "thiserror 2.0.9", "tokio", ] @@ -1837,7 +1858,7 @@ dependencies = [ "public_key", "serde", "serde_json", - "thiserror", + "thiserror 2.0.9", ] [[package]] @@ -1873,7 +1894,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror", + "thiserror 2.0.9", "tokio", "typed-builder", "unsigned-varint", @@ -1921,7 +1942,7 @@ dependencies = [ "serde", "serde_json", "test_utils", - "thiserror", + "thiserror 2.0.9", "tokio", "url", "uuid", @@ -1938,7 +1959,7 @@ dependencies = [ "hyper-tls", "hyper-util", "serde_json", - "thiserror", + "thiserror 2.0.9", "tokio", "tokio-test", ] @@ -1951,7 +1972,7 @@ dependencies = [ "serde", "serde_json", "shared", - "thiserror", + "thiserror 2.0.9", "url", ] @@ -3126,7 +3147,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror", + "thiserror 1.0.69", "x25519-dalek", "zeroize", ] @@ -3139,7 +3160,7 @@ dependencies = [ "indy-vdr", "serde", "serde_json", - "thiserror", + "thiserror 2.0.9", "time", ] @@ -3171,7 +3192,7 @@ dependencies = [ "sha2", "sha3", "sled", - "thiserror", + "thiserror 1.0.69", "time", "url", "zmq", @@ -3431,7 +3452,7 @@ dependencies = [ "serde_json", "sqlx", "test_utils", - "thiserror", + "thiserror 2.0.9", "tokio", "tower-http", "url", @@ -3449,7 +3470,7 @@ name = "messages" version = "0.67.0" dependencies = [ "chrono", - "derive_more", + "derive_more 1.0.0", "did_parser_nom", "diddoc_legacy", "display_as_json", @@ -3461,7 +3482,7 @@ dependencies = [ "shared", "strum", "strum_macros", - "thiserror", + "thiserror 2.0.9", "transitive", "typed-builder", "url", @@ -4211,7 +4232,7 @@ dependencies = [ "multibase", "serde", "serde_json", - "thiserror", + "thiserror 2.0.9", "unsigned-varint", ] @@ -4747,7 +4768,7 @@ dependencies = [ "reqwest 0.12.11", "serde", "serde_json", - "thiserror", + "thiserror 2.0.9", ] [[package]] @@ -4930,7 +4951,7 @@ dependencies = [ "sha2", "smallvec", "sqlformat", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -5015,7 +5036,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror", + "thiserror 1.0.69", "tracing", "whoami", ] @@ -5054,7 +5075,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror", + "thiserror 1.0.69", "tracing", "whoami", ] @@ -5296,7 +5317,7 @@ dependencies = [ "public_key", "rand", "serde_json", - "thiserror", + "thiserror 2.0.9", "uuid", ] @@ -5312,7 +5333,16 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +dependencies = [ + "thiserror-impl 2.0.9", ] [[package]] @@ -5326,6 +5356,17 @@ dependencies = [ "syn 2.0.93", ] +[[package]] +name = "thiserror-impl" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.93", +] + [[package]] name = "time" version = "0.3.37" @@ -5642,18 +5683,18 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typed-builder" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06fbd5b8de54c5f7c91f6fe4cebb949be2125d7758e630bb58b1d831dbce600" +checksum = "7e14ed59dc8b7b26cacb2a92bad2e8b1f098806063898ab42a3bd121d7d45e75" dependencies = [ "typed-builder-macro", ] [[package]] name = "typed-builder-macro" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8" +checksum = "560b82d656506509d43abe30e0ba64c56b1953ab3d4fe7ba5902747a7a3cedd5" dependencies = [ "proc-macro2", "quote", @@ -5711,6 +5752,12 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "unicode_categories" version = "0.1.1" @@ -5749,7 +5796,7 @@ dependencies = [ "serde", "serde_json", "shared", - "thiserror", + "thiserror 2.0.9", "tokio", "uniffi", "url", @@ -5869,7 +5916,7 @@ checksum = "995a4007fbec4f43386ea1b1d81d42d986a0c9616378e9aa4a96f45ea661e1b0" dependencies = [ "once_cell", "serde", - "thiserror", + "thiserror 1.0.69", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index b76eabb9b8..aa73865833 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -93,15 +93,15 @@ bs58 = "0.5.1" multibase = "0.9.1" serde = "1.0.217" serde_json = "1.0.134" -derive_more = "0.99.18" +derive_more = "1.0.0" async-trait = "0.1.83" futures = "0.3.31" log = "0.4.22" url = "2.5.4" uuid = "1.11.0" chrono = "0.4.39" -typed-builder = "0.19.1" -thiserror = "1.0.69" +typed-builder = "0.20.0" +thiserror = "2.0.9" anyhow = "1.0.95" regex = "1.11.1" lazy_static = "1.5.0" diff --git a/aries/agents/aath-backchannel/Cargo.toml b/aries/agents/aath-backchannel/Cargo.toml index 3a0377dbda..48bd27050a 100644 --- a/aries/agents/aath-backchannel/Cargo.toml +++ b/aries/agents/aath-backchannel/Cargo.toml @@ -2,12 +2,20 @@ name = "aries-vcx-backchannel" version = "0.1.0" edition = "2018" -authors = ["Absa Group Limited", "Hyperledger Indy Contributors "] +authors = [ + "Absa Group Limited", + "Hyperledger Indy Contributors ", +] description = "Backchannel for aries-vcx" [dependencies] +derive_more = { workspace = true, features = [ + "from", + "try_into", + "display", + "error", +] } actix-web = "4" -derive_more.workspace = true clap = { version = "4.5.6", features = ["derive"] } reqwest = { workspace = true, features = ["json", "multipart", "blocking"] } rand.workspace = true diff --git a/aries/agents/aath-backchannel/src/error.rs b/aries/agents/aath-backchannel/src/error.rs index 62678f20d7..97f4a932cc 100644 --- a/aries/agents/aath-backchannel/src/error.rs +++ b/aries/agents/aath-backchannel/src/error.rs @@ -10,28 +10,28 @@ pub type HarnessResult = Result; #[derive(Debug, Display, Error, Clone)] pub enum HarnessErrorType { - #[display(fmt = "Internal server error")] + #[display("Internal server error")] InternalServerError, - #[display(fmt = "Request not accepted")] + #[display("Request not accepted")] RequestNotAcceptedError, - #[display(fmt = "Request not received")] + #[display("Request not received")] RequestNotReceived, - #[display(fmt = "Not found")] + #[display("Not found")] NotFoundError, - #[display(fmt = "Invalid JSON")] + #[display("Invalid JSON")] InvalidJson, - #[display(fmt = "Protocol error")] + #[display("Protocol error")] ProtocolError, - #[display(fmt = "Invalid state for requested operation")] + #[display("Invalid state for requested operation")] InvalidState, - #[display(fmt = "Encryption error")] + #[display("Encryption error")] EncryptionError, - #[display(fmt = "Multiple credential definitions found")] + #[display("Multiple credential definitions found")] MultipleCredDefinitions, } #[derive(Debug, Display, Error, Clone)] -#[display(fmt = "Error: {}", message)] +#[display("Error: {}", message)] pub struct HarnessError { pub message: String, pub kind: HarnessErrorType, diff --git a/aries/messages/Cargo.toml b/aries/messages/Cargo.toml index 35414ea98b..960c19fbe2 100644 --- a/aries/messages/Cargo.toml +++ b/aries/messages/Cargo.toml @@ -17,7 +17,12 @@ url = { workspace = true, features = ["serde"] } strum.workspace = true strum_macros.workspace = true thiserror.workspace = true -derive_more.workspace = true +derive_more = { workspace = true, features = [ + "from", + "try_from", + "display", + "error", +] } transitive = "1.0.1" isolang = { version = "2.2.0" } typed-builder.workspace = true From 18ff5011ca8e09d9bb99b8bc3d786338ccac262e Mon Sep 17 00:00:00 2001 From: gmulhearn Date: Tue, 31 Dec 2024 15:47:49 +1000 Subject: [PATCH 06/10] another cargo update Signed-off-by: gmulhearn --- Cargo.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3ea26cae20..90ef22e88d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1149,9 +1149,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.4" +version = "1.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf" +checksum = "8d6dbb628b8f8555f86d0323c2eb39e3ec81901f4b83e091db8a6a76d316a333" dependencies = [ "jobserver", "libc", @@ -2148,9 +2148,9 @@ dependencies = [ [[package]] name = "env_filter" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" dependencies = [ "log", "regex", @@ -2301,9 +2301,9 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "fixedbitset" -version = "0.4.2" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" [[package]] name = "flate2" @@ -2334,9 +2334,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "foldhash" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" +checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" [[package]] name = "foreign-types" @@ -2569,9 +2569,9 @@ dependencies = [ [[package]] name = "glob" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] name = "goblin" @@ -2607,7 +2607,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.7.0", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -2626,7 +2626,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.2.0", - "indexmap 2.7.0", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -2860,9 +2860,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.3" +version = "0.27.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" dependencies = [ "futures-util", "http 1.2.0", @@ -3093,9 +3093,9 @@ dependencies = [ [[package]] name = "impl-more" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae21c3177a27788957044151cc2800043d127acaa460a47ebb9b84dfa2c6aa0" +checksum = "e8a5a9a0ff0086c7a148acb942baaabeadf9504d10400b5a05645853729b9cd2" [[package]] name = "indexmap" @@ -3109,12 +3109,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.7.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", - "hashbrown 0.15.2", + "hashbrown 0.14.5", ] [[package]] @@ -3332,9 +3332,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.168" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libm" @@ -3534,9 +3534,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" dependencies = [ "adler2", ] @@ -3753,9 +3753,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.5" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ "memchr", ] @@ -3953,12 +3953,12 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +checksum = "c94eb96835f05ec51384814c9b2daef83f68486f67a0e2e9680e0f698dca808e" dependencies = [ "fixedbitset", - "indexmap 2.7.0", + "indexmap 2.5.0", ] [[package]] @@ -4084,9 +4084,9 @@ dependencies = [ [[package]] name = "predicates" -version = "3.1.2" +version = "3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" +checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573" dependencies = [ "anstyle", "predicates-core", @@ -4094,15 +4094,15 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" +checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa" [[package]] name = "predicates-tree" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" +checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c" dependencies = [ "predicates-core", "termtree", @@ -4553,9 +4553,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" [[package]] name = "ryu" @@ -4635,9 +4635,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" +checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" dependencies = [ "core-foundation-sys", "libc", @@ -4938,7 +4938,7 @@ dependencies = [ "hashbrown 0.14.5", "hashlink", "hex", - "indexmap 2.7.0", + "indexmap 2.5.0", "log", "memchr", "once_cell", @@ -5294,9 +5294,9 @@ dependencies = [ [[package]] name = "termtree" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" +checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683" [[package]] name = "test_utils" @@ -5412,9 +5412,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8" dependencies = [ "tinyvec_macros", ] @@ -5709,9 +5709,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicase" -version = "2.8.0" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" +checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" [[package]] name = "unicode-bidi" From 35875933793594efe6963d183bcb61d438276909 Mon Sep 17 00:00:00 2001 From: gmulhearn Date: Tue, 31 Dec 2024 15:56:26 +1000 Subject: [PATCH 07/10] bs64 Signed-off-by: gmulhearn --- Cargo.lock | 11 +---------- Cargo.toml | 2 ++ aries/agents/mediator/Cargo.toml | 2 +- aries/agents/mediator/src/mediation/pickup.rs | 5 ++++- .../agents/mediator/tests/mediator-protocol-pickup.rs | 3 ++- did_core/did_doc/Cargo.toml | 4 ++-- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 90ef22e88d..9c722dc437 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -951,15 +951,6 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64-url" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2b6c78c06f7288d5e3c3d683bde35a79531127c83b087e5d0d77c974b4b28" -dependencies = [ - "base64 0.22.1", -] - [[package]] name = "base64ct" version = "1.6.0" @@ -3439,7 +3430,7 @@ dependencies = [ "async-trait", "axum", "axum-macros", - "base64-url", + "base64 0.22.1", "chrono", "diddoc_legacy", "dotenvy", diff --git a/Cargo.toml b/Cargo.toml index aa73865833..8502aa41f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -91,6 +91,8 @@ askar-crypto = { version = "0.3.3", default-features = false } base64 = "0.22.1" bs58 = "0.5.1" multibase = "0.9.1" +hex = "0.4.3" +pem = "3.0.4" serde = "1.0.217" serde_json = "1.0.134" derive_more = "1.0.0" diff --git a/aries/agents/mediator/Cargo.toml b/aries/agents/mediator/Cargo.toml index 12dda61973..cb79797b0b 100644 --- a/aries/agents/mediator/Cargo.toml +++ b/aries/agents/mediator/Cargo.toml @@ -34,7 +34,7 @@ tower-http = { workspace = true, features = ["catch-panic"] } url.workspace = true uuid.workspace = true test_utils = { path = "../../misc/test_utils" } -base64-url = "3.0.0" +base64.workspace = true [dev-dependencies] chrono.workspace = true diff --git a/aries/agents/mediator/src/mediation/pickup.rs b/aries/agents/mediator/src/mediation/pickup.rs index b6896e2f86..497ce33b19 100644 --- a/aries/agents/mediator/src/mediation/pickup.rs +++ b/aries/agents/mediator/src/mediation/pickup.rs @@ -2,6 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use std::sync::Arc; +use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine}; use log::info; use messages::{ decorators::attachment::{Attachment, AttachmentData, AttachmentType}, @@ -95,7 +96,9 @@ async fn handle_pickup_delivery_req( .id(message_id) .data( AttachmentData::builder() - .content(AttachmentType::Base64(base64_url::encode(&message_content))) + .content(AttachmentType::Base64( + URL_SAFE_NO_PAD.encode(&message_content), + )) .build(), ) .build() diff --git a/aries/agents/mediator/tests/mediator-protocol-pickup.rs b/aries/agents/mediator/tests/mediator-protocol-pickup.rs index e262b18cd7..dcd4e5d086 100644 --- a/aries/agents/mediator/tests/mediator-protocol-pickup.rs +++ b/aries/agents/mediator/tests/mediator-protocol-pickup.rs @@ -2,6 +2,7 @@ mod common; use aries_vcx::utils::encryption_envelope::EncryptionEnvelope; use aries_vcx_wallet::wallet::askar::AskarWallet; +use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine}; use diddoc_legacy::aries::diddoc::AriesDidDoc; use mediator::aries_agent::client::transports::AriesTransport; use messages::{ @@ -158,7 +159,7 @@ async fn test_pickup_flow() -> Result<()> { if let AttachmentType::Base64(base64message) = &delivery.content.attach.first().unwrap().data.content { - let encrypted_message_bytes = base64_url::decode(base64message)?; + let encrypted_message_bytes = URL_SAFE_NO_PAD.decode(base64message)?; info!( "Decoding attachment to packed_message {}", String::from_utf8(message_bytes.clone())? diff --git a/did_core/did_doc/Cargo.toml b/did_core/did_doc/Cargo.toml index ba1bc54844..0d6c4c19f3 100644 --- a/did_core/did_doc/Cargo.toml +++ b/did_core/did_doc/Cargo.toml @@ -11,9 +11,9 @@ base64.workspace = true bs58.workspace = true did_parser_nom = { path = "../did_parser_nom" } public_key = { path = "../public_key" } -hex = "0.4.3" +hex.workspace = true multibase.workspace = true -pem = "3.0.4" +pem.workspace = true serde = { workspace = true, default-features = false, features = ["derive"] } serde_json.workspace = true uniresid = { version = "0.1.4", default-features = false, features = ["serde"] } From 1dd738908c2c3e7653ecf629f0b232559662e31c Mon Sep 17 00:00:00 2001 From: gmulhearn Date: Tue, 31 Dec 2024 16:15:57 +1000 Subject: [PATCH 08/10] fix all clippy and warnings Signed-off-by: gmulhearn --- Cargo.toml | 22 ++++++++----------- aries/agents/aath-backchannel/Cargo.toml | 2 +- aries/agents/mediator/client-tui/Cargo.toml | 2 +- .../agents/mediator/src/persistence/errors.rs | 1 - aries/aries_vcx/Cargo.toml | 2 +- .../proofs/verifier/verifier_internal.rs | 2 +- aries/aries_vcx_anoncreds/Cargo.toml | 2 +- aries/aries_vcx_ledger/Cargo.toml | 2 +- aries/aries_vcx_wallet/Cargo.toml | 2 +- aries/messages/src/misc/mod.rs | 5 ++--- .../protocols/cred_issuance/v1/mod.rs | 2 +- .../protocols/cred_issuance/v2/mod.rs | 2 +- .../src/msg_fields/protocols/routing.rs | 1 - .../indy_ledger_response_parser/src/lib.rs | 4 ++-- .../legacy/diddoc_legacy/src/aries/diddoc.rs | 16 +++++--------- .../legacy/diddoc_legacy/src/w3c/model.rs | 1 - aries/misc/shared/src/maybe_known.rs | 1 - aries/misc/test_utils/Cargo.toml | 2 +- did_core/did_doc/src/schema/did_doc.rs | 4 ++-- .../did_methods/did_peer/src/peer_did/mod.rs | 2 +- 20 files changed, 32 insertions(+), 45 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8502aa41f3..f2b1ea8cea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,8 +50,8 @@ panic = 'unwind' incremental = false [workspace.lints.clippy] -all = "warn" -pedantic = "warn" +all = { level = "warn", priority = -1 } +pedantic = { level = "warn", priority = -1 } struct_excessive_bools = "allow" trivially_copy_pass_by_ref = "allow" must_use_candidate = "allow" @@ -66,8 +66,6 @@ missing_copy_implementations = "warn" missing_debug_implementations = "warn" non_ascii_idents = "warn" pointer_structural_match = "warn" -rust_2018_idioms = "warn" -rust_2021_compatibility = "warn" trivial_casts = "warn" trivial_numeric_casts = "warn" unused_extern_crates = "warn" @@ -93,15 +91,15 @@ bs58 = "0.5.1" multibase = "0.9.1" hex = "0.4.3" pem = "3.0.4" -serde = "1.0.217" +serde = { version = "1.0.217", default-features = false } serde_json = "1.0.134" derive_more = "1.0.0" async-trait = "0.1.83" -futures = "0.3.31" +futures = { version = "0.3.31", default-features = false } log = "0.4.22" -url = "2.5.4" -uuid = "1.11.0" -chrono = "0.4.39" +url = { version = "2.5.4", default-features = false } +uuid = { version = "1.11.0", default-features = false, features = ["v4"] } +chrono = { version = "0.4.39", default-features = false } typed-builder = "0.20.0" thiserror = "2.0.9" anyhow = "1.0.95" @@ -119,7 +117,7 @@ syn = "2.0.93" quote = "1.0.38" # common drivers -tokio = "1.42.0" +tokio = { version = "1.42.0", default-features = false } sqlx = "0.8.2" reqwest = "0.12.11" axum = "0.7.9" @@ -137,7 +135,5 @@ uniffi = "0.23.0" # TODO - await new indy-vdr release [patch.'https://github.com/hyperledger/indy-vdr'] -indy-vdr = { git = "https://github.com/anonyome/indy-vdr.git", rev = "34ada55", default-features = false, features = [ - "log", -] } +indy-vdr = { git = "https://github.com/anonyome/indy-vdr.git", rev = "34ada55" } indy-vdr-proxy-client = { git = "https://github.com/anonyome/indy-vdr.git", rev = "34ada55" } \ No newline at end of file diff --git a/aries/agents/aath-backchannel/Cargo.toml b/aries/agents/aath-backchannel/Cargo.toml index 48bd27050a..36a095c272 100644 --- a/aries/agents/aath-backchannel/Cargo.toml +++ b/aries/agents/aath-backchannel/Cargo.toml @@ -23,7 +23,7 @@ serde.workspace = true serde_json.workspace = true log.workspace = true env_logger.workspace = true -uuid = { workspace = true, features = ["serde", "v4"] } +uuid = { workspace = true, features = ["serde"] } aries-vcx-agent = { path = "../../../aries/agents/aries-vcx-agent" } anoncreds_types = { path = "../../../aries/misc/anoncreds_types" } display_as_json = { path = "../../../misc/display_as_json" } diff --git a/aries/agents/mediator/client-tui/Cargo.toml b/aries/agents/mediator/client-tui/Cargo.toml index fb6fec6fb3..6cceffad68 100644 --- a/aries/agents/mediator/client-tui/Cargo.toml +++ b/aries/agents/mediator/client-tui/Cargo.toml @@ -11,7 +11,7 @@ aries_vcx_wallet = { path = "../../../aries_vcx_wallet", features = [ ] } axum.workspace = true cursive = { version = "0.20.0", features = ["crossterm-backend"] } -futures.workspace = true +futures = { workspace = true, default-features = true } log.workspace = true mediator = { path = ".." } messages = { path = "../../../messages" } diff --git a/aries/agents/mediator/src/persistence/errors.rs b/aries/agents/mediator/src/persistence/errors.rs index ee43a448ec..38bd269f02 100644 --- a/aries/agents/mediator/src/persistence/errors.rs +++ b/aries/agents/mediator/src/persistence/errors.rs @@ -23,7 +23,6 @@ pub struct DecodeError(#[from] pub Box); /// with the help of thiserror. /// Usage: /// errorset!(ComposedError\[ErrorVariant1, ErrorVariant2\]); - macro_rules! error_compose { ($errorset_name:ident[$($error_name: ident),*]) => { #[derive(Error, Debug)] diff --git a/aries/aries_vcx/Cargo.toml b/aries/aries_vcx/Cargo.toml index 4f4ff82a85..7f1cf2b5fb 100644 --- a/aries/aries_vcx/Cargo.toml +++ b/aries/aries_vcx/Cargo.toml @@ -55,7 +55,7 @@ base64.workspace = true sha2.workspace = true num-bigint = "0.4.5" futures = { workspace = true, default-features = false } -uuid = { workspace = true, default-features = false, features = ["v4"] } +uuid = { workspace = true } strum.workspace = true strum_macros.workspace = true derive_builder = "0.20.0" diff --git a/aries/aries_vcx/src/common/proofs/verifier/verifier_internal.rs b/aries/aries_vcx/src/common/proofs/verifier/verifier_internal.rs index bcd7fd31b6..0c6e137cf8 100644 --- a/aries/aries_vcx/src/common/proofs/verifier/verifier_internal.rs +++ b/aries/aries_vcx/src/common/proofs/verifier/verifier_internal.rs @@ -128,7 +128,7 @@ pub async fn build_schemas_json_verifier( let mut schemas_json = json!({}); for cred_info in credential_data.iter() { - if schemas_json.get(&cred_info.schema_id.to_string()).is_none() { + if schemas_json.get(cred_info.schema_id.to_string()).is_none() { let schema_id = &cred_info.schema_id; let schema_json = ledger.get_schema(schema_id, None).await.map_err(|_err| { AriesVcxError::from_msg(AriesVcxErrorKind::InvalidSchema, "Cannot get schema") diff --git a/aries/aries_vcx_anoncreds/Cargo.toml b/aries/aries_vcx_anoncreds/Cargo.toml index 5c5a59f6f1..9f29b5b91d 100644 --- a/aries/aries_vcx_anoncreds/Cargo.toml +++ b/aries/aries_vcx_anoncreds/Cargo.toml @@ -19,7 +19,7 @@ did_parser_nom = { path = "../../did_core/did_parser_nom" } async-trait.workspace = true thiserror.workspace = true log.workspace = true -uuid = { workspace = true, default-features = false, features = ["v4"] } +uuid = { workspace = true } serde = { workspace = true, features = ["derive"] } serde_json.workspace = true time.workspace = true diff --git a/aries/aries_vcx_ledger/Cargo.toml b/aries/aries_vcx_ledger/Cargo.toml index 4015f7d72c..adbe8031eb 100644 --- a/aries/aries_vcx_ledger/Cargo.toml +++ b/aries/aries_vcx_ledger/Cargo.toml @@ -39,4 +39,4 @@ tokio = { workspace = true, default-features = false, features = [ "rt", ] } mockall.workspace = true -uuid = { workspace = true, default-features = false, features = ["v4"] } +uuid = { workspace = true } diff --git a/aries/aries_vcx_wallet/Cargo.toml b/aries/aries_vcx_wallet/Cargo.toml index 9961125324..5cb3aee95f 100644 --- a/aries/aries_vcx_wallet/Cargo.toml +++ b/aries/aries_vcx_wallet/Cargo.toml @@ -24,7 +24,7 @@ rand.workspace = true thiserror.workspace = true tokio = { workspace = true } typed-builder.workspace = true -uuid = { workspace = true, default-features = false, features = ["v4"] } +uuid = { workspace = true } [dev-dependencies] tokio = { workspace = true, features = ["rt", "macros", "rt-multi-thread"] } diff --git a/aries/messages/src/misc/mod.rs b/aries/messages/src/misc/mod.rs index ae768dd633..6993a72983 100644 --- a/aries/messages/src/misc/mod.rs +++ b/aries/messages/src/misc/mod.rs @@ -5,7 +5,6 @@ pub use mime_type::MimeType; pub use shared::misc::{serde_ignored::SerdeIgnored as NoDecorators, utils::CowStr}; #[cfg(test)] - pub mod test_utils { use chrono::{DateTime, Utc}; use serde::{Deserialize, Serialize}; @@ -21,7 +20,7 @@ pub mod test_utils { pub struct DateTimeRfc3339<'a>(pub &'a DateTime); - impl<'a> Serialize for DateTimeRfc3339<'a> { + impl Serialize for DateTimeRfc3339<'_> { fn serialize(&self, serializer: S) -> Result where S: serde::Serializer, @@ -32,7 +31,7 @@ pub mod test_utils { pub struct OptDateTimeRfc3339<'a>(pub &'a Option>); - impl<'a> Serialize for OptDateTimeRfc3339<'a> { + impl Serialize for OptDateTimeRfc3339<'_> { fn serialize(&self, serializer: S) -> Result where S: serde::Serializer, diff --git a/aries/messages/src/msg_fields/protocols/cred_issuance/v1/mod.rs b/aries/messages/src/msg_fields/protocols/cred_issuance/v1/mod.rs index feb1b0df59..054c36e643 100644 --- a/aries/messages/src/msg_fields/protocols/cred_issuance/v1/mod.rs +++ b/aries/messages/src/msg_fields/protocols/cred_issuance/v1/mod.rs @@ -142,7 +142,7 @@ impl<'a> From<&'a CredentialPreviewV1MsgType> for CredentialIssuanceTypeV1_0 { } } -impl<'a> TryFrom> for CredentialPreviewV1MsgType { +impl TryFrom> for CredentialPreviewV1MsgType { type Error = String; fn try_from(value: CowStr) -> Result { diff --git a/aries/messages/src/msg_fields/protocols/cred_issuance/v2/mod.rs b/aries/messages/src/msg_fields/protocols/cred_issuance/v2/mod.rs index 2253562b76..9b962cdc15 100644 --- a/aries/messages/src/msg_fields/protocols/cred_issuance/v2/mod.rs +++ b/aries/messages/src/msg_fields/protocols/cred_issuance/v2/mod.rs @@ -141,7 +141,7 @@ impl<'a> From<&'a CredentialPreviewV2MsgType> for CredentialIssuanceTypeV2_0 { } } -impl<'a> TryFrom> for CredentialPreviewV2MsgType { +impl TryFrom> for CredentialPreviewV2MsgType { type Error = String; fn try_from(value: CowStr) -> Result { diff --git a/aries/messages/src/msg_fields/protocols/routing.rs b/aries/messages/src/msg_fields/protocols/routing.rs index 02b8c992d3..7306eb9218 100644 --- a/aries/messages/src/msg_fields/protocols/routing.rs +++ b/aries/messages/src/msg_fields/protocols/routing.rs @@ -20,7 +20,6 @@ pub struct ForwardContent { into_msg_with_type!(Forward, RoutingTypeV1_0, Forward); #[cfg(test)] - mod tests { use serde_json::json; // Bind `shared::misc::serde_ignored::SerdeIgnored` type as `NoDecorators`. diff --git a/aries/misc/indy_ledger_response_parser/src/lib.rs b/aries/misc/indy_ledger_response_parser/src/lib.rs index 49ec2feee7..0047eadc09 100644 --- a/aries/misc/indy_ledger_response_parser/src/lib.rs +++ b/aries/misc/indy_ledger_response_parser/src/lib.rs @@ -58,7 +58,7 @@ impl ResponseParser { GetNymReplyResult::GetNymReplyResultV0(res) => { let data: GetNymResultDataV0 = res .data - .ok_or_else(|| LedgerResponseParserError::LedgerItemNotFound("NYM")) + .ok_or(LedgerResponseParserError::LedgerItemNotFound("NYM")) .and_then(|data| serde_json::from_str(&data).map_err(Into::into))?; NymData { @@ -192,7 +192,7 @@ impl ResponseParser { let data = match reply.result() { GetTxnAuthorAgreementResult::GetTxnAuthorAgreementResultV1(res) => res .data - .ok_or_else(|| LedgerResponseParserError::LedgerItemNotFound("TAA"))?, + .ok_or(LedgerResponseParserError::LedgerItemNotFound("TAA"))?, }; Ok(GetTxnAuthorAgreementData { diff --git a/aries/misc/legacy/diddoc_legacy/src/aries/diddoc.rs b/aries/misc/legacy/diddoc_legacy/src/aries/diddoc.rs index 28896afd63..22ce71a585 100644 --- a/aries/misc/legacy/diddoc_legacy/src/aries/diddoc.rs +++ b/aries/misc/legacy/diddoc_legacy/src/aries/diddoc.rs @@ -42,10 +42,9 @@ impl AriesDidDoc { } pub fn set_service_endpoint(&mut self, service_endpoint: Url) { - self.service.get_mut(0).map(|service| { + if let Some(service) = self.service.get_mut(0) { service.service_endpoint = service_endpoint; - service - }); + } } pub fn set_recipient_keys(&mut self, recipient_keys: Vec) { @@ -68,10 +67,9 @@ impl AriesDidDoc { public_key: key_reference, }); - self.service.get_mut(0).map(|service| { + if let Some(service) = self.service.get_mut(0) { service.recipient_keys.push(key_in_base58.clone()); - service - }); + } }); } @@ -91,10 +89,9 @@ impl AriesDidDoc { // public_key_base_58: key.clone(), // }); - self.service.get_mut(0).map(|service| { + if let Some(service) = self.service.get_mut(0) { service.routing_keys.push(key.to_string()); - service - }); + } }); } @@ -487,7 +484,6 @@ pub mod test_utils { } #[cfg(test)] - mod unit_tests { use serde_json::json; diff --git a/aries/misc/legacy/diddoc_legacy/src/w3c/model.rs b/aries/misc/legacy/diddoc_legacy/src/w3c/model.rs index fd8afb666c..3a5942982f 100644 --- a/aries/misc/legacy/diddoc_legacy/src/w3c/model.rs +++ b/aries/misc/legacy/diddoc_legacy/src/w3c/model.rs @@ -42,7 +42,6 @@ impl Serialize for DdoKeyReference { } #[cfg(test)] - mod unit_test { use crate::{aries::diddoc::test_utils::_did, w3c::model::DdoKeyReference}; diff --git a/aries/misc/shared/src/maybe_known.rs b/aries/misc/shared/src/maybe_known.rs index b21ecf5094..6df0fbe1a1 100644 --- a/aries/misc/shared/src/maybe_known.rs +++ b/aries/misc/shared/src/maybe_known.rs @@ -17,7 +17,6 @@ pub enum MaybeKnown { } #[cfg(test)] - mod tests { use serde::Deserialize; use serde_json::json; diff --git a/aries/misc/test_utils/Cargo.toml b/aries/misc/test_utils/Cargo.toml index c9d9ea37dd..44adfb2f63 100644 --- a/aries/misc/test_utils/Cargo.toml +++ b/aries/misc/test_utils/Cargo.toml @@ -30,7 +30,7 @@ indy-vdr-proxy-client = { workspace = true, optional = true } lazy_static.workspace = true serde_json.workspace = true rand.workspace = true -uuid = { workspace = true, default-features = false, features = ["v4"] } +uuid = { workspace = true } async-trait.workspace = true chrono.workspace = true env_logger.workspace = true diff --git a/did_core/did_doc/src/schema/did_doc.rs b/did_core/did_doc/src/schema/did_doc.rs index 4957c4dfc4..7b84cf5409 100644 --- a/did_core/did_doc/src/schema/did_doc.rs +++ b/did_core/did_doc/src/schema/did_doc.rs @@ -95,7 +95,7 @@ impl DidDocument { vm: &'a VerificationMethodKind, id: &str, ) -> Option<&'a VerificationMethod> { - return match vm { + match vm { VerificationMethodKind::Resolved(vm) => { if vm.id().fragment() == Some(id) { Some(vm) @@ -110,7 +110,7 @@ impl DidDocument { None } } - }; + } } pub fn authentication_by_id(&self, id: &str) -> Option<&VerificationMethod> { diff --git a/did_core/did_methods/did_peer/src/peer_did/mod.rs b/did_core/did_methods/did_peer/src/peer_did/mod.rs index 774943238c..ba5599544c 100644 --- a/did_core/did_methods/did_peer/src/peer_did/mod.rs +++ b/did_core/did_methods/did_peer/src/peer_did/mod.rs @@ -68,7 +68,7 @@ impl<'de, N: Numalgo> Deserialize<'de> for PeerDid { { struct PeerDidVisitor(PhantomData); - impl<'de, N: Numalgo> Visitor<'de> for PeerDidVisitor { + impl Visitor<'_> for PeerDidVisitor { type Value = PeerDid; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { From b336b18d5f1d94366f56fca3873b6040d2683afd Mon Sep 17 00:00:00 2001 From: gmulhearn Date: Tue, 31 Dec 2024 16:22:43 +1000 Subject: [PATCH 09/10] patch Signed-off-by: gmulhearn --- aries/messages/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aries/messages/Cargo.toml b/aries/messages/Cargo.toml index 960c19fbe2..084ac0f26d 100644 --- a/aries/messages/Cargo.toml +++ b/aries/messages/Cargo.toml @@ -19,7 +19,7 @@ strum_macros.workspace = true thiserror.workspace = true derive_more = { workspace = true, features = [ "from", - "try_from", + "try_into", "display", "error", ] } From ec82624c6973582d0b4234a8d0e8eaa265571f61 Mon Sep 17 00:00:00 2001 From: gmulhearn Date: Wed, 1 Jan 2025 14:17:38 +1000 Subject: [PATCH 10/10] disable batch revocation Signed-off-by: gmulhearn --- aries/aries_vcx/tests/test_revocations.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/aries/aries_vcx/tests/test_revocations.rs b/aries/aries_vcx/tests/test_revocations.rs index f56aaa02e6..c3163a0a32 100644 --- a/aries/aries_vcx/tests/test_revocations.rs +++ b/aries/aries_vcx/tests/test_revocations.rs @@ -191,8 +191,10 @@ async fn test_agency_pool_local_revocation() -> Result<(), Box> { Ok(()) } -#[tokio::test] -#[ignore] +// TODO - re-enable after https://github.com/hyperledger/aries-vcx/issues/1309 +// #[tokio::test] +// #[ignore] +#[allow(unused)] async fn test_agency_batch_revocation() -> Result<(), Box> { let setup = SetupPoolDirectory::init().await; let mut institution = create_test_agent_trustee(setup.genesis_file_path.clone()).await;