diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d9a969..dc07c26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## Changelog history +### 30th January 2025 (release 0.2.8) + +* FEATURE: add_did_document() added to manually load DID Documents into the cache. + * Can be used when you want to pre-load a DID Document or for testing purposes load non-public documents +* MAINTENANCE: Crates updated (rand 0.8 --> 0.9) + ### 23rd January 2025 (release 0.2.5) * Updating crates diff --git a/Cargo.lock b/Cargo.lock index cb59394..cd849eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -73,7 +73,7 @@ dependencies = [ [[package]] name = "affinidi-did-resolver-cache-sdk" -version = "0.2.7" +version = "0.2.8" dependencies = [ "blake2", "clap", @@ -83,7 +83,7 @@ dependencies = [ "moka", "num-format", "number_prefix", - "rand", + "rand 0.9.0", "rayon", "serde", "serde-wasm-bindgen", @@ -100,7 +100,7 @@ dependencies = [ [[package]] name = "affinidi-did-resolver-cache-server" -version = "0.2.7" +version = "0.2.8" dependencies = [ "affinidi-did-resolver-cache-sdk", "axum", @@ -110,7 +110,7 @@ dependencies = [ "did-peer", "http 1.2.0", "moka", - "rand", + "rand 0.9.0", "regex", "serde", "serde_json", @@ -125,7 +125,7 @@ dependencies = [ [[package]] name = "affinidi-did-resolver-methods" -version = "0.2.7" +version = "0.2.8" [[package]] name = "ahash" @@ -133,7 +133,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom", + "getrandom 0.2.15", "once_cell", "version_check", ] @@ -147,7 +147,7 @@ dependencies = [ "cfg-if", "once_cell", "version_check", - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -288,7 +288,7 @@ dependencies = [ "k256", "p256", "p384", - "rand", + "rand 0.8.5", "serde", "serde-json-core", "sha2 0.10.8", @@ -370,7 +370,7 @@ dependencies = [ "http 1.2.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.2", + "hyper 1.6.0", "hyper-util", "itoa", "matchit", @@ -425,7 +425,7 @@ dependencies = [ "http 1.2.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.2", + "hyper 1.6.0", "hyper-util", "pin-project-lite", "rustls 0.23.21", @@ -646,7 +646,7 @@ checksum = "d7bc6d6292be3a19e6379786dac800f551e5865a5bb51ebbe3064ab80433f403" dependencies = [ "ff", "group", - "rand_core", + "rand_core 0.6.4", "subtle", "zeroize", ] @@ -686,9 +686,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "byteorder" @@ -909,9 +909,9 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.52" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e" +checksum = "e24a03c8b52922d68a1589ad61032f2c1aa5a8158d2aa0d93c6e9534944bbad6" dependencies = [ "cc", ] @@ -1004,9 +1004,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] @@ -1077,7 +1077,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", - "rand_core", + "rand_core 0.6.4", "subtle", "zeroize", ] @@ -1089,7 +1089,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core", + "rand_core 0.6.4", "typenum", ] @@ -1342,7 +1342,7 @@ dependencies = [ [[package]] name = "did-example" -version = "0.2.7" +version = "0.2.8" dependencies = [ "ssi", "thiserror 2.0.11", @@ -1412,7 +1412,7 @@ dependencies = [ [[package]] name = "did-peer" -version = "0.2.7" +version = "0.2.8" dependencies = [ "askar-crypto", "base64 0.22.1", @@ -1563,7 +1563,7 @@ checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek", "ed25519", - "rand_core", + "rand_core 0.6.4", "serde", "sha2 0.10.8", "subtle", @@ -1615,7 +1615,7 @@ dependencies = [ "hkdf", "pem-rfc7468 0.7.0", "pkcs8 0.10.2", - "rand_core", + "rand_core 0.6.4", "sec1", "subtle", "zeroize", @@ -1712,7 +1712,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -1905,10 +1905,22 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", ] +[[package]] +name = "getrandom" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.13.3+wasi-0.2.2", + "windows-targets 0.52.6", +] + [[package]] name = "ghash" version = "0.5.1" @@ -1938,7 +1950,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -2139,9 +2151,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.5" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" +checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a" [[package]] name = "httpdate" @@ -2175,9 +2187,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.5.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" +checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" dependencies = [ "bytes", "futures-channel", @@ -2216,7 +2228,7 @@ checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" dependencies = [ "futures-util", "http 1.2.0", - "hyper 1.5.2", + "hyper 1.6.0", "hyper-util", "rustls 0.23.21", "rustls-pki-types", @@ -2246,7 +2258,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.5.2", + "hyper 1.6.0", "hyper-util", "native-tls", "tokio", @@ -2265,7 +2277,7 @@ dependencies = [ "futures-util", "http 1.2.0", "http-body 1.0.1", - "hyper 1.5.2", + "hyper 1.6.0", "pin-project-lite", "socket2", "tokio", @@ -2448,7 +2460,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" dependencies = [ "bitmaps", - "rand_core", + "rand_core 0.6.4", "rand_xoshiro", "sized-chunks", "typenum", @@ -3135,7 +3147,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -3224,9 +3236,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c" dependencies = [ "libc", "log", @@ -3281,7 +3293,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand", + "rand 0.8.5", "smallvec", "zeroize", ] @@ -3383,9 +3395,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.68" +version = "0.10.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +checksum = "f5e534d133a060a3c19daec1eb3e98ec6f4685978834f2dbadfe2ec215bab64e" dependencies = [ "bitflags 2.8.0", "cfg-if", @@ -3409,9 +3421,9 @@ dependencies = [ [[package]] name = "openssl-probe" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-src" @@ -3451,7 +3463,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951" dependencies = [ "num-traits", - "rand", + "rand 0.8.5", "serde", ] @@ -3680,7 +3692,7 @@ version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -3786,11 +3798,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", "serde", ] +[[package]] +name = "rand" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.0", + "zerocopy 0.8.14", +] + [[package]] name = "rand_chacha" version = "0.3.1" @@ -3798,7 +3821,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.0", ] [[package]] @@ -3807,17 +3840,27 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", "serde", ] +[[package]] +name = "rand_core" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b08f3c9802962f7e1b25113931d94f43ed9725bebc59db9d0c3e9a23b67e15ff" +dependencies = [ + "getrandom 0.3.1", + "zerocopy 0.8.14", +] + [[package]] name = "rand_xoshiro" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" dependencies = [ - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -3988,7 +4031,7 @@ dependencies = [ "http 1.2.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.2", + "hyper 1.6.0", "hyper-rustls 0.27.5", "hyper-tls 0.6.0", "hyper-util", @@ -4035,7 +4078,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom", + "getrandom 0.2.15", "libc", "spin", "untrusted", @@ -4067,7 +4110,7 @@ dependencies = [ "num-traits", "pkcs1", "pkcs8 0.8.0", - "rand_core", + "rand_core 0.6.4", "smallvec", "subtle", "zeroize", @@ -4153,9 +4196,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" +checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" [[package]] name = "rustls-webpki" @@ -4187,9 +4230,9 @@ checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" [[package]] name = "ryu-js" @@ -4374,9 +4417,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.137" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" dependencies = [ "itoa", "memchr", @@ -4542,7 +4585,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -4772,7 +4815,7 @@ dependencies = [ "bs58", "digest 0.9.0", "ed25519-dalek", - "getrandom", + "getrandom 0.2.15", "hex", "iref", "k256", @@ -4780,7 +4823,7 @@ dependencies = [ "p256", "p384", "pin-project", - "rand", + "rand 0.8.5", "ripemd160", "serde", "sha2 0.10.8", @@ -4867,7 +4910,7 @@ dependencies = [ "derivative", "educe 0.4.23", "futures", - "getrandom", + "getrandom 0.2.15", "hex", "iref", "json-syntax", @@ -4879,7 +4922,7 @@ dependencies = [ "p256", "p384", "pin-project", - "rand", + "rand 0.8.5", "rdf-types", "self_cell", "serde", @@ -4913,7 +4956,7 @@ checksum = "248fa61d9934e9cb1f8fd01b6410cb952d380d617eb57aab53c453da0ca10ab4" dependencies = [ "base64 0.22.1", "digest 0.10.7", - "getrandom", + "getrandom 0.2.15", "hex", "hmac", "iref", @@ -5019,7 +5062,7 @@ dependencies = [ "blake2b_simd 0.5.11", "bs58", "ed25519-dalek", - "getrandom", + "getrandom 0.2.15", "json-syntax", "k256", "lazy_static", @@ -5030,7 +5073,7 @@ dependencies = [ "num-traits", "p256", "p384", - "rand", + "rand 0.8.5", "rsa", "serde", "serde_jcs", @@ -5059,7 +5102,7 @@ dependencies = [ "linked-data", "p256", "p384", - "rand", + "rand 0.8.5", "rsa", "serde", "serde_json", @@ -5134,7 +5177,7 @@ checksum = "77e27d19b7993dc4d0b23bcdbf9978cebbed7d5b7fa19cabde55aa9a0c72c58f" dependencies = [ "base64 0.22.1", "indexmap 2.7.1", - "rand", + "rand 0.8.5", "serde", "serde_json", "sha2 0.10.8", @@ -5297,7 +5340,7 @@ dependencies = [ "p256", "p384", "pin-project", - "rand_core", + "rand_core 0.6.4", "rdf-types", "serde", "serde_json", @@ -5543,13 +5586,13 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.15.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" +checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91" dependencies = [ "cfg-if", "fastrand", - "getrandom", + "getrandom 0.3.1", "once_cell", "rustix", "windows-sys 0.59.0", @@ -5933,7 +5976,7 @@ dependencies = [ "httparse", "log", "native-tls", - "rand", + "rand 0.8.5", "sha1", "thiserror 2.0.11", "utf-8", @@ -5959,9 +6002,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" [[package]] name = "unicode-xid" @@ -6038,7 +6081,7 @@ version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b" dependencies = [ - "getrandom", + "getrandom 0.2.15", ] [[package]] @@ -6074,6 +6117,15 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.13.3+wasi-0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] + [[package]] name = "wasm-bindgen" version = "0.2.100" @@ -6429,9 +6481,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.24" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a" +checksum = "ad699df48212c6cc6eb4435f35500ac6fd3b9913324f938aea302022ce19d310" dependencies = [ "memchr", ] @@ -6446,6 +6498,15 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "wit-bindgen-rt" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags 2.8.0", +] + [[package]] name = "write16" version = "1.0.0" @@ -6471,7 +6532,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", - "rand_core", + "rand_core 0.6.4", "zeroize", ] @@ -6527,7 +6588,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "byteorder", - "zerocopy-derive", + "zerocopy-derive 0.7.35", +] + +[[package]] +name = "zerocopy" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a367f292d93d4eab890745e75a778da40909cab4d6ff8173693812f79c4a2468" +dependencies = [ + "zerocopy-derive 0.8.14", ] [[package]] @@ -6541,6 +6611,17 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "zerocopy-derive" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3931cb58c62c13adec22e38686b559c86a30565e16ad6e8510a337cedc611e1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "zerofrom" version = "0.1.5" diff --git a/Cargo.toml b/Cargo.toml index 5036d0a..b0c8f1e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ members = [ resolver = "2" [workspace.package] -version = "0.2.7" +version = "0.2.8" edition = "2021" authors = ["Glenn Gore "] description = "Affinidi DID Resolver" @@ -24,7 +24,7 @@ repository = "https://github.com/affinidi/affinidi-did-resolver" # Common Dependencies moka = { version = "0.12", features = ["future"] } -rand = "0.8" +rand = "0.9" regex = "1.11" serde = { version = "1.0", features = ["derive", "rc"] } serde_json = "1.0" diff --git a/affinidi-did-resolver-cache-sdk/Cargo.toml b/affinidi-did-resolver-cache-sdk/Cargo.toml index ac4f489..a7f1189 100644 --- a/affinidi-did-resolver-cache-sdk/Cargo.toml +++ b/affinidi-did-resolver-cache-sdk/Cargo.toml @@ -14,7 +14,6 @@ readme = "README.md" [lib] crate-type = ["rlib", "cdylib"] - [features] default = ["local"] local = [] diff --git a/affinidi-did-resolver-cache-sdk/examples/benchmark.rs b/affinidi-did-resolver-cache-sdk/examples/benchmark.rs index 8395ab0..a242fb7 100644 --- a/affinidi-did-resolver-cache-sdk/examples/benchmark.rs +++ b/affinidi-did-resolver-cache-sdk/examples/benchmark.rs @@ -49,10 +49,16 @@ async fn main() -> Result<(), DIDCacheError> { // use that subscriber to process traces emitted after this point tracing::subscriber::set_global_default(subscriber).expect("Logging failed, exiting..."); + #[allow(unused_mut)] let mut cache_config = ClientConfigBuilder::default(); - if let Some(address) = &args.network_address { - println!("Running in network mode with address: {}", address); - cache_config = cache_config.with_network_mode(address); + if let Some(_address) = &args.network_address { + #[cfg(feature = "network")] + { + println!("Running in network mode with address: {}", _address); + cache_config = cache_config.with_network_mode(_address); + } + #[cfg(not(feature = "network"))] + panic!("Network mode is not enabled in this build. Enable feature `network` to use network mode."); } else { println!("Running in local mode."); } @@ -161,9 +167,10 @@ async fn resolve_dids_no_cache(dids: Arc>, count: u32) -> Result<(), let mut handles = Vec::new(); let _start = std::time::Instant::now(); - let mut rng = rand::thread_rng(); + let mut rng = rand::rng(); for _ in 0..count { - let r: usize = rng.gen::() % dids_len; + let r: u32 = rng.random(); + let r: usize = r as usize % dids_len; let _dids = dids.clone(); //let _cache = cache.clone(); @@ -207,10 +214,10 @@ async fn resolve_dids( let mut handles = Vec::new(); let _start = std::time::Instant::now(); - let mut rng = rand::thread_rng(); + let mut rng = rand::rng(); for _ in 0..count { - let r: usize = rng.gen::() % dids_len; + let r: usize = rng.random::() as usize % dids_len; let _dids = dids.clone(); let _cache = cache.clone(); diff --git a/affinidi-did-resolver-cache-sdk/src/lib.rs b/affinidi-did-resolver-cache-sdk/src/lib.rs index d34113a..e0ddcb7 100644 --- a/affinidi-did-resolver-cache-sdk/src/lib.rs +++ b/affinidi-did-resolver-cache-sdk/src/lib.rs @@ -239,6 +239,15 @@ impl DIDCacheClient { let did_hash = format!("{:x}", hasher.finalize()); self.cache.remove(&did_hash).await } + + /// Add a DID Document to the cache manually + pub async fn add_did_document(&mut self, did: &str, doc: Document) { + let mut hasher = Blake2s256::new(); + hasher.update(did); + let did_hash = format!("{:x}", hasher.finalize()); + debug!("manually adding did ({}) hash({}) to cache", did, did_hash); + self.cache.insert(did_hash, doc).await; + } } /// Following are the WASM bindings for the DIDCacheClient diff --git a/affinidi-did-resolver-cache-sdk/src/networking/mod.rs b/affinidi-did-resolver-cache-sdk/src/networking/mod.rs index 72a7d53..2415233 100644 --- a/affinidi-did-resolver-cache-sdk/src/networking/mod.rs +++ b/affinidi-did-resolver-cache-sdk/src/networking/mod.rs @@ -5,7 +5,7 @@ //! use network::WSCommands; -use rand::{distributions::Alphanumeric, Rng}; +use rand::{distr::Alphanumeric, Rng}; use serde::{Deserialize, Serialize}; use ssi::dids::Document; use tokio::{select, sync::oneshot}; @@ -75,7 +75,7 @@ impl DIDCacheClient { let (tx, rx) = oneshot::channel::(); // create a 8-char unique-id for this request - let unique_id: String = rand::thread_rng() + let unique_id: String = rand::rng() .sample_iter(&Alphanumeric) .take(8) .map(char::from) diff --git a/affinidi-did-resolver-cache-sdk/src/networking/request_queue.rs b/affinidi-did-resolver-cache-sdk/src/networking/request_queue.rs index 746f9cb..e2ffccd 100644 --- a/affinidi-did-resolver-cache-sdk/src/networking/request_queue.rs +++ b/affinidi-did-resolver-cache-sdk/src/networking/request_queue.rs @@ -142,7 +142,7 @@ mod tests { use std::collections::HashMap; use blake2::{Blake2s256, Digest}; - use rand::{distributions::Alphanumeric, Rng}; + use rand::{distr::Alphanumeric, Rng}; use tokio::sync::oneshot::{self, Sender}; use crate::{ @@ -290,7 +290,7 @@ mod tests { } fn _unique_id() -> String { - rand::thread_rng() + rand::rng() .sample_iter(&Alphanumeric) .take(8) .map(char::from) diff --git a/affinidi-did-resolver-cache-server/src/common.rs b/affinidi-did-resolver-cache-server/src/common.rs index 3ec3e8a..3e26be4 100644 --- a/affinidi-did-resolver-cache-server/src/common.rs +++ b/affinidi-did-resolver-cache-server/src/common.rs @@ -1,4 +1,4 @@ -use rand::{distributions::Alphanumeric, Rng}; +use rand::{distr::Alphanumeric, Rng}; use serde::{de::DeserializeOwned, Serialize}; /// Helps with deserializing the generic data field in the SuccessResponse struct @@ -6,7 +6,7 @@ pub trait GenericDataStruct: DeserializeOwned + Serialize {} // Creates a random transaction identifier for each transaction pub(crate) fn create_session_id() -> String { - rand::thread_rng() + rand::rng() .sample_iter(&Alphanumeric) .take(8) .map(char::from)