diff --git a/.gitignore b/.gitignore index 37bc8865732..cbd3c807402 100644 --- a/.gitignore +++ b/.gitignore @@ -64,4 +64,6 @@ nym-api/redocly/formatted-openapi.json **/settings.sql **/enter_db.sh -*.profraw \ No newline at end of file +*.profraw + +/notes diff --git a/Cargo.lock b/Cargo.lock index f3c631c7ab7..e8dfe0cd296 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,7 +11,7 @@ dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -36,7 +36,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "generic-array 0.14.7", ] @@ -47,7 +47,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", - "cipher", + "cipher 0.4.4", + "cpufeatures", +] + +[[package]] +name = "aes" +version = "0.9.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd9e1c818b25efb32214df89b0ec22f01aa397aaeb718d1022bf0635a3bfd1a8" +dependencies = [ + "cfg-if", + "cipher 0.5.0-rc.3", "cpufeatures", ] @@ -58,8 +69,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ "aead", - "aes", - "cipher", + "aes 0.8.4", + "cipher 0.4.4", "ctr", "ghash", "subtle 2.6.1", @@ -72,14 +83,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d" dependencies = [ "aead", - "aes", - "cipher", + "aes 0.8.4", + "cipher 0.4.4", "ctr", "polyval", "subtle 2.6.1", "zeroize", ] +[[package]] +name = "aes-keywrap" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10b6f24a1f796bc46415a1d0d18dc0a8203ccba088acf5def3291c4f61225522" +dependencies = [ + "aes 0.9.0-rc.2", + "byteorder", +] + [[package]] name = "ahash" version = "0.8.12" @@ -94,9 +115,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] @@ -124,9 +145,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "ammonia" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b346764dd0814805de8abf899fe03065bcee69bb1a4771c785817e39f3978f" +checksum = "17e913097e1a2124b46746c980134e8c954bc17a6a59bb3fde96f088d126dde6" dependencies = [ "cssparser", "html5ever", @@ -135,12 +156,6 @@ dependencies = [ "url", ] -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - [[package]] name = "android_system_properties" version = "0.1.5" @@ -158,9 +173,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.19" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" +checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" dependencies = [ "anstyle", "anstyle-parse", @@ -173,9 +188,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" +checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" [[package]] name = "anstyle-parse" @@ -188,22 +203,22 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "anstyle-wincon" -version = "3.0.9" +version = "3.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -214,18 +229,21 @@ checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "arbitrary" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" +checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" dependencies = [ "derive_arbitrary", ] [[package]] name = "arc-swap" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" +checksum = "51d03449bb8ca2cc2ef70869af31463d1ae5ccc8fa3e334b307203fbf815207e" +dependencies = [ + "rustversion", +] [[package]] name = "argon2" @@ -399,7 +417,7 @@ dependencies = [ "rustc-hash", "serde", "serde_derive", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -437,27 +455,24 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.27" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddb939d66e4ae03cee6091612804ba446b12878410cfa17f785f4dd67d4014e8" +checksum = "98ec5f6c2f8bc326c994cb9e241cc257ddaba9afa8555a43cffbb5dd86efaa37" dependencies = [ - "brotli", - "flate2", + "compression-codecs", + "compression-core", "futures-core", - "memchr", "pin-project-lite", "tokio", - "zstd", - "zstd-safe", ] [[package]] name = "async-lock" -version = "3.4.0" +version = "3.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311" dependencies = [ - "event-listener 5.4.0", + "event-listener 5.4.1", "event-listener-strategy", "pin-project-lite", ] @@ -481,18 +496,18 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] name = "async-trait" -version = "0.1.88" +version = "0.1.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -558,10 +573,10 @@ dependencies = [ "axum-macros", "bytes", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", - "hyper 1.6.0", + "hyper 1.8.1", "hyper-util", "itoa", "matchit", @@ -602,7 +617,7 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "mime", @@ -626,7 +641,7 @@ dependencies = [ "fastrand 2.3.0", "futures-util", "headers", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "mime", @@ -646,7 +661,7 @@ checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -662,9 +677,9 @@ dependencies = [ "bytes", "bytesize", "cookie", - "http 1.3.1", + "http 1.4.0", "http-body-util", - "hyper 1.6.0", + "hyper 1.8.1", "hyper-util", "mime", "pretty_assertions", @@ -705,9 +720,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" +checksum = "7d809780667f4410e7c41b07f52439b94d2bdf8528eeedc287fa38d3b7f95d82" [[package]] name = "base85rs" @@ -726,9 +741,9 @@ dependencies = [ [[package]] name = "bech32" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d" +checksum = "32637268377fc7b10a8c6d51de3e7fba1ce5dd371a96e342b34e6078db558e7f" [[package]] name = "bincode" @@ -764,9 +779,9 @@ dependencies = [ [[package]] name = "bip39" -version = "2.2.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d193de1f7487df1914d3a568b772458861d33f9c54249612cc2893d6915054" +checksum = "90dbd31c98227229239363921e60fcf5e558e43ec69094d46fc4996f08d1d5bc" dependencies = [ "bitcoin_hashes", "rand 0.8.5", @@ -776,19 +791,12 @@ dependencies = [ "zeroize", ] -[[package]] -name = "bitcoin-internals" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb" - [[package]] name = "bitcoin_hashes" -version = "0.13.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b" +checksum = "26ec84b80c482df901772e931a9a681e26a1b9ee2302edeff23cb30328745c8b" dependencies = [ - "bitcoin-internals", "hex-conservative", ] @@ -800,11 +808,11 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" dependencies = [ - "serde", + "serde_core", ] [[package]] @@ -902,22 +910,6 @@ dependencies = [ "siphasher 1.0.1", ] -[[package]] -name = "bls12_381" -version = "0.8.0" -source = "git+https://github.com/jstuczyn/bls12_381?branch=temp%2Fexperimental-serdect-updated#9bf520059cb28323fc51469cae86868ef4fa6fbd" -dependencies = [ - "digest 0.10.7", - "ff", - "group", - "pairing", - "rand_core 0.6.4", - "serde", - "serdect 0.3.0", - "subtle 2.6.1", - "zeroize", -] - [[package]] name = "bnum" version = "0.11.0" @@ -926,9 +918,9 @@ checksum = "3e31ea183f6ee62ac8b8a8cf7feddd766317adfb13ff469de57ce033efd6a790" [[package]] name = "brotli" -version = "8.0.1" +version = "8.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9991eea70ea4f293524138648e41ee89b0b2b12ddef3b255effa43c8056e0e0d" +checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -957,9 +949,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.19.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" +checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" [[package]] name = "byte-tools" @@ -985,9 +977,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" dependencies = [ "serde", ] @@ -1000,11 +992,11 @@ checksum = "2e93abca9e28e0a1b9877922aacb20576e05d4679ffa78c3d6dc22a26a216659" [[package]] name = "camino" -version = "1.1.10" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab" +checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48" dependencies = [ - "serde", + "serde_core", ] [[package]] @@ -1024,7 +1016,7 @@ checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", - "semver 1.0.26", + "semver 1.0.27", "serde", "serde_json", "thiserror 1.0.69", @@ -1038,7 +1030,7 @@ checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba" dependencies = [ "camino", "cargo-platform", - "semver 1.0.26", + "semver 1.0.27", "serde", "serde_json", "thiserror 2.0.17", @@ -1058,10 +1050,11 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.2.30" +version = "1.2.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7" +checksum = "7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203" dependencies = [ + "find-msvc-tools", "jobserver", "libc", "shlex", @@ -1073,15 +1066,15 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc3ba3c5408fae183329e0d1ac8f8eed3cb7b647590fd93e6d6288f6b09db0be" dependencies = [ - "phf", + "phf 0.11.3", "serde", ] [[package]] name = "cfg-if" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg_aliases" @@ -1106,7 +1099,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", - "cipher", + "cipher 0.4.4", "cpufeatures", ] @@ -1118,24 +1111,23 @@ checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ "aead", "chacha20", - "cipher", + "cipher 0.4.4", "poly1305", "zeroize", ] [[package]] name = "chrono" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" dependencies = [ - "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", "wasm-bindgen", - "windows-link 0.1.3", + "windows-link 0.2.1", ] [[package]] @@ -1171,16 +1163,26 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "crypto-common", - "inout", + "crypto-common 0.1.7", + "inout 0.1.4", "zeroize", ] +[[package]] +name = "cipher" +version = "0.5.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98d708bac5451350d56398433b19a7889022fa9187df1a769c0edbc3b2c03167" +dependencies = [ + "crypto-common 0.2.0-rc.9", + "inout 0.2.2", +] + [[package]] name = "clap" -version = "4.5.41" +version = "4.5.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9" +checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394" dependencies = [ "clap_builder", "clap_derive", @@ -1188,9 +1190,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.41" +version = "4.5.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d" +checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00" dependencies = [ "anstream", "anstyle", @@ -1200,9 +1202,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.55" +version = "4.5.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5abde44486daf70c5be8b8f8f1b66c49f86236edf6fa2abadb4d961c4c6229a" +checksum = "430b4dc2b5e3861848de79627b2bedc9f3342c7da5173a14eaa5d0f8dc18ae5d" dependencies = [ "clap", ] @@ -1219,21 +1221,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.41" +version = "4.5.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491" +checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] name = "clap_lex" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" +checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" [[package]] name = "coarsetime" @@ -1264,15 +1266,35 @@ dependencies = [ [[package]] name = "comfy-table" -version = "7.1.4" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a65ebfec4fb190b6f90e944a817d60499ee0744e582530e2c9900a22e591d9a" +checksum = "b03b7db8e0b4b2fdad6c551e634134e99ec000e5c8c3b6856c65e8bbaded7a3b" dependencies = [ - "crossterm 0.28.1", + "crossterm 0.29.0", "unicode-segmentation", - "unicode-width 0.2.1", + "unicode-width 0.2.2", +] + +[[package]] +name = "compression-codecs" +version = "0.4.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0f7ac3e5b97fdce45e8922fb05cae2c37f7bbd63d30dd94821dacfd8f3f2bf2" +dependencies = [ + "brotli", + "compression-core", + "flate2", + "memchr", + "zstd", + "zstd-safe", ] +[[package]] +name = "compression-core" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d" + [[package]] name = "concurrent-queue" version = "2.5.0" @@ -1284,15 +1306,15 @@ dependencies = [ [[package]] name = "console" -version = "0.16.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e09ced7ebbccb63b4c65413d821f2e00ce54c5ca4514ddc6b3c892fdbcbc69d" +checksum = "03e45a4a8926227e4197636ba97a9fc9b00477e9f4bd711395687c5f0734bec4" dependencies = [ "encode_unicode", "libc", "once_cell", - "unicode-width 0.2.1", - "windows-sys 0.60.2", + "unicode-width 0.2.2", + "windows-sys 0.61.2", ] [[package]] @@ -1358,9 +1380,9 @@ checksum = "3618cccc083bb987a415d85c02ca6c9994ea5b44731ec28b9ecf09658655fba9" [[package]] name = "const_format" -version = "0.2.34" +version = "0.2.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd" +checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad" dependencies = [ "const_format_proc_macros", ] @@ -1444,15 +1466,15 @@ dependencies = [ [[package]] name = "cosmwasm-core" -version = "2.2.2" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b6dc17e7fd89d0a0a58f12ef33f0bbdf09a6a14c3dfb383eae665e5889250e" +checksum = "63efd882086668c3bad621b5b897a0e058d0b5fae027c984e1a6230bf284ab85" [[package]] name = "cosmwasm-crypto" -version = "2.2.2" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2f53285517db3e33d825b3e46301efe845135778527e1295154413b2f0469e" +checksum = "0969e6f569f867725bf89e672058ae336e130c1fcf914def4f7c6c0380b2bc83" dependencies = [ "ark-bls12-381", "ark-ec", @@ -1474,13 +1496,13 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.2.2" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a782b93fae93e57ca8ad3e9e994e784583f5933aeaaa5c80a545c4b437be2047" +checksum = "d0da0db99715fc86e6a5ad7be9c19d0d9e5a92179862b17cae7406b729a402c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -1504,7 +1526,7 @@ checksum = "e01c9214319017f6ebd8e299036e1f717fa9bb6724e758f7d6fb2477599d1a29" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -1542,9 +1564,9 @@ dependencies = [ [[package]] name = "crc" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675" +checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" dependencies = [ "crc-catalog", ] @@ -1669,14 +1691,15 @@ dependencies = [ [[package]] name = "crossterm" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" +checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "crossterm_winapi", + "document-features", "parking_lot", - "rustix 0.38.44", + "rustix", "winapi", ] @@ -1709,15 +1732,24 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", "typenum", ] +[[package]] +name = "crypto-common" +version = "0.2.0-rc.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b8986f836d4aeb30ccf4c9d3bd562fd716074cfd7fc4a2948359fbd21ed809" +dependencies = [ + "hybrid-array", +] + [[package]] name = "crypto-mac" version = "0.7.0" @@ -1737,7 +1769,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "phf", + "phf 0.11.3", "smallvec", ] @@ -1748,26 +1780,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] name = "csv" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf" +checksum = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938" dependencies = [ "csv-core", "itoa", "ryu", - "serde", + "serde_core", ] [[package]] name = "csv-core" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d02f3b0da4c6504f86e9cd789d8dbafab48c2321be74e9987593de5a894d93d" +checksum = "704a3c26996a80471189265814dbc2c257598b96b8a7feae2d31ace646bb9782" dependencies = [ "memchr", ] @@ -1784,7 +1816,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cipher", + "cipher 0.4.4", ] [[package]] @@ -1799,24 +1831,24 @@ dependencies = [ [[package]] name = "curl" -version = "0.4.48" +version = "0.4.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2d5c8f48d9c0c23250e52b55e82a6ab4fdba6650c931f5a0a57a43abda812b" +checksum = "79fc3b6dd0b87ba36e565715bf9a2ced221311db47bd18011676f24a6066edbc" dependencies = [ "curl-sys", "libc", "openssl-probe", "openssl-sys", "schannel", - "socket2 0.5.10", + "socket2 0.6.1", "windows-sys 0.59.0", ] [[package]] name = "curl-sys" -version = "0.4.82+curl-8.14.1" +version = "0.4.84+curl-8.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d63638b5ec65f1a4ae945287b3fd035be4554bbaf211901159c9a2a74fb5be" +checksum = "abc4294dc41b882eaff37973c2ec3ae203d0091341ee68fbadd1d06e0c18a73b" dependencies = [ "cc", "libc", @@ -1852,7 +1884,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -1937,7 +1969,7 @@ dependencies = [ "cosmwasm-std", "cw-storage-plus", "schemars 0.8.22", - "semver 1.0.26", + "semver 1.0.27", "serde", "thiserror 1.0.69", ] @@ -1989,8 +2021,18 @@ version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.20.11", + "darling_macro 0.20.11", +] + +[[package]] +name = "darling" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" +dependencies = [ + "darling_core 0.21.3", + "darling_macro 0.21.3", ] [[package]] @@ -2004,7 +2046,21 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.104", + "syn 2.0.114", +] + +[[package]] +name = "darling_core" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.114", ] [[package]] @@ -2013,9 +2069,20 @@ version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ - "darling_core", + "darling_core 0.20.11", "quote", - "syn 2.0.104", + "syn 2.0.114", +] + +[[package]] +name = "darling_macro" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" +dependencies = [ + "darling_core 0.21.3", + "quote", + "syn 2.0.114", ] [[package]] @@ -2068,7 +2135,7 @@ dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -2084,12 +2151,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.4.0" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" +checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" dependencies = [ "powerfmt", - "serde", + "serde_core", ] [[package]] @@ -2105,13 +2172,13 @@ dependencies = [ [[package]] name = "derive_arbitrary" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" +checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -2129,10 +2196,10 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" dependencies = [ - "darling", + "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -2142,7 +2209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -2156,11 +2223,11 @@ dependencies = [ [[package]] name = "derive_more" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134" dependencies = [ - "derive_more-impl 2.0.1", + "derive_more-impl 2.1.1", ] [[package]] @@ -2171,19 +2238,20 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", "unicode-xid", ] [[package]] name = "derive_more-impl" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "rustc_version 0.4.1", + "syn 2.0.114", "unicode-xid", ] @@ -2219,7 +2287,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", "const-oid", - "crypto-common", + "crypto-common 0.1.7", "subtle 2.6.1", ] @@ -2252,7 +2320,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -2268,9 +2336,18 @@ dependencies = [ [[package]] name = "doc-comment" -version = "0.3.3" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "780955b8b195a21ab8e4ac6b60dd1dbdcec1dc6c51c0617964b08c81785e12c9" + +[[package]] +name = "document-features" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61" +dependencies = [ + "litrs", +] [[package]] name = "dotenvy" @@ -2280,9 +2357,9 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "dtoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04" +checksum = "4c3cf4824e2d5f025c7b531afcb2325364084a16806f6d47fbc1f5fbd9960590" [[package]] name = "dtoa-short" @@ -2295,17 +2372,17 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "easy-addr" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cosmwasm-std", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -2361,12 +2438,12 @@ dependencies = [ [[package]] name = "ed25519-compact" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190" +checksum = "33ce99a9e19c84beb4cc35ece85374335ccc398240712114c85038319ed709bd" dependencies = [ "ct-codecs", - "getrandom 0.2.16", + "getrandom 0.3.4", ] [[package]] @@ -2467,14 +2544,14 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] name = "env_filter" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" +checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2" dependencies = [ "log", "regex", @@ -2501,12 +2578,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -2537,9 +2614,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "5.4.0" +version = "5.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" +checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" dependencies = [ "concurrent-queue", "parking", @@ -2552,7 +2629,7 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" dependencies = [ - "event-listener 5.4.0", + "event-listener 5.4.1", "pin-project-lite", ] @@ -2563,12 +2640,12 @@ dependencies = [ "bip39", "console_error_panic_hook", "js-sys", + "nym-wasm-storage", + "nym-wasm-utils", "serde-wasm-bindgen 0.6.5", "thiserror 2.0.17", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-storage", - "wasm-utils", "zeroize", ] @@ -2597,7 +2674,7 @@ dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -2633,16 +2710,22 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "filetime" -version = "0.2.25" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed" dependencies = [ "cfg-if", "libc", "libredox", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] +[[package]] +name = "find-msvc-tools" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645cbb3a84e60b7531617d5ae4e57f7e27308f6445f5abf653209ea76dec8dff" + [[package]] name = "fixedbitset" version = "0.4.2" @@ -2651,9 +2734,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.1.2" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" +checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" dependencies = [ "crc32fast", "miniz_oxide", @@ -2694,9 +2777,9 @@ checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] name = "form_urlencoded" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" dependencies = [ "percent-encoding", ] @@ -2827,7 +2910,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -2866,20 +2949,6 @@ version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" -[[package]] -name = "generator" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d18470a76cb7f8ff746cf1f7470914f900252ec36bbc40b569d74b1258446827" -dependencies = [ - "cc", - "cfg-if", - "libc", - "log", - "rustversion", - "windows", -] - [[package]] name = "generic-array" version = "0.12.4" @@ -2910,21 +2979,21 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.1+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "js-sys", "libc", "r-efi", - "wasi 0.14.2+wasi-0.2.4", + "wasip2", "wasm-bindgen", ] @@ -2954,7 +3023,7 @@ dependencies = [ "futures-core", "futures-sink", "gloo-utils 0.2.0", - "http 1.3.1", + "http 1.4.0", "js-sys", "pin-project", "serde", @@ -3037,7 +3106,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.10.0", + "indexmap 2.13.0", "slab", "tokio", "tokio-util", @@ -3046,17 +3115,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17da50a276f1e01e0ba6c029e47b7100754904ee8a278f886546e98575380785" +checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54" dependencies = [ "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "http 1.3.1", - "indexmap 2.10.0", + "http 1.4.0", + "indexmap 2.13.0", "slab", "tokio", "tokio-util", @@ -3065,12 +3134,13 @@ dependencies = [ [[package]] name = "half" -version = "2.6.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" +checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" dependencies = [ "cfg-if", "crunchy", + "zerocopy", ] [[package]] @@ -3114,22 +3184,28 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ "allocator-api2", "equivalent", "foldhash", ] +[[package]] +name = "hashbrown" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" + [[package]] name = "hashlink" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" dependencies = [ - "hashbrown 0.15.4", + "hashbrown 0.15.5", ] [[package]] @@ -3154,7 +3230,7 @@ dependencies = [ "base64 0.22.1", "bytes", "headers-core", - "http 1.3.1", + "http 1.4.0", "httpdate", "mime", "sha1", @@ -3166,7 +3242,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" dependencies = [ - "http 1.3.1", + "http 1.4.0", ] [[package]] @@ -3195,9 +3271,12 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hex-conservative" -version = "0.1.2" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212ab92002354b4819390025006c897e8140934349e8635c9b077f47b4dcbd20" +checksum = "fda06d18ac606267c40c04e41b9947729bf8b9efe74bd4e82b61a5f26a510b9f" +dependencies = [ + "arrayvec", +] [[package]] name = "hex-literal" @@ -3219,18 +3298,18 @@ dependencies = [ "futures-channel", "futures-io", "futures-util", - "h2 0.4.11", - "http 1.3.1", + "h2 0.4.13", + "http 1.4.0", "idna", "ipnet", "once_cell", "rand 0.9.2", "ring", - "rustls 0.23.29", + "rustls 0.23.36", "thiserror 2.0.17", "tinyvec", "tokio", - "tokio-rustls 0.26.2", + "tokio-rustls 0.26.4", "tracing", "url", "webpki-roots 0.26.11", @@ -3251,11 +3330,11 @@ dependencies = [ "parking_lot", "rand 0.9.2", "resolv-conf", - "rustls 0.23.29", + "rustls 0.23.36", "smallvec", "thiserror 2.0.17", "tokio", - "tokio-rustls 0.26.2", + "tokio-rustls 0.26.4", "tracing", "webpki-roots 0.26.11", ] @@ -3292,9 +3371,9 @@ dependencies = [ [[package]] name = "hmac-sha1-compact" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18492c9f6f9a560e0d346369b665ad2bdbc89fa9bceca75796584e79042694c3" +checksum = "d1a4e188bd5d537801721276d1771f1cea235cd94961ddb2828eb76e16688356" [[package]] name = "hmac-sha256" @@ -3316,11 +3395,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -3347,12 +3426,11 @@ dependencies = [ [[package]] name = "http" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" dependencies = [ "bytes", - "fnv", "itoa", ] @@ -3374,7 +3452,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.3.1", + "http 1.4.0", ] [[package]] @@ -3385,7 +3463,7 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes", "futures-core", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "pin-project-lite", ] @@ -3426,9 +3504,9 @@ checksum = "f58b778a5761513caf593693f8951c97a5b610841e754788400f32102eefdff1" [[package]] name = "humantime" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" +checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" [[package]] name = "humantime-serde" @@ -3440,6 +3518,15 @@ dependencies = [ "serde", ] +[[package]] +name = "hybrid-array" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f471e0a81b2f90ffc0cb2f951ae04da57de8baa46fa99112b062a5173a5088d0" +dependencies = [ + "typenum", +] + [[package]] name = "hyper" version = "0.14.32" @@ -3466,20 +3553,22 @@ dependencies = [ [[package]] name = "hyper" -version = "1.6.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" dependencies = [ + "atomic-waker", "bytes", "futures-channel", - "futures-util", - "h2 0.4.11", - "http 1.3.1", + "futures-core", + "h2 0.4.13", + "http 1.4.0", "http-body 1.0.1", "httparse", "httpdate", "itoa", "pin-project-lite", + "pin-utils", "smallvec", "tokio", "want", @@ -3505,15 +3594,15 @@ version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ - "http 1.3.1", - "hyper 1.6.0", + "http 1.4.0", + "hyper 1.8.1", "hyper-util", - "rustls 0.23.29", + "rustls 0.23.36", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.2", + "tokio-rustls 0.26.4", "tower-service", - "webpki-roots 1.0.2", + "webpki-roots 1.0.5", ] [[package]] @@ -3522,7 +3611,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "hyper 1.6.0", + "hyper 1.8.1", "hyper-util", "pin-project-lite", "tokio", @@ -3531,23 +3620,23 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.16" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e" +checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" dependencies = [ "base64 0.22.1", "bytes", "futures-channel", "futures-core", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", - "hyper 1.6.0", + "hyper 1.8.1", "ipnet", "libc", "percent-encoding", "pin-project-lite", - "socket2 0.6.0", + "socket2 0.6.1", "tokio", "tower-service", "tracing", @@ -3555,9 +3644,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.63" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" +checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3565,7 +3654,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core", + "windows-core 0.62.2", ] [[package]] @@ -3612,9 +3701,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" dependencies = [ "displaydoc", "potential_utf", @@ -3625,9 +3714,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" dependencies = [ "displaydoc", "litemap", @@ -3638,11 +3727,10 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" dependencies = [ - "displaydoc", "icu_collections", "icu_normalizer_data", "icu_properties", @@ -3653,42 +3741,38 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "2.0.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" +checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" dependencies = [ - "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", "icu_provider", - "potential_utf", "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "2.0.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" +checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" [[package]] name = "icu_provider" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" dependencies = [ "displaydoc", "icu_locale_core", - "stable_deref_trait", - "tinystr", "writeable", "yoke", "zerofrom", @@ -3704,9 +3788,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" dependencies = [ "idna_adapter", "smallvec", @@ -3731,7 +3815,7 @@ checksum = "0ab604ee7085efba6efc65e4ebca0e9533e3aff6cb501d7d77b211e3a781c6d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -3765,9 +3849,9 @@ dependencies = [ [[package]] name = "indenter" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" +checksum = "964de6e86d545b246d84badc0fef527924ace5134f30641c203ef52ba83f58d5" [[package]] name = "indexed_db_futures" @@ -3778,7 +3862,7 @@ dependencies = [ "accessory", "cfg-if", "delegate-display", - "derive_more 2.0.1", + "derive_more 2.1.1", "fancy_constructor", "indexed_db_futures_macros_internal", "js-sys", @@ -3800,7 +3884,7 @@ dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -3816,24 +3900,25 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.10.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" dependencies = [ "equivalent", - "hashbrown 0.15.4", + "hashbrown 0.16.1", "serde", + "serde_core", ] [[package]] name = "indicatif" -version = "0.18.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a646d946d06bedbbc4cac4c218acf4bbf2d87757a784857025f4d447e4e1cd" +checksum = "9375e112e4b463ec1b1c6c011953545c65a30164fbab5b581df32b3abf0dcb88" dependencies = [ "console", "portable-atomic", - "unicode-width 0.2.1", + "unicode-width 0.2.2", "unit-prefix", "vt100", "web-time", @@ -3879,6 +3964,15 @@ dependencies = [ "generic-array 0.14.7", ] +[[package]] +name = "inout" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4250ce6452e92010fdf7268ccc5d14faa80bb12fc741938534c58f16804e03c7" +dependencies = [ + "hybrid-array", +] + [[package]] name = "inquire" version = "0.6.2" @@ -3954,9 +4048,9 @@ dependencies = [ [[package]] name = "iri-string" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" +checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a" dependencies = [ "memchr", "serde", @@ -3964,9 +4058,9 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" +checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", @@ -3975,9 +4069,9 @@ dependencies = [ [[package]] name = "is_terminal_polyfill" -version = "1.70.1" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "isahc" @@ -4024,49 +4118,49 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" [[package]] name = "jiff" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49" +checksum = "e67e8da4c49d6d9909fe03361f9b620f58898859f5c7aded68351e85e71ecf50" dependencies = [ "jiff-static", "log", "portable-atomic", "portable-atomic-util", - "serde", + "serde_core", ] [[package]] name = "jiff-static" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4" +checksum = "e0c84ee7f197eca9a86c6fd6cb771e55eb991632f15f2bc3ca6ec838929e6e78" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] name = "jobserver" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", "libc", ] [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" dependencies = [ "once_cell", "wasm-bindgen", @@ -4186,9 +4280,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.174" +version = "0.2.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" +checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" [[package]] name = "libm" @@ -4198,13 +4292,13 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "libredox" -version = "0.1.6" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4488594b9328dee448adb906d8b126d9b7deb7cf5c22161ee591610bb1be83c0" +checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "libc", - "redox_syscall", + "redox_syscall 0.7.0", ] [[package]] @@ -4220,9 +4314,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.22" +version = "1.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d" +checksum = "15d118bbf3771060e7311cc7bb0545b01d08a8b4a7de949198dec1fa0ca1c0f7" dependencies = [ "cc", "libc", @@ -4232,15 +4326,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" - -[[package]] -name = "linux-raw-sys" -version = "0.9.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" [[package]] name = "lioness" @@ -4256,38 +4344,30 @@ dependencies = [ [[package]] name = "litemap" -version = "0.8.0" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" + +[[package]] +name = "litrs" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" +checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" [[package]] name = "lock_api" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" dependencies = [ - "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" - -[[package]] -name = "loom" -version = "0.7.2" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "tracing", - "tracing-subscriber", -] +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "lru-slab" @@ -4321,7 +4401,7 @@ dependencies = [ "proc-macro2", "quote", "sealed", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -4333,7 +4413,7 @@ dependencies = [ "proc-macro2", "quote", "sealed", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -4346,7 +4426,7 @@ dependencies = [ "macroific_core", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -4374,7 +4454,7 @@ checksum = "ac84fd3f360fcc43dc5f5d186f02a94192761a080e8bc58621ad4d12296a58cf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -4404,9 +4484,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.5" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "memoffset" @@ -4435,9 +4515,9 @@ dependencies = [ [[package]] name = "minicov" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b" +checksum = "4869b6a491569605d66d3952bcdf03df789e5b536e5f0cf7758a7f08a55ae24d" dependencies = [ "cc", "walkdir", @@ -4456,6 +4536,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", + "simd-adler32", ] [[package]] @@ -4466,19 +4547,19 @@ checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", - "wasi 0.11.1+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] [[package]] name = "mio" -version = "1.0.4" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" dependencies = [ "libc", - "wasi 0.11.1+wasi-snapshot-preview1", - "windows-sys 0.59.0", + "wasi", + "windows-sys 0.61.2", ] [[package]] @@ -4494,6 +4575,8 @@ dependencies = [ "nym-service-providers-common", "nym-socks5-requests", "nym-validator-client", + "nym-wasm-client-core", + "nym-wasm-utils", "rand 0.8.5", "serde", "serde-wasm-bindgen 0.6.5", @@ -4503,8 +4586,6 @@ dependencies = [ "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-client-core", - "wasm-utils", ] [[package]] @@ -4530,23 +4611,21 @@ checksum = "dce6dd36094cac388f119d2e9dc82dc730ef91c32a6222170d630e5414b956e6" [[package]] name = "moka" -version = "0.12.10" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9321642ca94a4282428e6ea4af8cc2ca4eac48ac7a6a4ea8f33f76d0ce70926" +checksum = "a3dec6bd31b08944e08b58fd99373893a6c17054d6f3ea5006cc894f4f4eee2a" dependencies = [ "async-lock", "crossbeam-channel", "crossbeam-epoch", "crossbeam-utils", - "event-listener 5.4.0", + "equivalent", + "event-listener 5.4.1", "futures-util", - "loom", "parking_lot", "portable-atomic", - "rustc_version 0.4.1", "smallvec", "tagptr", - "thiserror 1.0.69", "uuid", ] @@ -4559,7 +4638,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http 1.3.1", + "http 1.4.0", "httparse", "memchr", "mime", @@ -4597,7 +4676,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55e5bda7ca0f9ac5e75b5debac3b75e29a8ac8e2171106a2c3bb466389a8dd83" dependencies = [ "anyhow", - "bitflags 2.9.1", + "bitflags 2.10.0", "byteorder", "libc", "log", @@ -4663,7 +4742,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "cfg-if", "cfg_aliases", "libc", @@ -4676,7 +4755,7 @@ version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "cfg-if", "cfg_aliases", "libc", @@ -4730,9 +4809,9 @@ dependencies = [ [[package]] name = "ntapi" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +checksum = "c70f219e21142367c70c0b30c6a9e3a14d55b4d12a204d897fbec83a0363f081" dependencies = [ "winapi", ] @@ -4749,11 +4828,11 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.50.1" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4768,11 +4847,10 @@ dependencies = [ [[package]] name = "num-bigint-dig" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7" dependencies = [ - "byteorder", "lazy_static", "libm", "num-integer", @@ -4840,7 +4918,7 @@ dependencies = [ [[package]] name = "nym-api" -version = "1.1.70" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -4896,9 +4974,9 @@ dependencies = [ "pin-project", "rand 0.8.5", "rand_chacha 0.3.1", - "reqwest 0.12.22", + "reqwest 0.12.28", "schemars 0.8.22", - "semver 1.0.26", + "semver 1.0.27", "serde", "serde_json", "sha2 0.10.9", @@ -4923,7 +5001,7 @@ dependencies = [ [[package]] name = "nym-api-requests" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bs58", "cosmrs", @@ -4961,7 +5039,7 @@ dependencies = [ [[package]] name = "nym-async-file-watcher" -version = "0.1.0" +version = "1.20.1" dependencies = [ "futures", "log", @@ -4971,7 +5049,7 @@ dependencies = [ [[package]] name = "nym-authenticator-client" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bincode", "futures", @@ -4984,7 +5062,7 @@ dependencies = [ "nym-service-provider-requests-common", "nym-validator-client", "nym-wireguard-types", - "semver 1.0.26", + "semver 1.0.27", "thiserror 2.0.17", "tokio", "tokio-util", @@ -4993,7 +5071,7 @@ dependencies = [ [[package]] name = "nym-authenticator-requests" -version = "0.1.0" +version = "1.20.1" dependencies = [ "base64 0.22.1", "bincode", @@ -5006,7 +5084,7 @@ dependencies = [ "nym-test-utils", "nym-wireguard-types", "rand 0.8.5", - "semver 1.0.26", + "semver 1.0.27", "serde", "sha2 0.10.9", "strum_macros", @@ -5017,7 +5095,7 @@ dependencies = [ [[package]] name = "nym-bandwidth-controller" -version = "0.1.0" +version = "1.20.1" dependencies = [ "async-trait", "log", @@ -5034,7 +5112,7 @@ dependencies = [ [[package]] name = "nym-bin-common" -version = "0.6.0" +version = "1.20.1" dependencies = [ "clap", "clap_complete", @@ -5054,9 +5132,26 @@ dependencies = [ "vergen 8.3.1", ] +[[package]] +name = "nym-bls12_381-fork" +version = "0.8.0-forked" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce84633751030f960a2fd167b5270ec21da4c40d9b6400e1b56676a682fe6f3d" +dependencies = [ + "digest 0.10.7", + "ff", + "group", + "pairing", + "rand_core 0.6.4", + "serde", + "serdect 0.3.0", + "subtle 2.6.1", + "zeroize", +] + [[package]] name = "nym-cache" -version = "0.1.0" +version = "1.20.1" dependencies = [ "tokio", ] @@ -5087,7 +5182,7 @@ dependencies = [ [[package]] name = "nym-cli-commands" -version = "1.0.0" +version = "1.20.1" dependencies = [ "anyhow", "base64 0.22.1", @@ -5183,7 +5278,7 @@ dependencies = [ [[package]] name = "nym-client-core" -version = "1.1.15" +version = "1.20.1" dependencies = [ "async-trait", "base64 0.22.1", @@ -5195,7 +5290,7 @@ dependencies = [ "gloo-timers", "http-body-util", "humantime", - "hyper 1.6.0", + "hyper 1.8.1", "hyper-util", "nym-bandwidth-controller", "nym-client-core-config-types", @@ -5219,6 +5314,7 @@ dependencies = [ "nym-task", "nym-topology", "nym-validator-client", + "nym-wasm-utils", "rand 0.8.5", "rand_chacha 0.3.1", "serde", @@ -5237,14 +5333,13 @@ dependencies = [ "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-utils", "wasmtimer", "zeroize", ] [[package]] name = "nym-client-core-config-types" -version = "0.1.0" +version = "1.20.1" dependencies = [ "humantime-serde", "nym-config", @@ -5259,7 +5354,7 @@ dependencies = [ [[package]] name = "nym-client-core-gateways-storage" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -5278,16 +5373,16 @@ dependencies = [ [[package]] name = "nym-client-core-surb-storage" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", "dashmap", "nym-crypto", "nym-sphinx", + "nym-sqlx-pool-guard", "nym-task", "sqlx", - "sqlx-pool-guard", "thiserror 2.0.17", "time", "tokio", @@ -5306,6 +5401,8 @@ dependencies = [ "nym-gateway-requests", "nym-node-tester-utils", "nym-node-tester-wasm", + "nym-wasm-client-core", + "nym-wasm-utils", "once_cell", "rand 0.8.5", "serde", @@ -5317,14 +5414,12 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "wasm-bindgen-test", - "wasm-client-core", - "wasm-utils", "web-sys", ] [[package]] name = "nym-client-websocket-requests" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-sphinx", "serde", @@ -5333,7 +5428,7 @@ dependencies = [ [[package]] name = "nym-coconut-dkg-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -5346,7 +5441,7 @@ dependencies = [ [[package]] name = "nym-common" -version = "1.18.0" +version = "1.20.1" dependencies = [ "tracing", "tracing-test", @@ -5354,10 +5449,9 @@ dependencies = [ [[package]] name = "nym-compact-ecash" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bincode", - "bls12_381", "bs58", "cfg-if", "criterion", @@ -5365,6 +5459,7 @@ dependencies = [ "ff", "group", "itertools 0.14.0", + "nym-bls12_381-fork", "nym-network-defaults", "nym-pemstore", "rand 0.8.5", @@ -5378,7 +5473,7 @@ dependencies = [ [[package]] name = "nym-config" -version = "0.1.0" +version = "1.20.1" dependencies = [ "dirs", "handlebars", @@ -5410,7 +5505,7 @@ dependencies = [ [[package]] name = "nym-contracts-common" -version = "0.5.0" +version = "1.20.1" dependencies = [ "anyhow", "bs58", @@ -5427,7 +5522,7 @@ dependencies = [ [[package]] name = "nym-contracts-common-testing" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "cosmwasm-std", @@ -5441,7 +5536,7 @@ dependencies = [ [[package]] name = "nym-cpp-ffi" -version = "0.1.2" +version = "1.20.1" dependencies = [ "anyhow", "bs58", @@ -5482,7 +5577,7 @@ dependencies = [ "nym-upgrade-mode-check", "nym-validator-client", "rand 0.8.5", - "reqwest 0.12.22", + "reqwest 0.12.28", "serde", "serde_json", "sqlx", @@ -5504,7 +5599,7 @@ dependencies = [ [[package]] name = "nym-credential-proxy-lib" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "axum", @@ -5523,7 +5618,7 @@ dependencies = [ "nym-network-defaults", "nym-validator-client", "rand 0.8.5", - "reqwest 0.12.22", + "reqwest 0.12.28", "serde", "serde_json", "sqlx", @@ -5542,7 +5637,7 @@ dependencies = [ [[package]] name = "nym-credential-proxy-requests" -version = "0.1.0" +version = "1.20.1" dependencies = [ "async-trait", "nym-credentials", @@ -5551,7 +5646,7 @@ dependencies = [ "nym-http-api-common", "nym-serde-helpers", "nym-upgrade-mode-check", - "reqwest 0.12.22", + "reqwest 0.12.28", "schemars 0.8.22", "serde", "serde_json", @@ -5566,7 +5661,7 @@ dependencies = [ [[package]] name = "nym-credential-storage" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -5577,10 +5672,10 @@ dependencies = [ "nym-credentials-interface", "nym-crypto", "nym-ecash-time", + "nym-sqlx-pool-guard", "nym-test-utils", "serde", "sqlx", - "sqlx-pool-guard", "thiserror 2.0.17", "time", "tokio", @@ -5589,7 +5684,7 @@ dependencies = [ [[package]] name = "nym-credential-utils" -version = "0.1.0" +version = "1.20.1" dependencies = [ "log", "nym-bandwidth-controller", @@ -5607,7 +5702,7 @@ dependencies = [ [[package]] name = "nym-credential-verification" -version = "0.1.0" +version = "1.20.1" dependencies = [ "async-trait", "bs58", @@ -5634,13 +5729,13 @@ dependencies = [ [[package]] name = "nym-credentials" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bincode", - "bls12_381", "cosmrs", "log", "nym-api-requests", + "nym-bls12_381-fork", "nym-credentials-interface", "nym-crypto", "nym-ecash-contract-common", @@ -5658,9 +5753,9 @@ dependencies = [ [[package]] name = "nym-credentials-interface" -version = "0.1.0" +version = "1.20.1" dependencies = [ - "bls12_381", + "nym-bls12_381-fork", "nym-compact-ecash", "nym-ecash-time", "nym-network-defaults", @@ -5676,16 +5771,16 @@ dependencies = [ [[package]] name = "nym-crypto" -version = "0.4.0" +version = "1.20.1" dependencies = [ "aead", - "aes", + "aes 0.8.4", "aes-gcm-siv", "anyhow", "base64 0.22.1", "blake3", "bs58", - "cipher", + "cipher 0.4.4", "ctr", "digest 0.10.7", "ed25519-dalek", @@ -5727,7 +5822,7 @@ dependencies = [ "nym-validator-client", "nyxd-scraper-psql", "nyxd-scraper-shared", - "reqwest 0.12.22", + "reqwest 0.12.28", "schemars 0.8.22", "serde", "serde_json", @@ -5747,14 +5842,14 @@ dependencies = [ [[package]] name = "nym-dkg" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bitvec", - "bls12_381", "bs58", "criterion", "ff", "group", + "nym-bls12_381-fork", "nym-contracts-common", "nym-pemstore", "rand 0.8.5", @@ -5769,7 +5864,7 @@ dependencies = [ [[package]] name = "nym-ecash-contract-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bs58", "cosmwasm-schema", @@ -5783,14 +5878,14 @@ dependencies = [ [[package]] name = "nym-ecash-signer-check" -version = "0.1.0" +version = "1.20.1" dependencies = [ "futures", "nym-ecash-signer-check-types", "nym-http-api-client", "nym-network-defaults", "nym-validator-client", - "semver 1.0.26", + "semver 1.0.27", "thiserror 2.0.17", "tokio", "tracing", @@ -5799,11 +5894,11 @@ dependencies = [ [[package]] name = "nym-ecash-signer-check-types" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-coconut-dkg-common", "nym-crypto", - "semver 1.0.26", + "semver 1.0.27", "serde", "thiserror 2.0.17", "time", @@ -5814,7 +5909,7 @@ dependencies = [ [[package]] name = "nym-ecash-time" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-compact-ecash", "time", @@ -5822,9 +5917,9 @@ dependencies = [ [[package]] name = "nym-exit-policy" -version = "0.1.0" +version = "1.20.1" dependencies = [ - "reqwest 0.12.22", + "reqwest 0.12.28", "serde", "serde_json", "thiserror 2.0.17", @@ -5834,7 +5929,7 @@ dependencies = [ [[package]] name = "nym-ffi-shared" -version = "0.2.1" +version = "1.20.1" dependencies = [ "anyhow", "bs58", @@ -5902,7 +5997,7 @@ dependencies = [ [[package]] name = "nym-gateway-client" -version = "0.1.0" +version = "1.20.1" dependencies = [ "futures", "getrandom 0.2.16", @@ -5920,6 +6015,7 @@ dependencies = [ "nym-statistics-common", "nym-task", "nym-validator-client", + "nym-wasm-utils", "rand 0.8.5", "serde", "si-scale", @@ -5933,7 +6029,6 @@ dependencies = [ "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-utils", "wasmtimer", "zeroize", ] @@ -5985,7 +6080,7 @@ dependencies = [ [[package]] name = "nym-gateway-requests" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "bs58", @@ -6017,7 +6112,7 @@ dependencies = [ [[package]] name = "nym-gateway-stats-storage" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "nym-node-metrics", @@ -6033,7 +6128,7 @@ dependencies = [ [[package]] name = "nym-gateway-storage" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -6052,7 +6147,7 @@ dependencies = [ [[package]] name = "nym-go-ffi" -version = "0.2.2" +version = "1.20.1" dependencies = [ "anyhow", "lazy_static", @@ -6069,7 +6164,7 @@ dependencies = [ [[package]] name = "nym-group-contract-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cosmwasm-schema", "cw-controllers", @@ -6080,7 +6175,7 @@ dependencies = [ [[package]] name = "nym-http-api-client" -version = "0.1.0" +version = "1.20.1" dependencies = [ "async-trait", "bincode", @@ -6088,7 +6183,7 @@ dependencies = [ "cfg-if", "encoding_rs", "hickory-resolver", - "http 1.3.1", + "http 1.4.0", "inventory", "itertools 0.14.0", "mime", @@ -6097,7 +6192,7 @@ dependencies = [ "nym-http-api-common", "nym-network-defaults", "once_cell", - "reqwest 0.12.22", + "reqwest 0.12.28", "serde", "serde_json", "serde_plain", @@ -6112,20 +6207,20 @@ dependencies = [ [[package]] name = "nym-http-api-client-macro" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-http-api-client", "proc-macro-crate", "proc-macro2", "quote", - "reqwest 0.12.22", - "syn 2.0.104", + "reqwest 0.12.28", + "syn 2.0.114", "uuid", ] [[package]] name = "nym-http-api-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "axum", "axum-client-ip", @@ -6147,7 +6242,7 @@ dependencies = [ [[package]] name = "nym-id" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-credential-storage", "nym-credentials", @@ -6173,7 +6268,7 @@ dependencies = [ [[package]] name = "nym-inclusion-probability" -version = "0.1.0" +version = "1.20.1" dependencies = [ "log", "rand 0.8.5", @@ -6182,7 +6277,7 @@ dependencies = [ [[package]] name = "nym-ip-packet-client" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bincode", "bytes", @@ -6197,7 +6292,7 @@ dependencies = [ [[package]] name = "nym-ip-packet-requests" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bincode", "bytes", @@ -6215,7 +6310,7 @@ dependencies = [ [[package]] name = "nym-ip-packet-router" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -6245,7 +6340,7 @@ dependencies = [ "nym-wireguard", "nym-wireguard-types", "rand 0.8.5", - "reqwest 0.12.22", + "reqwest 0.12.28", "serde", "serde_json", "thiserror 2.0.17", @@ -6258,7 +6353,7 @@ dependencies = [ [[package]] name = "nym-ledger" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bip32", "k256", @@ -6269,7 +6364,7 @@ dependencies = [ [[package]] name = "nym-metrics" -version = "0.1.0" +version = "1.20.1" dependencies = [ "dashmap", "lazy_static", @@ -6279,7 +6374,7 @@ dependencies = [ [[package]] name = "nym-mixnet-client" -version = "0.1.0" +version = "1.20.1" dependencies = [ "dashmap", "futures", @@ -6296,7 +6391,7 @@ dependencies = [ [[package]] name = "nym-mixnet-contract-common" -version = "0.6.0" +version = "1.20.1" dependencies = [ "bs58", "cosmwasm-schema", @@ -6308,7 +6403,7 @@ dependencies = [ "nym-contracts-common", "rand_chacha 0.3.1", "schemars 0.8.22", - "semver 1.0.26", + "semver 1.0.27", "serde", "serde_repr", "thiserror 2.0.17", @@ -6319,7 +6414,7 @@ dependencies = [ [[package]] name = "nym-mixnode-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bytes", "futures", @@ -6346,7 +6441,7 @@ dependencies = [ [[package]] name = "nym-multisig-contract-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -6361,7 +6456,7 @@ dependencies = [ [[package]] name = "nym-network-defaults" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cargo_metadata 0.19.2", "dotenvy", @@ -6398,7 +6493,7 @@ dependencies = [ "petgraph", "rand 0.8.5", "rand_chacha 0.3.1", - "reqwest 0.12.22", + "reqwest 0.12.28", "serde", "serde_json", "tokio", @@ -6444,7 +6539,7 @@ dependencies = [ "publicsuffix", "rand 0.8.5", "regex", - "reqwest 0.12.22", + "reqwest 0.12.28", "serde", "serde_json", "sqlx", @@ -6546,7 +6641,7 @@ dependencies = [ [[package]] name = "nym-node-metrics" -version = "0.1.0" +version = "1.20.1" dependencies = [ "dashmap", "futures", @@ -6560,7 +6655,7 @@ dependencies = [ [[package]] name = "nym-node-requests" -version = "0.1.0" +version = "1.20.1" dependencies = [ "async-trait", "celes", @@ -6639,8 +6734,8 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "regex", - "reqwest 0.12.22", - "semver 1.0.26", + "reqwest 0.12.28", + "semver 1.0.27", "serde", "serde_json", "serde_json_path", @@ -6671,7 +6766,7 @@ dependencies = [ "bs58", "nym-credentials", "nym-crypto", - "reqwest 0.12.22", + "reqwest 0.12.28", "serde", "serde_json", "time", @@ -6680,7 +6775,7 @@ dependencies = [ [[package]] name = "nym-node-tester-utils" -version = "0.1.0" +version = "1.20.1" dependencies = [ "futures", "log", @@ -6689,13 +6784,13 @@ dependencies = [ "nym-sphinx-params", "nym-task", "nym-topology", + "nym-wasm-utils", "rand 0.8.5", "rand_chacha 0.3.1", "serde", "serde_json", "thiserror 2.0.17", "tokio", - "wasm-utils", ] [[package]] @@ -6705,6 +6800,8 @@ dependencies = [ "futures", "js-sys", "nym-node-tester-utils", + "nym-wasm-client-core", + "nym-wasm-utils", "rand 0.8.5", "serde", "serde-wasm-bindgen 0.6.5", @@ -6713,14 +6810,12 @@ dependencies = [ "tsify", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-client-core", - "wasm-utils", "wasmtimer", ] [[package]] name = "nym-noise" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "arc-swap", @@ -6743,7 +6838,7 @@ dependencies = [ [[package]] name = "nym-noise-keys" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-crypto", "schemars 0.8.22", @@ -6753,7 +6848,7 @@ dependencies = [ [[package]] name = "nym-nonexhaustive-delayqueue" -version = "0.1.0" +version = "1.20.1" dependencies = [ "tokio", "tokio-stream", @@ -6779,7 +6874,7 @@ dependencies = [ [[package]] name = "nym-ordered-buffer" -version = "0.1.0" +version = "1.20.1" dependencies = [ "log", "thiserror 2.0.17", @@ -6787,7 +6882,7 @@ dependencies = [ [[package]] name = "nym-outfox" -version = "0.1.0" +version = "1.20.1" dependencies = [ "blake3", "chacha20", @@ -6806,7 +6901,7 @@ dependencies = [ [[package]] name = "nym-pemstore" -version = "0.3.0" +version = "1.20.1" dependencies = [ "pem", "tracing", @@ -6815,7 +6910,7 @@ dependencies = [ [[package]] name = "nym-performance-contract-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -6828,7 +6923,7 @@ dependencies = [ [[package]] name = "nym-pool-contract-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -6841,7 +6936,7 @@ dependencies = [ [[package]] name = "nym-registration-client" -version = "0.1.0" +version = "1.20.1" dependencies = [ "futures", "nym-authenticator-client", @@ -6862,7 +6957,7 @@ dependencies = [ [[package]] name = "nym-registration-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-authenticator-requests", "nym-crypto", @@ -6874,7 +6969,7 @@ dependencies = [ [[package]] name = "nym-sdk" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -6888,7 +6983,7 @@ dependencies = [ "dotenvy", "futures", "hex", - "http 1.3.1", + "http 1.4.0", "httpcodec", "log", "nym-bandwidth-controller", @@ -6914,7 +7009,7 @@ dependencies = [ "nym-validator-client", "parking_lot", "rand 0.8.5", - "reqwest 0.12.22", + "reqwest 0.12.28", "serde", "tap", "tempfile", @@ -6933,7 +7028,7 @@ dependencies = [ [[package]] name = "nym-serde-helpers" -version = "0.1.0" +version = "1.20.1" dependencies = [ "base64 0.22.1", "bs58", @@ -6944,7 +7039,7 @@ dependencies = [ [[package]] name = "nym-service-provider-requests-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bincode", "serde", @@ -6953,7 +7048,7 @@ dependencies = [ [[package]] name = "nym-service-providers-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -7023,7 +7118,7 @@ dependencies = [ [[package]] name = "nym-socks5-client-core" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "dirs", @@ -7044,7 +7139,7 @@ dependencies = [ "nym-validator-client", "pin-project", "rand 0.8.5", - "reqwest 0.12.22", + "reqwest 0.12.28", "schemars 0.8.22", "serde", "tap", @@ -7055,7 +7150,7 @@ dependencies = [ [[package]] name = "nym-socks5-proxy-helpers" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bytes", "futures", @@ -7070,7 +7165,7 @@ dependencies = [ [[package]] name = "nym-socks5-requests" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bincode", "log", @@ -7085,7 +7180,7 @@ dependencies = [ [[package]] name = "nym-sphinx" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-crypto", "nym-metrics", @@ -7111,7 +7206,7 @@ dependencies = [ [[package]] name = "nym-sphinx-acknowledgements" -version = "0.1.0" +version = "1.20.1" dependencies = [ "generic-array 0.14.7", "nym-crypto", @@ -7129,7 +7224,7 @@ dependencies = [ [[package]] name = "nym-sphinx-addressing" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bincode", "nym-crypto", @@ -7142,7 +7237,7 @@ dependencies = [ [[package]] name = "nym-sphinx-anonymous-replies" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bs58", "nym-crypto", @@ -7160,7 +7255,7 @@ dependencies = [ [[package]] name = "nym-sphinx-chunking" -version = "0.1.0" +version = "1.20.1" dependencies = [ "dashmap", "log", @@ -7178,7 +7273,7 @@ dependencies = [ [[package]] name = "nym-sphinx-cover" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-crypto", "nym-sphinx-acknowledgements", @@ -7195,7 +7290,7 @@ dependencies = [ [[package]] name = "nym-sphinx-forwarding" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-sphinx-addressing", "nym-sphinx-anonymous-replies", @@ -7206,7 +7301,7 @@ dependencies = [ [[package]] name = "nym-sphinx-framing" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bytes", "nym-sphinx-acknowledgements", @@ -7222,7 +7317,7 @@ dependencies = [ [[package]] name = "nym-sphinx-params" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-crypto", "nym-sphinx-types", @@ -7232,7 +7327,7 @@ dependencies = [ [[package]] name = "nym-sphinx-routing" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-sphinx-addressing", "nym-sphinx-types", @@ -7241,13 +7336,26 @@ dependencies = [ [[package]] name = "nym-sphinx-types" -version = "0.2.0" +version = "1.20.1" dependencies = [ "nym-outfox", "sphinx-packet", "thiserror 2.0.17", ] +[[package]] +name = "nym-sqlx-pool-guard" +version = "1.20.1" +dependencies = [ + "proc_pidinfo", + "sqlx", + "tempfile", + "tokio", + "tracing", + "tracing-subscriber", + "windows", +] + [[package]] name = "nym-statistics-api" version = "0.3.1" @@ -7280,7 +7388,7 @@ dependencies = [ [[package]] name = "nym-statistics-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "futures", "log", @@ -7305,7 +7413,7 @@ dependencies = [ [[package]] name = "nym-store-cipher" -version = "0.1.0" +version = "1.20.1" dependencies = [ "aes-gcm", "argon2", @@ -7320,7 +7428,7 @@ dependencies = [ [[package]] name = "nym-task" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "cfg-if", @@ -7338,7 +7446,7 @@ dependencies = [ [[package]] name = "nym-test-utils" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "futures", @@ -7348,7 +7456,7 @@ dependencies = [ [[package]] name = "nym-ticketbooks-merkle" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-credentials-interface", "nym-serde-helpers", @@ -7365,7 +7473,7 @@ dependencies = [ [[package]] name = "nym-topology" -version = "0.1.0" +version = "1.20.1" dependencies = [ "async-trait", "nym-api-requests", @@ -7373,8 +7481,9 @@ dependencies = [ "nym-mixnet-contract-common", "nym-sphinx-addressing", "nym-sphinx-types", + "nym-wasm-utils", "rand 0.8.5", - "reqwest 0.12.22", + "reqwest 0.12.28", "serde", "serde_json", "thiserror 2.0.17", @@ -7382,12 +7491,11 @@ dependencies = [ "tracing", "tsify", "wasm-bindgen", - "wasm-utils", ] [[package]] name = "nym-tun" -version = "0.1.0" +version = "1.20.1" dependencies = [ "etherparse", "log", @@ -7399,7 +7507,7 @@ dependencies = [ [[package]] name = "nym-types" -version = "1.0.0" +version = "1.20.1" dependencies = [ "base64 0.22.1", "cosmrs", @@ -7413,7 +7521,7 @@ dependencies = [ "nym-mixnet-contract-common", "nym-validator-client", "nym-vesting-contract-common", - "reqwest 0.12.22", + "reqwest 0.12.28", "schemars 0.8.22", "serde", "serde_json", @@ -7430,14 +7538,14 @@ dependencies = [ [[package]] name = "nym-upgrade-mode-check" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "jwt-simple", "nym-crypto", "nym-http-api-client", "nym-test-utils", - "reqwest 0.12.22", + "reqwest 0.12.28", "serde", "serde_json", "thiserror 2.0.17", @@ -7448,7 +7556,7 @@ dependencies = [ [[package]] name = "nym-validator-client" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -7482,7 +7590,7 @@ dependencies = [ "nym-serde-helpers", "nym-vesting-contract-common", "prost", - "reqwest 0.12.22", + "reqwest 0.12.28", "serde", "serde_json", "sha2 0.10.9", @@ -7542,7 +7650,7 @@ dependencies = [ [[package]] name = "nym-verloc" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bytes", "futures", @@ -7563,7 +7671,7 @@ dependencies = [ [[package]] name = "nym-vesting-contract-common" -version = "0.7.0" +version = "1.20.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -7577,7 +7685,7 @@ dependencies = [ [[package]] name = "nym-vpn-api-lib-wasm" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bs58", "getrandom 0.2.16", @@ -7589,6 +7697,7 @@ dependencies = [ "nym-credentials-interface", "nym-crypto", "nym-ecash-time", + "nym-wasm-utils", "serde", "serde-wasm-bindgen 0.6.5", "serde_json", @@ -7596,7 +7705,6 @@ dependencies = [ "time", "tsify", "wasm-bindgen", - "wasm-utils", "zeroize", ] @@ -7620,9 +7728,75 @@ dependencies = [ "ts-rs", ] +[[package]] +name = "nym-wasm-client-core" +version = "1.20.1" +dependencies = [ + "async-trait", + "console_error_panic_hook", + "js-sys", + "nym-bandwidth-controller", + "nym-client-core", + "nym-config", + "nym-credential-storage", + "nym-crypto", + "nym-gateway-client", + "nym-http-api-client", + "nym-sphinx", + "nym-sphinx-acknowledgements", + "nym-statistics-common", + "nym-task", + "nym-topology", + "nym-validator-client", + "nym-wasm-storage", + "nym-wasm-utils", + "rand 0.8.5", + "serde", + "serde-wasm-bindgen 0.6.5", + "thiserror 2.0.17", + "time", + "tsify", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "zeroize", +] + +[[package]] +name = "nym-wasm-storage" +version = "1.20.1" +dependencies = [ + "async-trait", + "getrandom 0.2.16", + "indexed_db_futures", + "js-sys", + "nym-store-cipher", + "nym-wasm-utils", + "serde", + "serde-wasm-bindgen 0.6.5", + "thiserror 2.0.17", + "wasm-bindgen", +] + +[[package]] +name = "nym-wasm-utils" +version = "1.20.1" +dependencies = [ + "console_error_panic_hook", + "futures", + "getrandom 0.2.16", + "gloo-net", + "gloo-utils 0.2.0", + "js-sys", + "tungstenite 0.20.1", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "nym-wireguard" -version = "0.1.0" +version = "1.20.1" dependencies = [ "base64 0.22.1", "defguard_wireguard_rs", @@ -7645,7 +7819,7 @@ dependencies = [ [[package]] name = "nym-wireguard-private-metadata-client" -version = "1.0.0" +version = "1.20.1" dependencies = [ "async-trait", "nym-http-api-client", @@ -7655,7 +7829,7 @@ dependencies = [ [[package]] name = "nym-wireguard-private-metadata-server" -version = "1.0.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -7675,7 +7849,7 @@ dependencies = [ [[package]] name = "nym-wireguard-private-metadata-shared" -version = "1.0.0" +version = "1.20.1" dependencies = [ "axum", "bincode", @@ -7688,7 +7862,7 @@ dependencies = [ [[package]] name = "nym-wireguard-private-metadata-tests" -version = "1.0.0" +version = "1.20.1" dependencies = [ "async-trait", "axum", @@ -7712,7 +7886,7 @@ dependencies = [ [[package]] name = "nym-wireguard-types" -version = "0.1.0" +version = "1.20.1" dependencies = [ "base64 0.22.1", "nym-crypto", @@ -7724,7 +7898,7 @@ dependencies = [ [[package]] name = "nymvisor" -version = "0.1.32" +version = "1.20.1" dependencies = [ "anyhow", "bytes", @@ -7740,7 +7914,7 @@ dependencies = [ "nym-bin-common", "nym-config", "nym-task", - "reqwest 0.12.22", + "reqwest 0.12.28", "serde", "serde_json", "sha2 0.10.9", @@ -7767,7 +7941,7 @@ dependencies = [ "nym-task", "nym-validator-client", "nyxd-scraper-sqlite", - "reqwest 0.12.22", + "reqwest 0.12.28", "schemars 0.8.22", "serde", "sqlx", @@ -7802,7 +7976,7 @@ dependencies = [ [[package]] name = "nyxd-scraper-shared" -version = "0.1.0" +version = "1.20.1" dependencies = [ "async-trait", "base64 0.22.1", @@ -7847,7 +8021,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", ] [[package]] @@ -7872,9 +8046,9 @@ dependencies = [ [[package]] name = "once_cell_polyfill" -version = "1.70.1" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "oorandom" @@ -7902,9 +8076,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" -version = "0.9.110" +version = "0.9.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a9f0075ba3c21b09f8e8b2026584b1d18d49388648f2fbbf3c97ea8deced8e2" +checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" dependencies = [ "cc", "libc", @@ -8064,9 +8238,9 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" dependencies = [ "lock_api", "parking_lot_core", @@ -8074,15 +8248,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.11" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.18", "smallvec", - "windows-targets 0.52.6", + "windows-link 0.2.1", ] [[package]] @@ -8151,26 +8325,25 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pest" -version = "2.8.1" +version = "2.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323" +checksum = "2c9eb05c21a464ea704b53158d358a31e6425db2f63a1a7312268b05fe2b75f7" dependencies = [ "memchr", - "thiserror 2.0.17", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.8.1" +version = "2.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb056d9e8ea77922845ec74a1c4e8fb17e7c218cc4fc11a15c5d25e189aa40bc" +checksum = "68f9dbced329c441fa79d80472764b1a2c7e57123553b8519b36663a2fb234ed" dependencies = [ "pest", "pest_generator", @@ -8178,22 +8351,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.8.1" +version = "2.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e404e638f781eb3202dc82db6760c8ae8a1eeef7fb3fa8264b2ef280504966" +checksum = "3bb96d5051a78f44f43c8f712d8e810adb0ebf923fc9ed2655a7f66f63ba8ee5" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] name = "pest_meta" -version = "2.8.1" +version = "2.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd1101f170f5903fde0914f899bb503d9ff5271d7ba76bbb70bea63690cc0d5" +checksum = "602113b5b5e8621770cfd490cfd90b9f84ab29bd2b0e49ad83eb6d186cef2365" dependencies = [ "pest", "sha2 0.10.9", @@ -8206,7 +8379,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.10.0", + "indexmap 2.13.0", ] [[package]] @@ -8216,7 +8389,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" dependencies = [ "phf_macros", - "phf_shared", + "phf_shared 0.11.3", +] + +[[package]] +name = "phf" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" +dependencies = [ + "phf_shared 0.13.1", + "serde", ] [[package]] @@ -8226,7 +8409,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" dependencies = [ "phf_generator", - "phf_shared", + "phf_shared 0.11.3", ] [[package]] @@ -8235,7 +8418,7 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" dependencies = [ - "phf_shared", + "phf_shared 0.11.3", "rand 0.8.5", ] @@ -8246,10 +8429,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" dependencies = [ "phf_generator", - "phf_shared", + "phf_shared 0.11.3", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -8261,6 +8444,15 @@ dependencies = [ "siphasher 1.0.1", ] +[[package]] +name = "phf_shared" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" +dependencies = [ + "siphasher 1.0.1", +] + [[package]] name = "pin-project" version = "1.1.10" @@ -8278,7 +8470,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -8372,7 +8564,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -8437,9 +8629,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.11.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" +checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950" [[package]] name = "portable-atomic-util" @@ -8452,9 +8644,9 @@ dependencies = [ [[package]] name = "postgres-protocol" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ff0abab4a9b844b93ef7b81f1efc0a366062aaef2cd702c76256b5dc075c54" +checksum = "fbef655056b916eb868048276cfd5d6a7dea4f81560dfd047f97c8c6fe3fcfd4" dependencies = [ "base64 0.22.1", "byteorder", @@ -8470,9 +8662,9 @@ dependencies = [ [[package]] name = "postgres-types" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613283563cd90e1dfc3518d548caee47e0e725455ed619881f5cf21f36de4b48" +checksum = "ef4605b7c057056dd35baeb6ac0c0338e4975b1f2bef0f65da953285eb007095" dependencies = [ "bytes", "fallible-iterator", @@ -8481,9 +8673,9 @@ dependencies = [ [[package]] name = "potential_utf" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" dependencies = [ "zerovec", ] @@ -8534,7 +8726,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" dependencies = [ - "toml_edit 0.23.5", + "toml_edit 0.23.10+spec-1.0.0", ] [[package]] @@ -8556,14 +8748,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] name = "proc-macro2" -version = "1.0.95" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7" dependencies = [ "unicode-ident", ] @@ -8612,7 +8804,7 @@ dependencies = [ "itertools 0.14.0", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -8646,9 +8838,9 @@ dependencies = [ [[package]] name = "psl" -version = "2.1.126" +version = "2.1.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f621acfbd2ca5670eee9a95270747dfa9a29e63e1937d7e6a1ac6994331966" +checksum = "5f06bb516febf92008f7e4ebdc1129a75e07905eadc4601af27093cb83928c78" dependencies = [ "psl-types", ] @@ -8677,9 +8869,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quinn" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" dependencies = [ "bytes", "cfg_aliases", @@ -8687,8 +8879,8 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.23.29", - "socket2 0.5.10", + "rustls 0.23.36", + "socket2 0.6.1", "thiserror 2.0.17", "tokio", "tracing", @@ -8697,17 +8889,17 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.12" +version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" dependencies = [ "bytes", - "getrandom 0.3.3", + "getrandom 0.3.4", "lru-slab", "rand 0.9.2", "ring", "rustc-hash", - "rustls 0.23.29", + "rustls 0.23.36", "rustls-pki-types", "slab", "thiserror 2.0.17", @@ -8718,23 +8910,23 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.13" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.10", + "socket2 0.6.1", "tracing", "windows-sys 0.59.0", ] [[package]] name = "quote" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a" dependencies = [ "proc-macro2", ] @@ -8807,7 +8999,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", ] [[package]] @@ -8822,9 +9014,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -8832,21 +9024,30 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.1" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "crossbeam-deque", - "crossbeam-utils", + "bitflags 2.10.0", ] [[package]] name = "redox_syscall" -version = "0.5.15" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8af0dde094006011e6a740d4879319439489813bd0bcdc7d821beaeeff48ec" +checksum = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", ] [[package]] @@ -8862,29 +9063,29 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] name = "regex" -version = "1.11.1" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" dependencies = [ "aho-corasick", "memchr", @@ -8894,9 +9095,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" dependencies = [ "aho-corasick", "memchr", @@ -8905,9 +9106,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "reqwest" @@ -8952,19 +9153,18 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.22" +version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531" +checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ - "async-compression", "base64 0.22.1", "bytes", "futures-core", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", - "hyper 1.6.0", + "hyper 1.8.1", "hyper-rustls 0.27.7", "hyper-util", "js-sys", @@ -8972,14 +9172,14 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.29", + "rustls 0.23.36", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper 1.0.2", "tokio", - "tokio-rustls 0.26.2", + "tokio-rustls 0.26.4", "tokio-util", "tower 0.5.2", "tower-http", @@ -8989,7 +9189,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 1.0.2", + "webpki-roots 1.0.5", ] [[package]] @@ -9003,9 +9203,9 @@ dependencies = [ [[package]] name = "resolv-conf" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95325155c684b1c89f7765e30bc1c42e4a6da51ca513615660cb8a62ef9a88e3" +checksum = "1e061d1b48cb8d38042de4ae0a7a6401009d6143dc80d2e2d6f31f0bdd6470c7" [[package]] name = "rfc6979" @@ -9042,22 +9242,19 @@ dependencies = [ [[package]] name = "rmp" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" +checksum = "4ba8be72d372b2c9b35542551678538b562e7cf86c3315773cae48dfbfe7790c" dependencies = [ - "byteorder", "num-traits", - "paste", ] [[package]] name = "rmp-serde" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" +checksum = "72f81bee8c8ef9b577d1681a70ebbc962c232461e397b22c208c43c04b67a155" dependencies = [ - "byteorder", "rmp", "serde", ] @@ -9073,9 +9270,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.8" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b" +checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d" dependencies = [ "const-oid", "digest 0.10.7", @@ -9094,9 +9291,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "8.7.2" +version = "8.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025908b8682a26ba8d12f6f2d66b987584a4a87bc024abc5bbc12553a8cd178a" +checksum = "947d7f3fad52b283d261c4c99a084937e2fe492248cb9a68a8435a861b8798ca" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -9105,22 +9302,22 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.7.2" +version = "8.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6065f1a4392b71819ec1ea1df1120673418bf386f50de1d6f54204d836d4349c" +checksum = "5fa2c8c9e8711e10f9c4fd2d64317ef13feaab820a4c51541f1a8c8e2e851ab2" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.104", + "syn 2.0.114", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.7.2" +version = "8.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6cc0c81648b20b70c491ff8cce00c1c3b223bb8ed2b5d41f0e54c6c4c0a3594" +checksum = "60b161f275cb337fe0a44d924a5f4df0ed69c2c39519858f931ce61c779d3475" dependencies = [ "sha2 0.10.9", "walkdir", @@ -9163,33 +9360,20 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ - "semver 1.0.26", -] - -[[package]] -name = "rustix" -version = "0.38.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" -dependencies = [ - "bitflags 2.9.1", - "errno", - "libc", - "linux-raw-sys 0.4.15", - "windows-sys 0.59.0", + "semver 1.0.27", ] [[package]] name = "rustix" -version = "1.0.8" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" +checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "errno", "libc", - "linux-raw-sys 0.9.4", - "windows-sys 0.60.2", + "linux-raw-sys", + "windows-sys 0.61.2", ] [[package]] @@ -9220,15 +9404,15 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.29" +version = "0.23.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2491382039b29b9b11ff08b76ff6c97cf287671dbb74f0be44bda389fffe9bd1" +checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b" dependencies = [ "log", "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.103.4", + "rustls-webpki 0.103.8", "subtle 2.6.1", "zeroize", ] @@ -9278,9 +9462,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.12.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" +checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282" dependencies = [ "web-time", "zeroize", @@ -9309,9 +9493,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.4" +version = "0.103.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc" +checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" dependencies = [ "ring", "rustls-pki-types", @@ -9320,15 +9504,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984" [[package]] name = "same-file" @@ -9341,11 +9525,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" +checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -9376,9 +9560,9 @@ dependencies = [ [[package]] name = "schemars" -version = "1.0.4" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0" +checksum = "54e910108742c57a770f492731f99be216a52fadd361b06c8fb59d74ccc267d2" dependencies = [ "dyn-clone", "ref-cast", @@ -9395,15 +9579,9 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals 0.29.1", - "syn 2.0.104", + "syn 2.0.114", ] -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - [[package]] name = "scopeguard" version = "1.2.0" @@ -9427,7 +9605,7 @@ checksum = "1783eabc414609e28a5ba76aee5ddd52199f7107a0b24c2e9746a1ecc34a683d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -9448,7 +9626,7 @@ checksum = "22f968c5ea23d555e670b449c1c5e7b2fc399fdaec1d304a17cd48e288abc107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -9490,7 +9668,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "core-foundation", "core-foundation-sys", "libc", @@ -9499,9 +9677,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.14.0" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" +checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" dependencies = [ "core-foundation-sys", "libc", @@ -9518,11 +9696,12 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" +checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" dependencies = [ "serde", + "serde_core", ] [[package]] @@ -9574,11 +9753,12 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.17" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8437fd221bde2d4ca316d61b90e337e9e702b3820b87d63caa9ba6c02bd06d96" +checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8" dependencies = [ "serde", + "serde_core", ] [[package]] @@ -9598,7 +9778,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -9609,7 +9789,7 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -9620,20 +9800,20 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] name = "serde_json" -version = "1.0.145" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ "itoa", "memchr", - "ryu", "serde", "serde_core", + "zmij", ] [[package]] @@ -9683,17 +9863,18 @@ checksum = "aafbefbe175fa9bf03ca83ef89beecff7d2a95aaacd5732325b90ac8c3bd7b90" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] name = "serde_path_to_error" -version = "0.1.17" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a" +checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457" dependencies = [ "itoa", "serde", + "serde_core", ] [[package]] @@ -9713,7 +9894,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -9739,19 +9920,18 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.14.0" +version = "3.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5" +checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.10.0", + "indexmap 2.13.0", "schemars 0.9.0", - "schemars 1.0.4", - "serde", - "serde_derive", + "schemars 1.2.0", + "serde_core", "serde_json", "serde_with_macros", "time", @@ -9759,14 +9939,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.14.0" +version = "3.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f" +checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c" dependencies = [ - "darling", + "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -9775,7 +9955,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.10.0", + "indexmap 2.13.0", "itoa", "ryu", "serde", @@ -9870,9 +10050,9 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" +checksum = "b75a19a7a740b25bc7944bdee6172368f988763b744e3d4dfe753f6b4ece40cc" dependencies = [ "libc", "mio 0.8.11", @@ -9881,10 +10061,11 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.5" +version = "1.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" dependencies = [ + "errno", "libc", ] @@ -9900,9 +10081,9 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" [[package]] name = "siphasher" @@ -9918,9 +10099,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "slab" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" [[package]] name = "sluice" @@ -9998,12 +10179,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" +checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -10012,7 +10193,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c26f0c20d909fdda1c5d0ece3973127ca421984d55b000215df365e93722fc6e" dependencies = [ - "aes", + "aes 0.8.4", "arrayref", "blake2 0.8.1", "bs58", @@ -10076,19 +10257,19 @@ dependencies = [ "crc", "crossbeam-queue", "either", - "event-listener 5.4.0", + "event-listener 5.4.1", "futures-core", "futures-intrusive", "futures-io", "futures-util", - "hashbrown 0.15.4", + "hashbrown 0.15.5", "hashlink", - "indexmap 2.10.0", + "indexmap 2.13.0", "log", "memchr", "once_cell", "percent-encoding", - "rustls 0.23.29", + "rustls 0.23.36", "serde", "serde_json", "sha2 0.10.9", @@ -10112,7 +10293,7 @@ dependencies = [ "quote", "sqlx-core", "sqlx-macros-core", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -10135,7 +10316,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 2.0.104", + "syn 2.0.114", "tokio", "url", ] @@ -10148,7 +10329,7 @@ checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526" dependencies = [ "atoi", "base64 0.22.1", - "bitflags 2.9.1", + "bitflags 2.10.0", "byteorder", "bytes", "chrono", @@ -10184,19 +10365,6 @@ dependencies = [ "whoami", ] -[[package]] -name = "sqlx-pool-guard" -version = "0.1.0" -dependencies = [ - "proc_pidinfo", - "sqlx", - "tempfile", - "tokio", - "tracing", - "tracing-subscriber", - "windows", -] - [[package]] name = "sqlx-postgres" version = "0.8.6" @@ -10205,7 +10373,7 @@ checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46" dependencies = [ "atoi", "base64 0.22.1", - "bitflags 2.9.1", + "bitflags 2.10.0", "byteorder", "chrono", "crc", @@ -10274,9 +10442,9 @@ dependencies = [ [[package]] name = "stable_deref_trait" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "static_assertions" @@ -10292,7 +10460,7 @@ checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f" dependencies = [ "new_debug_unreachable", "parking_lot", - "phf_shared", + "phf_shared 0.11.3", "precomputed-hash", "serde", ] @@ -10304,7 +10472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0" dependencies = [ "phf_generator", - "phf_shared", + "phf_shared 0.11.3", "proc-macro2", "quote", ] @@ -10344,7 +10512,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -10376,10 +10544,12 @@ checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" [[package]] name = "superboring" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "515cce34a781d7250b8a65706e0f2a5b99236ea605cb235d4baed6685820478f" +checksum = "10d8c985e81c88f5694d5dfc232691b2aa34f3e1f66e860db9cd1ddf2bb6dc64" dependencies = [ + "aes-gcm", + "aes-keywrap", "getrandom 0.2.16", "hmac-sha256", "hmac-sha512", @@ -10400,9 +10570,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.104" +version = "2.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" +checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" dependencies = [ "proc-macro2", "quote", @@ -10432,7 +10602,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -10495,14 +10665,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.20.0" +version = "3.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" +checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c" dependencies = [ "fastrand 2.3.0", - "getrandom 0.3.3", + "getrandom 0.3.4", "once_cell", - "rustix 1.0.8", + "rustix", "windows-sys 0.59.0", ] @@ -10581,7 +10751,7 @@ dependencies = [ "pin-project", "rand 0.8.5", "reqwest 0.11.27", - "semver 1.0.26", + "semver 1.0.27", "serde", "serde_bytes", "serde_json", @@ -10621,15 +10791,15 @@ dependencies = [ [[package]] name = "test-with" -version = "0.15.4" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f370b9efbfbbc5f057cbce9888373eaeb146a3095bb8cc869b199c94d15559" +checksum = "57ec38bac967f54b11756d3b8b42069f5b30c3ff449972c516683b98340a4e8e" dependencies = [ "proc-macro-error2", "proc-macro2", "quote", "regex", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -10709,7 +10879,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -10720,7 +10890,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -10756,9 +10926,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.41" +version = "0.3.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" +checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" dependencies = [ "deranged", "itoa", @@ -10774,15 +10944,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" +checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" [[package]] name = "time-macros" -version = "0.2.22" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" +checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" dependencies = [ "num-conv", "time-core", @@ -10790,9 +10960,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" dependencies = [ "displaydoc", "zerovec", @@ -10810,9 +10980,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" dependencies = [ "tinyvec_macros", ] @@ -10825,17 +10995,17 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.48.0" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" +checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" dependencies = [ "bytes", "libc", - "mio 1.0.4", + "mio 1.1.1", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.6.0", + "socket2 0.6.1", "tokio-macros", "tracing", "windows-sys 0.61.2", @@ -10849,14 +11019,14 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] name = "tokio-postgres" -version = "0.7.13" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c95d533c83082bb6490e0189acaa0bbeef9084e60471b696ca6988cd0541fb0" +checksum = "2b40d66d9b2cfe04b628173409368e58247e8eddbbd3b0e6c6ba1d09f20f6c9e" dependencies = [ "async-trait", "byteorder", @@ -10867,12 +11037,12 @@ dependencies = [ "log", "parking_lot", "percent-encoding", - "phf", + "phf 0.13.1", "pin-project-lite", "postgres-protocol", "postgres-types", "rand 0.9.2", - "socket2 0.5.10", + "socket2 0.6.1", "tokio", "tokio-util", "whoami", @@ -10901,19 +11071,19 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ - "rustls 0.23.29", + "rustls 0.23.36", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" +checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" dependencies = [ "futures-core", "pin-project-lite", @@ -10923,12 +11093,10 @@ dependencies = [ [[package]] name = "tokio-test" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" +checksum = "3f6d24790a10a7af737693a3e8f1d03faef7e6ca0cc99aae5066f533766de545" dependencies = [ - "async-stream", - "bytes", "futures-core", "tokio", "tokio-stream", @@ -10963,15 +11131,14 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.15" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" +checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" dependencies = [ "bytes", "futures-core", "futures-sink", "futures-util", - "hashbrown 0.15.4", "pin-project-lite", "slab", "tokio", @@ -10998,7 +11165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37e04c1865c281139e5ccf633cb9f76ffdaabeebfe53b703984cf82878e2aabb" dependencies = [ "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -11033,9 +11200,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.7.3" +version = "0.7.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" +checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" dependencies = [ "serde_core", ] @@ -11046,7 +11213,7 @@ version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.10.0", + "indexmap 2.13.0", "serde", "serde_spanned", "toml_datetime 0.6.11", @@ -11056,21 +11223,21 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.23.5" +version = "0.23.10+spec-1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ad0b7ae9cfeef5605163839cb9221f453399f15cfb5c10be9885fcf56611f9" +checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" dependencies = [ - "indexmap 2.10.0", - "toml_datetime 0.7.3", + "indexmap 2.13.0", + "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", "winnow", ] [[package]] name = "toml_parser" -version = "1.0.2" +version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10" +checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" dependencies = [ "winnow", ] @@ -11092,11 +11259,11 @@ dependencies = [ "axum", "base64 0.22.1", "bytes", - "h2 0.4.11", - "http 1.3.1", + "h2 0.4.13", + "http 1.4.0", "http-body 1.0.1", "http-body-util", - "hyper 1.6.0", + "hyper 1.8.1", "hyper-timeout", "hyper-util", "percent-encoding", @@ -11120,11 +11287,11 @@ dependencies = [ "async-trait", "base64 0.22.1", "bytes", - "h2 0.4.11", - "http 1.3.1", + "h2 0.4.13", + "http 1.4.0", "http-body 1.0.1", "http-body-util", - "hyper 1.6.0", + "hyper 1.8.1", "hyper-timeout", "hyper-util", "percent-encoding", @@ -11167,7 +11334,7 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", - "indexmap 2.10.0", + "indexmap 2.13.0", "pin-project-lite", "slab", "sync_wrapper 1.0.2", @@ -11180,16 +11347,16 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ "async-compression", - "bitflags 2.9.1", + "bitflags 2.10.0", "bytes", "futures-core", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "http-range-header", @@ -11221,9 +11388,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.41" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "log", "pin-project-lite", @@ -11233,20 +11400,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] name = "tracing-core" -version = "0.1.34" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", "valuable", @@ -11264,9 +11431,9 @@ dependencies = [ [[package]] name = "tracing-indicatif" -version = "0.3.11" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c714cc8fc46db04fcfddbd274c6ef59bebb1b435155984e7c6e89c3ce66f200" +checksum = "e1ef6990e0438749f0080573248e96631171a0b5ddfddde119aa5ba8c3a9c47e" dependencies = [ "indicatif", "tracing", @@ -11312,12 +11479,12 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.20" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5" +checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" dependencies = [ "matchers", - "nu-ansi-term 0.50.1", + "nu-ansi-term 0.50.3", "once_cell", "regex-automata", "sharded-slab", @@ -11346,7 +11513,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -11430,7 +11597,7 @@ checksum = "0e9d8656589772eeec2cf7a8264d9cda40fb28b9bc53118ceb9e8c07f8f38730" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", "termcolor", ] @@ -11457,7 +11624,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals 0.28.0", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -11490,7 +11657,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http 1.3.1", + "http 1.4.0", "httparse", "log", "rand 0.8.5", @@ -11504,29 +11671,29 @@ dependencies = [ [[package]] name = "typed-builder" -version = "0.23.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d0dd654273fc253fde1df4172c31fb6615cf8b041d3a4008a028ef8b1119e66" +checksum = "31aa81521b70f94402501d848ccc0ecaa8f93c8eb6999eb9747e72287757ffda" dependencies = [ "typed-builder-macro", ] [[package]] name = "typed-builder-macro" -version = "0.23.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "016c26257f448222014296978b2c8456e2cad4de308c35bdb1e383acd569ef5b" +checksum = "076a02dc54dd46795c2e9c8282ed40bcfb1e22747e955de9389a1de28190fb26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] name = "typenum" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "ucd-trie" @@ -11536,9 +11703,9 @@ checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "unicase" -version = "2.8.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" +checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" [[package]] name = "unicode-bidi" @@ -11548,24 +11715,24 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unicode-normalization" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" dependencies = [ "tinyvec", ] [[package]] name = "unicode-properties" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" +checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" [[package]] name = "unicode-segmentation" @@ -11581,9 +11748,9 @@ checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-width" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" [[package]] name = "unicode-xid" @@ -11593,9 +11760,9 @@ checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "uniffi" -version = "0.29.3" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b334fd69b3cf198b63616c096aabf9820ab21ed9b2aa1367ddd4b411068bf520" +checksum = "3291800a6b06569f7d3e15bdb6dc235e0f0c8bd3eb07177f430057feb076415f" dependencies = [ "anyhow", "camino", @@ -11610,9 +11777,9 @@ dependencies = [ [[package]] name = "uniffi_bindgen" -version = "0.29.3" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ff0132b533483cf19abb30bba5c72c24d9f3e4d9a2ff71cb3e22e73899fd46e" +checksum = "a04b99fa7796eaaa7b87976a0dbdd1178dc1ee702ea00aca2642003aef9b669e" dependencies = [ "anyhow", "askama", @@ -11622,7 +11789,7 @@ dependencies = [ "glob", "goblin", "heck 0.5.0", - "indexmap 2.10.0", + "indexmap 2.13.0", "once_cell", "serde", "tempfile", @@ -11636,9 +11803,9 @@ dependencies = [ [[package]] name = "uniffi_build" -version = "0.29.3" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d84d607076008df3c32dd2100ee4e727269f11d3faa35691af70d144598f666" +checksum = "025a05cba02ee22b6624ac3d257e59c7395319ea8fe1aae33a7cdb4e2a3016cc" dependencies = [ "anyhow", "camino", @@ -11647,9 +11814,9 @@ dependencies = [ [[package]] name = "uniffi_core" -version = "0.29.3" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e3b997192dc15ef1778c842001811ec7f241a093a693ac864e1fc938e64fa9" +checksum = "f38a9a27529ccff732f8efddb831b65b1e07f7dea3fd4cacd4a35a8c4b253b98" dependencies = [ "anyhow", "bytes", @@ -11659,22 +11826,22 @@ dependencies = [ [[package]] name = "uniffi_internal_macros" -version = "0.29.3" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f64bec2f3a33f2f08df8150e67fa45ba59a2ca740bf20c1beb010d4d791f9a1b" +checksum = "09acd2ce09c777dd65ee97c251d33c8a972afc04873f1e3b21eb3492ade16933" dependencies = [ "anyhow", - "indexmap 2.10.0", + "indexmap 2.13.0", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] name = "uniffi_macros" -version = "0.29.3" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8708716d2582e4f3d7e9f320290b5966eb951ca421d7630571183615453efc" +checksum = "5596f178c4f7aafa1a501c4e0b96236a96bc2ef92bdb453d83e609dad0040152" dependencies = [ "camino", "fs-err", @@ -11682,16 +11849,16 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.104", + "syn 2.0.114", "toml 0.5.11", "uniffi_meta", ] [[package]] name = "uniffi_meta" -version = "0.29.3" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d226fc167754ce548c5ece9828c8a06f03bf1eea525d2659ba6bd648bd8e2f3" +checksum = "beadc1f460eb2e209263c49c4f5b19e9a02e00a3b2b393f78ad10d766346ecff" dependencies = [ "anyhow", "siphasher 0.3.11", @@ -11701,22 +11868,22 @@ dependencies = [ [[package]] name = "uniffi_pipeline" -version = "0.29.3" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b925b6421df15cf4bedee27714022cd9626fb4d7eee0923522a608b274ba4371" +checksum = "dd76b3ac8a2d964ca9fce7df21c755afb4c77b054a85ad7a029ad179cc5abb8a" dependencies = [ "anyhow", "heck 0.5.0", - "indexmap 2.10.0", + "indexmap 2.13.0", "tempfile", "uniffi_internal_macros", ] [[package]] name = "uniffi_udl" -version = "0.29.3" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c42649b721df759d9d4692a376b82b62ce3028ec9fc466f4780fb8cdf728996" +checksum = "4319cf905911d70d5b97ce0f46f101619a22e9a189c8c46d797a9955e9233716" dependencies = [ "anyhow", "textwrap", @@ -11726,9 +11893,9 @@ dependencies = [ [[package]] name = "unit-prefix" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "323402cff2dd658f39ca17c789b502021b3f18707c91cdf22e3838e1b4023817" +checksum = "81e544489bf3d8ef66c953931f56617f423cd4b5494be343d9b9d3dda037b9a3" [[package]] name = "universal-hash" @@ -11736,7 +11903,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "subtle 2.6.1", ] @@ -11754,14 +11921,15 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.4" +version = "2.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" dependencies = [ "form_urlencoded", "idna", "percent-encoding", "serde", + "serde_derive", ] [[package]] @@ -11794,7 +11962,7 @@ version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fcc29c80c21c31608227e0912b2d7fddba57ad76b606890627ba8ee7964e993" dependencies = [ - "indexmap 2.10.0", + "indexmap 2.13.0", "serde", "serde_json", "utoipa-gen", @@ -11809,7 +11977,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.104", + "syn 2.0.114", "uuid", ] @@ -11848,7 +12016,7 @@ checksum = "268d76aaebb80eba79240b805972e52d7d410d4bcc52321b951318b0f440cd60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -11859,19 +12027,19 @@ checksum = "382673bda1d05c85b4550d32fd4192ccd4cffe9a908543a0795d1e7682b36246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", "utoipauto-core", ] [[package]] name = "uuid" -version = "1.17.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d" +checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", "js-sys", - "serde", + "serde_core", "wasm-bindgen", ] @@ -11970,35 +12138,23 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vt100" -version = "0.15.2" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84cd863bf0db7e392ba3bd04994be3473491b31e66340672af5d11943c6274de" +checksum = "054ff75fb8fa83e609e685106df4faeffdf3a735d3c74ebce97ec557d5d36fd9" dependencies = [ "itoa", - "log", - "unicode-width 0.1.14", + "unicode-width 0.2.2", "vte", ] [[package]] name = "vte" -version = "0.11.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" +checksum = "a5924018406ce0063cd67f8e008104968b74b563ee1b85dde3ed1f7cb87d3dbd" dependencies = [ "arrayvec", - "utf8parse", - "vte_generate_state_changes", -] - -[[package]] -name = "vte_generate_state_changes" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e" -dependencies = [ - "proc-macro2", - "quote", + "memchr", ] [[package]] @@ -12033,12 +12189,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasi" -version = "0.14.2+wasi-0.2.4" +name = "wasip2" +version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" dependencies = [ - "wit-bindgen-rt", + "wit-bindgen", ] [[package]] @@ -12053,40 +12209,27 @@ version = "0.12.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1fbb4ef9bbca0c1170e0b00dd28abc9e3b68669821600cad1caaed606583c6d" dependencies = [ - "wasi 0.11.1+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn 2.0.104", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.50" +version = "0.4.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" +checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" dependencies = [ "cfg-if", "js-sys", @@ -12097,9 +12240,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -12107,34 +12250,42 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" dependencies = [ + "bumpalo", "proc-macro2", "quote", - "syn 2.0.104", - "wasm-bindgen-backend", + "syn 2.0.114", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" dependencies = [ "unicode-ident", ] [[package]] name = "wasm-bindgen-test" -version = "0.3.50" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3" +checksum = "25e90e66d265d3a1efc0e72a54809ab90b9c0c515915c67cdf658689d2c22c6c" dependencies = [ + "async-trait", + "cast", "js-sys", + "libm", "minicov", + "nu-ansi-term 0.50.3", + "num-traits", + "oorandom", + "serde", + "serde_json", "wasm-bindgen", "wasm-bindgen-futures", "wasm-bindgen-test-macro", @@ -12142,63 +12293,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.50" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b" +checksum = "7150335716dce6028bead2b848e72f47b45e7b9422f64cccdc23bedca89affc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", -] - -[[package]] -name = "wasm-client-core" -version = "0.1.0" -dependencies = [ - "async-trait", - "console_error_panic_hook", - "js-sys", - "nym-bandwidth-controller", - "nym-client-core", - "nym-config", - "nym-credential-storage", - "nym-crypto", - "nym-gateway-client", - "nym-http-api-client", - "nym-sphinx", - "nym-sphinx-acknowledgements", - "nym-statistics-common", - "nym-task", - "nym-topology", - "nym-validator-client", - "rand 0.8.5", - "serde", - "serde-wasm-bindgen 0.6.5", - "thiserror 2.0.17", - "time", - "tsify", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-storage", - "wasm-utils", - "zeroize", -] - -[[package]] -name = "wasm-storage" -version = "0.1.0" -dependencies = [ - "async-trait", - "getrandom 0.2.16", - "indexed_db_futures", - "js-sys", - "nym-store-cipher", - "serde", - "serde-wasm-bindgen 0.6.5", - "thiserror 2.0.17", - "wasm-bindgen", - "wasm-utils", + "syn 2.0.114", ] [[package]] @@ -12214,27 +12315,11 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wasm-utils" -version = "0.1.0" -dependencies = [ - "console_error_panic_hook", - "futures", - "getrandom 0.2.16", - "gloo-net", - "gloo-utils 0.2.0", - "js-sys", - "tungstenite 0.20.1", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "wasmtimer" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8d49b5d6c64e8558d9b1b065014426f35c18de636895d24893dbbd329743446" +checksum = "1c598d6b99ea013e35844697fc4670d08339d5cda15588f193c6beedd12f644b" dependencies = [ "futures", "js-sys", @@ -12246,9 +12331,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.77" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" dependencies = [ "js-sys", "wasm-bindgen", @@ -12270,7 +12355,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57ffde1dc01240bdf9992e3205668b235e59421fd085e8a317ed98da0178d414" dependencies = [ - "phf", + "phf 0.11.3", "phf_codegen", "string_cache", "string_cache_codegen", @@ -12297,14 +12382,14 @@ version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" dependencies = [ - "webpki-roots 1.0.2", + "webpki-roots 1.0.5", ] [[package]] name = "webpki-roots" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2" +checksum = "12bed680863276c63889429bfd6cab3b99943659923822de1c8a39c49e4d722c" dependencies = [ "rustls-pki-types", ] @@ -12320,20 +12405,20 @@ dependencies = [ [[package]] name = "whoami" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6994d13118ab492c3c80c1f81928718159254c53c472bf9ce36f8dae4add02a7" +checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d" dependencies = [ - "redox_syscall", + "libredox", "wasite", "web-sys", ] [[package]] name = "widestring" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d" +checksum = "72069c3113ab32ab29e5584db3c6ec55d416895e60715417b5b883a357c3e471" [[package]] name = "winapi" @@ -12353,9 +12438,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ "windows-sys 0.59.0", ] @@ -12373,7 +12458,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" dependencies = [ "windows-collections", - "windows-core", + "windows-core 0.61.2", "windows-future", "windows-link 0.1.3", "windows-numerics", @@ -12385,7 +12470,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" dependencies = [ - "windows-core", + "windows-core 0.61.2", ] [[package]] @@ -12397,8 +12482,21 @@ dependencies = [ "windows-implement", "windows-interface", "windows-link 0.1.3", - "windows-result", - "windows-strings", + "windows-result 0.3.4", + "windows-strings 0.4.2", +] + +[[package]] +name = "windows-core" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link 0.2.1", + "windows-result 0.4.1", + "windows-strings 0.5.1", ] [[package]] @@ -12407,31 +12505,31 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" dependencies = [ - "windows-core", + "windows-core 0.61.2", "windows-link 0.1.3", "windows-threading", ] [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -12452,7 +12550,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" dependencies = [ - "windows-core", + "windows-core 0.61.2", "windows-link 0.1.3", ] @@ -12465,6 +12563,15 @@ dependencies = [ "windows-link 0.1.3", ] +[[package]] +name = "windows-result" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" +dependencies = [ + "windows-link 0.2.1", +] + [[package]] name = "windows-strings" version = "0.4.2" @@ -12474,6 +12581,15 @@ dependencies = [ "windows-link 0.1.3", ] +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link 0.2.1", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -12516,7 +12632,7 @@ version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets 0.53.2", + "windows-targets 0.53.5", ] [[package]] @@ -12576,18 +12692,19 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.53.2" +version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows_aarch64_gnullvm 0.53.0", - "windows_aarch64_msvc 0.53.0", - "windows_i686_gnu 0.53.0", - "windows_i686_gnullvm 0.53.0", - "windows_i686_msvc 0.53.0", - "windows_x86_64_gnu 0.53.0", - "windows_x86_64_gnullvm 0.53.0", - "windows_x86_64_msvc 0.53.0", + "windows-link 0.2.1", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", ] [[package]] @@ -12619,9 +12736,9 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_gnullvm" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" [[package]] name = "windows_aarch64_msvc" @@ -12643,9 +12760,9 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_aarch64_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" [[package]] name = "windows_i686_gnu" @@ -12667,9 +12784,9 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnu" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" [[package]] name = "windows_i686_gnullvm" @@ -12679,9 +12796,9 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_gnullvm" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" [[package]] name = "windows_i686_msvc" @@ -12703,9 +12820,9 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_i686_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" [[package]] name = "windows_x86_64_gnu" @@ -12727,9 +12844,9 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnu" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" [[package]] name = "windows_x86_64_gnullvm" @@ -12751,9 +12868,9 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_gnullvm" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" [[package]] name = "windows_x86_64_msvc" @@ -12775,15 +12892,15 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "windows_x86_64_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" -version = "0.7.12" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95" +checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" dependencies = [ "memchr", ] @@ -12799,19 +12916,16 @@ dependencies = [ ] [[package]] -name = "wit-bindgen-rt" -version = "0.39.0" +name = "wit-bindgen" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" -dependencies = [ - "bitflags 2.9.1", -] +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "writeable" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" [[package]] name = "wyz" @@ -12836,12 +12950,12 @@ dependencies = [ [[package]] name = "xattr" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909" +checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" dependencies = [ "libc", - "rustix 1.0.8", + "rustix", ] [[package]] @@ -12852,11 +12966,10 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yoke" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" dependencies = [ - "serde", "stable_deref_trait", "yoke-derive", "zerofrom", @@ -12864,34 +12977,34 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", "synstructure", ] [[package]] name = "zerocopy" -version = "0.8.26" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" +checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.26" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" +checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -12911,7 +13024,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", "synstructure", ] @@ -12926,20 +13039,20 @@ dependencies = [ [[package]] name = "zeroize_derive" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] name = "zerotrie" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" dependencies = [ "displaydoc", "yoke", @@ -12948,9 +13061,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.2" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" dependencies = [ "yoke", "zerofrom", @@ -12959,13 +13072,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.114", ] [[package]] @@ -12979,7 +13092,7 @@ dependencies = [ "crossbeam-utils", "displaydoc", "flate2", - "indexmap 2.10.0", + "indexmap 2.13.0", "memchr", "thiserror 2.0.17", "zopfli", @@ -12987,7 +13100,7 @@ dependencies = [ [[package]] name = "zknym-lib" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -12999,24 +13112,30 @@ dependencies = [ "nym-credentials", "nym-crypto", "nym-http-api-client", + "nym-wasm-utils", "rand 0.8.5", - "reqwest 0.12.22", + "reqwest 0.12.28", "serde", "thiserror 2.0.17", "tokio", "tsify", "uuid", "wasm-bindgen", - "wasm-utils", "wasmtimer", "zeroize", ] +[[package]] +name = "zmij" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fc5a66a20078bf1251bde995aa2fdcc4b800c70b5d92dd2c62abc5c60f679f8" + [[package]] name = "zopfli" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7" +checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249" dependencies = [ "bumpalo", "crc32fast", @@ -13044,9 +13163,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.15+zstd.1.5.7" +version = "2.0.16+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237" +checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" dependencies = [ "cc", "pkg-config", @@ -13054,12 +13173,12 @@ dependencies = [ [[package]] name = "zulip-client" -version = "0.1.0" +version = "1.20.1" dependencies = [ "itertools 0.14.0", "nym-bin-common", "nym-http-api-client", - "reqwest 0.12.22", + "reqwest 0.12.28", "serde", "serde_json", "thiserror 2.0.17", diff --git a/Cargo.toml b/Cargo.toml index 36ec9b5e835..ca21b6af2d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -148,7 +148,7 @@ members = [ "service-providers/common", "service-providers/ip-packet-router", "service-providers/network-requester", - "sqlx-pool-guard", + "nym-sqlx-pool-guard", "tools/echo-server", "tools/internal/contract-state-importer/importer-cli", "tools/internal/contract-state-importer/importer-contract", @@ -199,6 +199,7 @@ edition = "2024" license = "Apache-2.0" rust-version = "1.85" readme = "README.md" +version = "1.20.1" [workspace.dependencies] addr = "0.15.6" @@ -377,11 +378,112 @@ zeroize = "1.7.0" prometheus = { version = "0.14.0" } +# Workspace dep definitions required by crates.io publication - we need a workspace version since `cargo workspaces` doesn't work with path imports from crate manifests +nym-api-requests = { version = "1.20.1", path = "nym-api/nym-api-requests" } +nym-authenticator-requests = { version = "1.20.1", path = "common/authenticator-requests" } +nym-async-file-watcher = { version = "1.20.1", path = "common/async-file-watcher" } +nym-authenticator-client = { version = "1.20.1", path = "nym-authenticator-client" } +nym-bandwidth-controller = { version = "1.20.1", path = "common/bandwidth-controller" } +nym-bin-common = { version = "1.20.1", path = "common/bin-common" } +nym-cache = { version = "1.20.1", path = "common/nym-cache" } +nym-client-core = { version = "1.20.1", path = "common/client-core", default-features = false } +nym-client-core-config-types = { version = "1.20.1", path = "common/client-core/config-types" } +nym-client-core-gateways-storage = { version = "1.20.1", path = "common/client-core/gateways-storage" } +nym-client-core-surb-storage = { version = "1.20.1", path = "common/client-core/surb-storage" } +nym-client-websocket-requests = { version = "1.20.1", path = "clients/native/websocket-requests" } +nym-common = { version = "1.20.1", path = "common/nym-common" } +nym-compact-ecash = { version = "1.20.1", path = "common/nym_offline_compact_ecash" } +nym-config = { version = "1.20.1", path = "common/config" } +nym-contracts-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/contracts-common" } +nym-coconut-dkg-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/coconut-dkg" } +nym-credential-storage = { version = "1.20.1", path = "common/credential-storage" } +nym-credential-utils = { version = "1.20.1", path = "common/credential-utils" } +nym-credential-proxy-lib = { version = "1.20.1", path = "common/credential-proxy" } +nym-credentials = { version = "1.20.1", path = "common/credentials", default-features = false } +nym-credentials-interface = { version = "1.20.1", path = "common/credentials-interface" } +nym-credential-proxy-requests = { version = "1.20.1", path = "nym-credential-proxy/nym-credential-proxy-requests", default-features = false } +nym-credential-verification = { version = "1.20.1", path = "common/credential-verification" } +nym-crypto = { version = "1.20.1", path = "common/crypto", default-features = false } +nym-dkg = { version = "1.20.1", path = "common/dkg" } +nym-ecash-contract-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/ecash-contract" } +nym-ecash-signer-check = { version = "1.20.1", path = "common/ecash-signer-check" } +nym-ecash-signer-check-types = { version = "1.20.1", path = "common/ecash-signer-check-types" } +nym-ecash-time = { version = "1.20.1", path = "common/ecash-time" } +nym-exit-policy = { version = "1.20.1", path = "common/exit-policy" } +nym-ffi-shared = { version = "1.20.1", path = "sdk/ffi/shared" } +nym-gateway-client = { version = "1.20.1", path = "common/client-libs/gateway-client", default-features = false } +nym-gateway-requests = { version = "1.20.1", path = "common/gateway-requests" } +nym-gateway-storage = { version = "1.20.1", path = "common/gateway-storage" } +nym-gateway-stats-storage = { version = "1.20.1", path = "common/gateway-stats-storage" } +nym-group-contract-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/group-contract" } +nym-http-api-client = { version = "1.20.1", path = "common/http-api-client" } +nym-http-api-client-macro = { version = "1.20.1", path = "common/http-api-client-macro" } +nym-http-api-common = { version = "1.20.1", path = "common/http-api-common", default-features = false } +nym-id = { version = "1.20.1", path = "common/nym-id" } +nym-ip-packet-client = { version = "1.20.1", path = "nym-ip-packet-client" } +nym-ip-packet-requests = { version = "1.20.1", path = "common/ip-packet-requests" } +nym-metrics = { version = "1.20.1", path = "common/nym-metrics" } +nym-mixnet-client = { version = "1.20.1", path = "common/client-libs/mixnet-client" } +nym-mixnet-contract-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/mixnet-contract" } +nym-multisig-contract-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/multisig-contract" } +nym-network-defaults = { version = "1.20.1", path = "common/network-defaults" } +nym-node-tester-utils = { version = "1.20.1", path = "common/node-tester-utils" } +nym-noise = { version = "1.20.1", path = "common/nymnoise" } +nym-noise-keys = { version = "1.20.1", path = "common/nymnoise/keys" } +nym-nonexhaustive-delayqueue = { version = "1.20.1", path = "common/nonexhaustive-delayqueue" } +nym-node-requests = { version = "1.20.1", path = "nym-node/nym-node-requests", default-features = false } +nym-node-metrics = { version = "1.20.1", path = "nym-node/nym-node-metrics" } +nym-ordered-buffer = { version = "1.20.1", path = "common/socks5/ordered-buffer" } +nym-outfox = { version = "1.20.1", path = "nym-outfox" } +nym-registration-common = { version = "1.20.1", path = "common/registration" } +nym-pemstore = { version = "1.20.1", path = "common/pemstore" } +nym-performance-contract-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/nym-performance-contract" } +nym-sdk = { version = "1.20.1", path = "sdk/rust/nym-sdk" } +nym-serde-helpers = { version = "1.20.1", path = "common/serde-helpers" } +nym-service-providers-common = { version = "1.20.1", path = "service-providers/common" } +nym-service-provider-requests-common = { version = "1.20.1", path = "common/service-provider-requests-common" } +nym-socks5-client-core = { version = "1.20.1", path = "common/socks5-client-core" } +nym-socks5-proxy-helpers = { version = "1.20.1", path = "common/socks5/proxy-helpers" } +nym-socks5-requests = { version = "1.20.1", path = "common/socks5/requests" } +nym-sphinx = { version = "1.20.1", path = "common/nymsphinx" } +nym-sphinx-acknowledgements = { version = "1.20.1", path = "common/nymsphinx/acknowledgements" } +nym-sphinx-addressing = { version = "1.20.1", path = "common/nymsphinx/addressing" } +nym-sphinx-anonymous-replies = { version = "1.20.1", path = "common/nymsphinx/anonymous-replies" } +nym-sphinx-chunking = { version = "1.20.1", path = "common/nymsphinx/chunking" } +nym-sphinx-cover = { version = "1.20.1", path = "common/nymsphinx/cover" } +nym-sphinx-forwarding = { version = "1.20.1", path = "common/nymsphinx/forwarding" } +nym-sphinx-framing = { version = "1.20.1", path = "common/nymsphinx/framing" } +nym-sphinx-params = { version = "1.20.1", path = "common/nymsphinx/params" } +nym-sphinx-routing = { version = "1.20.1", path = "common/nymsphinx/routing" } +nym-sphinx-types = { version = "1.20.1", path = "common/nymsphinx/types" } +nym-statistics-common = { version = "1.20.1", path = "common/statistics" } +nym-store-cipher = { version = "1.20.1", path = "common/store-cipher" } +nym-task = { version = "1.20.1", path = "common/task" } +nym-tun = { version = "1.20.1", path = "common/tun" } +nym-test-utils = { version = "1.20.1", path = "common/test-utils" } +nym-ticketbooks-merkle = { version = "1.20.1", path = "common/ticketbooks-merkle" } +nym-topology = { version = "1.20.1", path = "common/topology" } +nym-types = { version = "1.20.1", path = "common/types" } +nym-upgrade-mode-check = { version = "1.20.1", path = "common/upgrade-mode-check" } +nym-validator-client = { version = "1.20.1", path = "common/client-libs/validator-client", default-features = false } +nym-vesting-contract-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/vesting-contract" } +nym-verloc = { version = "1.20.1", path = "common/verloc" } +nym-wireguard = { version = "1.20.1", path = "common/wireguard" } +nym-wireguard-types = { version = "1.20.1", path = "common/wireguard-types" } +nym-wireguard-private-metadata-shared = { version = "1.20.1", path = "common/wireguard-private-metadata/shared" } +nym-wireguard-private-metadata-client = { version = "1.20.1", path = "common/wireguard-private-metadata/client" } +nym-wireguard-private-metadata-server = { version = "1.20.1", path = "common/wireguard-private-metadata/server" } +nym-sqlx-pool-guard = { version = "1.2.0", path = "nym-sqlx-pool-guard" } +nym-wasm-client-core = { version = "1.20.1", path = "common/wasm/client-core" } +nym-wasm-storage = { version = "1.20.1", path = "common/wasm/storage" } +nym-wasm-utils = { version = "1.20.1", path = "common/wasm/utils", default-features = false } +nyxd-scraper-shared = { version = "1.20.1", path = "common/nyxd-scraper-shared" } + # coconut/DKG related -# unfortunately until https://github.com/zkcrypto/bls12_381/issues/10 is resolved, we have to rely on the fork +# unfortunately until https://github.com/zkcrypto/nym-bls12_381-fork/issues/10 is resolved, we have to rely on the fork # as we need to be able to serialize Gt so that we could create the lookup table for baby-step-giant-step algorithm -# plus to make our live easier we need serde support from https://github.com/zkcrypto/bls12_381/pull/125 -bls12_381 = { git = "https://github.com/jstuczyn/bls12_381", default-features = false, branch = "temp/experimental-serdect-updated" } +# plus to make our live easier we need serde support from https://github.com/zkcrypto/nym-bls12_381-fork/pull/125 +nym-bls12_381-fork = { version = "0.8.0-forked", default-features = false } group = { version = "0.13.0", default-features = false } ff = { version = "0.13.1", default-features = false } subtle = "2.5.0" diff --git a/clients/native/Cargo.toml b/clients/native/Cargo.toml index e53458609bd..beca79805f0 100644 --- a/clients/native/Cargo.toml +++ b/clients/native/Cargo.toml @@ -6,6 +6,7 @@ description = "Implementation of the Nym Client" edition = "2021" rust-version = "1.85" license.workspace = true +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -42,32 +43,32 @@ tokio-tungstenite = { workspace = true } zeroize = { workspace = true } ## internal -nym-bandwidth-controller = { path = "../../common/bandwidth-controller" } -nym-bin-common = { path = "../../common/bin-common", features = [ +nym-bandwidth-controller = { workspace = true } +nym-bin-common = { workspace = true, features = [ "output_format", "clap", "basic_tracing", ] } -nym-client-core = { path = "../../common/client-core", features = [ +nym-client-core = { workspace = true, features = [ "fs-credentials-storage", "fs-surb-storage", "fs-gateways-storage", "cli", ] } -nym-config = { path = "../../common/config" } -nym-credential-storage = { path = "../../common/credential-storage" } -nym-credentials = { path = "../../common/credentials" } -nym-crypto = { path = "../../common/crypto" } -nym-gateway-requests = { path = "../../common/gateway-requests" } -nym-network-defaults = { path = "../../common/network-defaults" } -nym-sphinx = { path = "../../common/nymsphinx" } -nym-pemstore = { path = "../../common/pemstore" } -nym-task = { path = "../../common/task" } -nym-topology = { path = "../../common/topology" } -nym-validator-client = { path = "../../common/client-libs/validator-client", features = [ +nym-config = { workspace = true } +nym-credential-storage = { workspace = true } +nym-credentials = { workspace = true } +nym-crypto = { workspace = true } +nym-gateway-requests = { workspace = true } +nym-network-defaults = { workspace = true } +nym-sphinx = { workspace = true } +nym-pemstore = { workspace = true } +nym-task = { workspace = true } +nym-topology = { workspace = true } +nym-validator-client = { workspace = true, features = [ "http-client", ] } -nym-client-websocket-requests = { path = "websocket-requests" } -nym-id = { path = "../../common/nym-id" } +nym-client-websocket-requests = { workspace = true } +nym-id = { workspace = true } [dev-dependencies] diff --git a/clients/native/websocket-requests/Cargo.toml b/clients/native/websocket-requests/Cargo.toml index a3ef6a1f285..25defd82ffa 100644 --- a/clients/native/websocket-requests/Cargo.toml +++ b/clients/native/websocket-requests/Cargo.toml @@ -1,9 +1,13 @@ [package] name = "nym-client-websocket-requests" -version = "0.1.0" +version.workspace = true authors = ["JÄ™drzej StuczyÅ„ski "] edition = "2021" license.workspace = true +description = "Request and response definitions for Nym client websocket connections" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -11,4 +15,4 @@ license.workspace = true serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } -nym-sphinx = { path = "../../../common/nymsphinx" } +nym-sphinx = { workspace = true } diff --git a/clients/socks5/Cargo.toml b/clients/socks5/Cargo.toml index 91d6591411d..cf9d9855669 100644 --- a/clients/socks5/Cargo.toml +++ b/clients/socks5/Cargo.toml @@ -6,6 +6,7 @@ description = "A SOCKS5 localhost proxy that converts incoming messages to Sphin edition = "2021" rust-version = "1.85" license.workspace = true +publish = false [dependencies] bs58 = { workspace = true } @@ -24,30 +25,30 @@ url = { workspace = true } zeroize = { workspace = true } # internal -nym-bin-common = { path = "../../common/bin-common", features = [ +nym-bin-common = { workspace = true, features = [ "output_format", "clap", "basic_tracing", ] } -nym-client-core = { path = "../../common/client-core", features = [ +nym-client-core = { workspace = true, features = [ "fs-credentials-storage", "fs-surb-storage", "fs-gateways-storage", "cli", ] } -nym-config = { path = "../../common/config" } -nym-credential-storage = { path = "../../common/credential-storage" } -nym-credentials = { path = "../../common/credentials" } -nym-crypto = { path = "../../common/crypto" } -nym-gateway-requests = { path = "../../common/gateway-requests" } -nym-id = { path = "../../common/nym-id" } -nym-network-defaults = { path = "../../common/network-defaults" } -nym-ordered-buffer = { path = "../../common/socks5/ordered-buffer" } -nym-pemstore = { path = "../../common/pemstore" } -nym-socks5-client-core = { path = "../../common/socks5-client-core" } -nym-sphinx = { path = "../../common/nymsphinx" } -nym-topology = { path = "../../common/topology" } -nym-validator-client = { path = "../../common/client-libs/validator-client", features = [ +nym-config = { workspace = true } +nym-credential-storage = { workspace = true } +nym-credentials = { workspace = true } +nym-crypto = { workspace = true } +nym-gateway-requests = { workspace = true } +nym-id = { workspace = true } +nym-network-defaults = { workspace = true } +nym-ordered-buffer = { workspace = true } +nym-pemstore = { workspace = true } +nym-socks5-client-core = { workspace = true } +nym-sphinx = { workspace = true } +nym-topology = { workspace = true } +nym-validator-client = { workspace = true, features = [ "http-client", ] } diff --git a/common/async-file-watcher/Cargo.toml b/common/async-file-watcher/Cargo.toml index cde165eaab6..4c4af2ab4c5 100644 --- a/common/async-file-watcher/Cargo.toml +++ b/common/async-file-watcher/Cargo.toml @@ -1,8 +1,12 @@ [package] name = "nym-async-file-watcher" -version = "0.1.0" +version.workspace = true edition.workspace = true license.workspace = true +description = "Simple file watcher that sends a notification whenever there was any change in the watched file" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/authenticator-requests/Cargo.toml b/common/authenticator-requests/Cargo.toml index 6126a18f803..89873c5c208 100644 --- a/common/authenticator-requests/Cargo.toml +++ b/common/authenticator-requests/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-authenticator-requests" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Crate defining requests and responses for the Nym authenticator client" [dependencies] base64 = { workspace = true } @@ -18,12 +19,12 @@ strum_macros = { workspace = true } thiserror = { workspace = true } tracing = { workspace = true } -nym-credentials-interface = { path = "../credentials-interface" } -nym-crypto = { path = "../crypto", features = ["asymmetric"] } -nym-network-defaults = { path = "../network-defaults" } -nym-service-provider-requests-common = { path = "../service-provider-requests-common" } -nym-sphinx = { path = "../nymsphinx" } -nym-wireguard-types = { path = "../wireguard-types" } +nym-credentials-interface = { workspace = true } +nym-crypto = { workspace = true, features = ["asymmetric"] } +nym-network-defaults = { workspace = true } +nym-service-provider-requests-common = { workspace = true } +nym-sphinx = { workspace = true } +nym-wireguard-types = { workspace = true } ## verify: hmac = { workspace = true, optional = true } @@ -31,7 +32,7 @@ sha2 = { workspace = true, optional = true } x25519-dalek = { workspace = true, features = ["static_secrets"] } [dev-dependencies] -nym-test-utils = { path = "../test-utils" } +nym-test-utils = { workspace = true } [features] default = ["verify"] @@ -39,4 +40,4 @@ default = ["verify"] verify = ["hmac", "sha2"] [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/common/bandwidth-controller/Cargo.toml b/common/bandwidth-controller/Cargo.toml index a94abcc1cb2..d93ddbab859 100644 --- a/common/bandwidth-controller/Cargo.toml +++ b/common/bandwidth-controller/Cargo.toml @@ -1,8 +1,12 @@ [package] name = "nym-bandwidth-controller" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true +description = "Crate for controlling the use of zknym credentials to ensure constant bandwidth availability for NymVPN app" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -12,14 +16,14 @@ log = { workspace = true } rand = { workspace = true } thiserror = { workspace = true } -nym-credential-storage = { path = "../credential-storage" } -nym-credentials = { path = "../credentials" } -nym-credentials-interface = { path = "../credentials-interface" } -nym-crypto = { path = "../crypto", features = ["rand", "asymmetric", "stream_cipher", "aes", "hashing"] } -nym-ecash-time = { path = "../ecash-time" } -nym-task = { path = "../task" } -nym-validator-client = { path = "../client-libs/validator-client", default-features = false } +nym-credential-storage = { workspace = true } +nym-credentials = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-crypto = { workspace = true, features = ["rand", "asymmetric", "stream_cipher", "aes", "hashing"] } +nym-ecash-time = { workspace = true } +nym-task = { workspace = true } +nym-validator-client = { workspace = true } [target."cfg(not(target_arch = \"wasm32\"))".dependencies.nym-validator-client] -path = "../client-libs/validator-client" +workspace = true features = ["http-client"] diff --git a/common/bin-common/Cargo.toml b/common/bin-common/Cargo.toml index aa75898ec4f..8220494794c 100644 --- a/common/bin-common/Cargo.toml +++ b/common/bin-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-bin-common" -version = "0.6.0" +version.workspace = true description = "Common code for nym binaries" edition = { workspace = true } authors = { workspace = true } diff --git a/common/client-core/Cargo.toml b/common/client-core/Cargo.toml index 2f6d87dbc41..77cdf19c983 100644 --- a/common/client-core/Cargo.toml +++ b/common/client-core/Cargo.toml @@ -1,10 +1,14 @@ [package] name = "nym-client-core" -version = "1.1.15" +version.workspace = true authors = ["Dave Hrycyszyn "] edition = "2021" rust-version = "1.85" license.workspace = true +description = "Crate containing core client functionality and configs, used by all other Nym client implentations" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -31,32 +35,32 @@ tracing = { workspace = true } zeroize = { workspace = true } # internal -nym-id = { path = "../nym-id" } -nym-bandwidth-controller = { path = "../bandwidth-controller" } -nym-crypto = { path = "../crypto" } -nym-gateway-client = { path = "../client-libs/gateway-client" } -nym-gateway-requests = { path = "../gateway-requests" } -nym-http-api-client = { path = "../http-api-client", features = ["network-defaults"] } -nym-nonexhaustive-delayqueue = { path = "../nonexhaustive-delayqueue" } -nym-sphinx = { path = "../nymsphinx" } -nym-statistics-common = { path = "../statistics" } -nym-pemstore = { path = "../pemstore" } -nym-topology = { path = "../topology", features = ["persistence"] } -nym-validator-client = { path = "../client-libs/validator-client", default-features = false } -nym-task = { path = "../task" } -nym-credentials-interface = { path = "../credentials-interface" } -nym-credential-storage = { path = "../credential-storage" } -nym-network-defaults = { path = "../network-defaults" } -nym-client-core-config-types = { path = "./config-types", features = [ +nym-id = { workspace = true } +nym-bandwidth-controller = { workspace = true } +nym-crypto = { workspace = true } +nym-gateway-client = { workspace = true } +nym-gateway-requests = { workspace = true } +nym-http-api-client = { workspace = true, features = ["network-defaults"] } +nym-nonexhaustive-delayqueue = { workspace = true } +nym-sphinx = { workspace = true } +nym-statistics-common = { workspace = true } +nym-pemstore = { workspace = true } +nym-topology = { workspace = true, features = ["persistence"] } +nym-validator-client = { workspace = true } +nym-task = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-credential-storage = { workspace = true } +nym-network-defaults = { workspace = true } +nym-client-core-config-types = { workspace = true, features = [ "disk-persistence", ] } -nym-client-core-surb-storage = { path = "./surb-storage" } -nym-client-core-gateways-storage = { path = "./gateways-storage" } -nym-ecash-time = { path = "../ecash-time" } -nym-mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" } +nym-client-core-surb-storage = { workspace = true } +nym-client-core-gateways-storage = { workspace = true } +nym-ecash-time = { workspace = true } +nym-mixnet-contract-common = { workspace = true } [target."cfg(not(target_arch = \"wasm32\"))".dependencies] -nym-mixnet-client = { path = "../client-libs/mixnet-client", default-features = false } +nym-mixnet-client = { workspace = true } ### For serving prometheus metrics [target."cfg(not(target_arch = \"wasm32\"))".dependencies.hyper] @@ -105,8 +109,8 @@ features = ["tokio"] workspace = true features = ["futures"] -[target."cfg(target_arch = \"wasm32\")".dependencies.wasm-utils] -path = "../wasm/utils" +[target."cfg(target_arch = \"wasm32\")".dependencies.nym-wasm-utils] +workspace = true features = ["websocket"] [target."cfg(target_arch = \"wasm32\")".dependencies.time] diff --git a/common/client-core/config-types/Cargo.toml b/common/client-core/config-types/Cargo.toml index 31184905f57..4c586ec1c3e 100644 --- a/common/client-core/config-types/Cargo.toml +++ b/common/client-core/config-types/Cargo.toml @@ -1,8 +1,12 @@ [package] name = "nym-client-core-config-types" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true +description = "Low level configs and constants used by Nym clients and nodes" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -12,14 +16,14 @@ serde = { workspace = true, features = ["derive"] } thiserror.workspace = true url = { workspace = true, features = ["serde"] } -nym-config = { path = "../../config" } +nym-config = { workspace = true } -nym-pemstore = { path = "../../pemstore", optional = true } +nym-pemstore = { workspace = true , optional = true } # those are pulling so many deps T.T -nym-sphinx-params = { path = "../../nymsphinx/params" } -nym-sphinx-addressing = { path = "../../nymsphinx/addressing" } -nym-statistics-common = { path = "../../statistics" } +nym-sphinx-params = { workspace = true } +nym-sphinx-addressing = { workspace = true } +nym-statistics-common = { workspace = true } [features] diff --git a/common/client-core/gateways-storage/Cargo.toml b/common/client-core/gateways-storage/Cargo.toml index dc25a2b7486..1a1e9f7c2d3 100644 --- a/common/client-core/gateways-storage/Cargo.toml +++ b/common/client-core/gateways-storage/Cargo.toml @@ -1,9 +1,13 @@ [package] name = "nym-client-core-gateways-storage" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true rust-version.workspace = true +description = "Functionality for Nym clients to store and retrive Gateway connections" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -17,9 +21,9 @@ tracing.workspace = true url.workspace = true zeroize = { workspace = true, features = ["zeroize_derive"] } -nym-crypto = { path = "../../crypto", features = ["asymmetric"] } -nym-gateway-requests = { path = "../../gateway-requests" } -nym-gateway-client = { path = "../../client-libs/gateway-client" } +nym-crypto = { workspace = true, features = ["asymmetric"] } +nym-gateway-requests = { workspace = true} +nym-gateway-client = { workspace = true} [target."cfg(not(target_arch = \"wasm32\"))".dependencies.sqlx] workspace = true diff --git a/common/client-core/src/client/base_client/mod.rs b/common/client-core/src/client/base_client/mod.rs index 600085b4cf8..92565c144b9 100644 --- a/common/client-core/src/client/base_client/mod.rs +++ b/common/client-core/src/client/base_client/mod.rs @@ -71,7 +71,7 @@ use url::Url; #[cfg(target_arch = "wasm32")] #[cfg(debug_assertions)] -use wasm_utils::console_log; +use nym_wasm_utils::console_log; /// Default number of retries for Nym API requests when using network details with domain fronting. /// This allows the client to try alternative URLs if the primary endpoint is unavailable. diff --git a/common/client-core/src/client/real_messages_control/real_traffic_stream.rs b/common/client-core/src/client/real_messages_control/real_traffic_stream.rs index 1b90208b6dd..12fa62e3ad6 100644 --- a/common/client-core/src/client/real_messages_control/real_traffic_stream.rs +++ b/common/client-core/src/client/real_messages_control/real_traffic_stream.rs @@ -31,7 +31,7 @@ use tracing::*; #[cfg(not(target_arch = "wasm32"))] use tokio::time::{sleep, Sleep}; -// use wasm_utils::console_log; +// use nym_wasm_utils::console_log; #[cfg(target_arch = "wasm32")] use wasmtimer::tokio::{sleep, Sleep}; mod sending_delay_controller; diff --git a/common/client-core/src/init/helpers.rs b/common/client-core/src/init/helpers.rs index 8cb926fe555..3400981309d 100644 --- a/common/client-core/src/init/helpers.rs +++ b/common/client-core/src/init/helpers.rs @@ -23,6 +23,8 @@ use url::Url; use crate::init::websockets::connect_async; use nym_topology::NodeId; +#[cfg(target_arch = "wasm32")] +use nym_wasm_utils::websocket::JSWebsocket; #[cfg(not(target_arch = "wasm32"))] use tokio::net::TcpStream; #[cfg(not(target_arch = "wasm32"))] @@ -32,8 +34,6 @@ use tokio::time::Instant; #[cfg(not(target_arch = "wasm32"))] use tokio_tungstenite::{MaybeTlsStream, WebSocketStream}; #[cfg(target_arch = "wasm32")] -use wasm_utils::websocket::JSWebsocket; -#[cfg(target_arch = "wasm32")] use wasmtimer::std::Instant; #[cfg(target_arch = "wasm32")] use wasmtimer::tokio::sleep; diff --git a/common/client-core/surb-storage/Cargo.toml b/common/client-core/surb-storage/Cargo.toml index be03487d955..04168ec19e3 100644 --- a/common/client-core/surb-storage/Cargo.toml +++ b/common/client-core/surb-storage/Cargo.toml @@ -1,8 +1,12 @@ [package] name = "nym-client-core-surb-storage" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true +description = "Functionality for Nym clients to generate and use Single Use Reply Blocks (SURBs)" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -13,9 +17,9 @@ tracing.workspace = true thiserror.workspace = true time.workspace = true -nym-crypto = { path = "../../crypto", optional = true, default-features = false } -nym-sphinx = { path = "../../nymsphinx" } -nym-task = { path = "../../task" } +nym-crypto = { workspace = true, optional = true, default-features = false } +nym-sphinx = { workspace = true } +nym-task = { workspace = true } [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio] workspace = true @@ -26,8 +30,8 @@ workspace = true features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate", "time"] optional = true -[target."cfg(not(target_arch = \"wasm32\"))".dependencies.sqlx-pool-guard] -path = "../../../sqlx-pool-guard" +[target."cfg(not(target_arch = \"wasm32\"))".dependencies.nym-sqlx-pool-guard] +workspace = true [build-dependencies] anyhow = { workspace = true } diff --git a/common/client-core/surb-storage/src/backend/fs_backend/manager.rs b/common/client-core/surb-storage/src/backend/fs_backend/manager.rs index 6edde091ced..b0a6ec68f72 100644 --- a/common/client-core/surb-storage/src/backend/fs_backend/manager.rs +++ b/common/client-core/surb-storage/src/backend/fs_backend/manager.rs @@ -13,7 +13,7 @@ use std::path::Path; use time::OffsetDateTime; use tracing::{error, info}; -use sqlx_pool_guard::SqlitePoolGuard; +use nym_sqlx_pool_guard::SqlitePoolGuard; #[derive(Debug, Clone)] pub struct StorageManager { diff --git a/common/client-libs/gateway-client/Cargo.toml b/common/client-libs/gateway-client/Cargo.toml index 969d94807e3..914c23a45eb 100644 --- a/common/client-libs/gateway-client/Cargo.toml +++ b/common/client-libs/gateway-client/Cargo.toml @@ -1,9 +1,13 @@ [package] name = "nym-gateway-client" -version = "0.1.0" +version.workspace = true authors = ["JÄ™drzej StuczyÅ„ski "] edition = "2021" license.workspace = true +description = "Functions and types for Nym client <> Gateway connections" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -21,19 +25,19 @@ time.workspace = true zeroize.workspace = true # internal -nym-bandwidth-controller = { path = "../../bandwidth-controller" } -nym-credentials = { path = "../../credentials" } -nym-credential-storage = { path = "../../credential-storage" } -nym-credentials-interface = { path = "../../credentials-interface" } -nym-crypto = { path = "../../crypto" } -nym-gateway-requests = { path = "../../gateway-requests" } -nym-http-api-client = { path = "../../http-api-client" } -nym-network-defaults = { path = "../../network-defaults" } -nym-sphinx = { path = "../../nymsphinx" } -nym-statistics-common = { path = "../../statistics" } -nym-pemstore = { path = "../../pemstore" } -nym-validator-client = { path = "../validator-client", default-features = false } -nym-task = { path = "../../task" } +nym-bandwidth-controller = { workspace = true } +nym-credentials = { workspace = true } +nym-credential-storage = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-crypto = { workspace = true } +nym-gateway-requests = { workspace = true } +nym-http-api-client = { workspace = true } +nym-network-defaults = { workspace = true } +nym-sphinx = { workspace = true } +nym-statistics-common = { workspace = true } +nym-pemstore = { workspace = true } +nym-validator-client = { workspace = true, default-features = false } +nym-task = { workspace = true } serde = { workspace = true, features = ["derive"] } @@ -61,8 +65,8 @@ workspace = true [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen-futures] workspace = true -[target."cfg(target_arch = \"wasm32\")".dependencies.wasm-utils] -path = "../../wasm/utils" +[target."cfg(target_arch = \"wasm32\")".dependencies.nym-wasm-utils] +workspace = true features = ["websocket"] [target."cfg(target_arch = \"wasm32\")".dependencies.gloo-utils] @@ -90,4 +94,4 @@ features = ["js"] wasm = [] [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/common/client-libs/gateway-client/src/client/mod.rs b/common/client-libs/gateway-client/src/client/mod.rs index 1d75b31835f..a657617a8c7 100644 --- a/common/client-libs/gateway-client/src/client/mod.rs +++ b/common/client-libs/gateway-client/src/client/mod.rs @@ -41,11 +41,11 @@ use std::os::fd::RawFd; #[cfg(not(target_arch = "wasm32"))] use tokio::time::sleep; +#[cfg(target_arch = "wasm32")] +use nym_wasm_utils::websocket::JSWebsocket; #[cfg(not(unix))] use std::os::raw::c_int as RawFd; #[cfg(target_arch = "wasm32")] -use wasm_utils::websocket::JSWebsocket; -#[cfg(target_arch = "wasm32")] use wasmtimer::tokio::sleep; pub mod config; diff --git a/common/client-libs/gateway-client/src/socket_state.rs b/common/client-libs/gateway-client/src/socket_state.rs index 1a464aa3045..c07b360be88 100644 --- a/common/client-libs/gateway-client/src/socket_state.rs +++ b/common/client-libs/gateway-client/src/socket_state.rs @@ -29,7 +29,7 @@ use tokio::net::TcpStream; use tokio_tungstenite::{MaybeTlsStream, WebSocketStream}; #[cfg(target_arch = "wasm32")] -use wasm_utils::websocket::JSWebsocket; +use nym_wasm_utils::websocket::JSWebsocket; // type alias for not having to type the whole thing every single time (and now it makes it easier // to use different types based on compilation target) diff --git a/common/client-libs/mixnet-client/Cargo.toml b/common/client-libs/mixnet-client/Cargo.toml index 2a8a39383b6..72f838e50bb 100644 --- a/common/client-libs/mixnet-client/Cargo.toml +++ b/common/client-libs/mixnet-client/Cargo.toml @@ -1,9 +1,13 @@ [package] name = "nym-mixnet-client" -version = "0.1.0" +version.workspace = true authors = ["Jedrzej Stuczynski "] edition = "2021" license.workspace = true +description = "Client for Mix Node <> Mix Node & Mix Node <> Gateway communication" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -16,14 +20,14 @@ tokio-util = { workspace = true, features = ["codec"], optional = true } tokio-stream = { workspace = true } # internal -nym-noise = { path = "../../nymnoise" } -nym-sphinx = { path = "../../nymsphinx" } -nym-task = { path = "../../task", optional = true } +nym-noise = { workspace = true } +nym-sphinx = { workspace = true } +nym-task = { workspace = true, optional = true } [features] default = ["client"] client = ["tokio-util", "nym-task", "tokio/net", "tokio/rt"] [dev-dependencies] -nym-crypto = { path = "../../crypto" } +nym-crypto = { workspace = true } rand = { workspace = true } diff --git a/common/client-libs/validator-client/Cargo.toml b/common/client-libs/validator-client/Cargo.toml index ec4eb62bec7..4faa1a09430 100644 --- a/common/client-libs/validator-client/Cargo.toml +++ b/common/client-libs/validator-client/Cargo.toml @@ -1,10 +1,14 @@ [package] name = "nym-validator-client" -version = "0.1.0" +version.workspace = true authors = ["JÄ™drzej StuczyÅ„ski "] edition = "2021" rust-version = "1.85" license.workspace = true +description = "Client for interacting with Nyx Cosmos SDK blockchain" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -12,18 +16,18 @@ license.workspace = true base64 = { workspace = true } colored = { workspace = true } -nym-coconut-dkg-common = { path = "../../cosmwasm-smart-contracts/coconut-dkg" } -nym-contracts-common = { path = "../../cosmwasm-smart-contracts/contracts-common" } -nym-mixnet-contract-common = { path = "../../cosmwasm-smart-contracts/mixnet-contract" } -nym-vesting-contract-common = { path = "../../cosmwasm-smart-contracts/vesting-contract" } -nym-ecash-contract-common = { path = "../../cosmwasm-smart-contracts/ecash-contract" } -nym-multisig-contract-common = { path = "../../cosmwasm-smart-contracts/multisig-contract" } -nym-group-contract-common = { path = "../../cosmwasm-smart-contracts/group-contract" } -nym-performance-contract-common = { path = "../../cosmwasm-smart-contracts/nym-performance-contract" } -nym-serde-helpers = { path = "../../serde-helpers", features = ["hex", "base64"] } +nym-coconut-dkg-common = { workspace = true } +nym-contracts-common = { workspace = true } +nym-mixnet-contract-common = { workspace = true } +nym-vesting-contract-common = { workspace = true } +nym-ecash-contract-common = { workspace = true } +nym-multisig-contract-common = { workspace = true } +nym-group-contract-common = { workspace = true } +nym-performance-contract-common = { workspace = true } +nym-serde-helpers = { workspace = true, features = ["hex", "base64"] } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } -nym-http-api-client = { path = "../../../common/http-api-client" } +nym-http-api-client = { workspace = true } thiserror = { workspace = true } tracing = { workspace = true } url = { workspace = true, features = ["serde"] } @@ -31,13 +35,13 @@ tokio = { workspace = true, features = ["sync", "time"] } time = { workspace = true, features = ["formatting"] } futures = { workspace = true } -nym-compact-ecash = { path = "../../nym_offline_compact_ecash" } -nym-network-defaults = { path = "../../network-defaults" } -nym-api-requests = { path = "../../../nym-api/nym-api-requests" } +nym-compact-ecash = { workspace = true } +nym-network-defaults = { workspace = true } +nym-api-requests = { workspace = true } async-trait = { workspace = true } bip39 = { workspace = true, features = ["rand"] } -nym-config = { path = "../../config" } +nym-config = { workspace = true } cosmrs = { workspace = true, features = ["bip32", "cosmwasm"] } # note that this has the same version as used by cosmrs diff --git a/common/commands/Cargo.toml b/common/commands/Cargo.toml index 4398342d4cd..1c7d1f8da86 100644 --- a/common/commands/Cargo.toml +++ b/common/commands/Cargo.toml @@ -1,9 +1,13 @@ [package] name = "nym-cli-commands" -version = "1.0.0" +version.workspace = true authors.workspace = true edition = "2021" license.workspace = true +description = "Common commands crate used by the nym-cli tool for interacting with the Nyx Cosmos SDK blockchain and Mixnet endpoints" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true [dependencies] anyhow = { workspace = true } @@ -37,28 +41,28 @@ zeroize = { workspace = true } cosmrs = { workspace = true } cosmwasm-std = { workspace = true } -nym-validator-client = { path = "../client-libs/validator-client" } -nym-http-api-client = { path = "../http-api-client" } -nym-bin-common = { path = "../../common/bin-common", features = ["output_format"] } -nym-crypto = { path = "../../common/crypto", features = ["asymmetric"] } -nym-network-defaults = { path = "../network-defaults" } -nym-contracts-common = { path = "../cosmwasm-smart-contracts/contracts-common" } -nym-bandwidth-controller = { path = "../../common/bandwidth-controller" } -nym-mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" } -nym-vesting-contract-common = { path = "../cosmwasm-smart-contracts/vesting-contract" } -nym-coconut-dkg-common = { path = "../cosmwasm-smart-contracts/coconut-dkg" } -nym-multisig-contract-common = { path = "../cosmwasm-smart-contracts/multisig-contract" } -nym-ecash-contract-common = { path = "../cosmwasm-smart-contracts/ecash-contract" } -nym-ecash-time = { path = "../../common/ecash-time" } -nym-sphinx = { path = "../../common/nymsphinx" } -nym-client-core = { path = "../../common/client-core" } -nym-config = { path = "../../common/config" } -nym-credentials = { path = "../../common/credentials" } -nym-credentials-interface = { path = "../../common/credentials-interface" } -nym-credential-storage = { path = "../../common/credential-storage" } -nym-credential-utils = { path = "../../common/credential-utils" } -nym-id = { path = "../nym-id" } -nym-credential-proxy-requests = { path = "../../nym-credential-proxy/nym-credential-proxy-requests" } +nym-validator-client = { workspace = true} +nym-http-api-client = { workspace = true} +nym-bin-common = { workspace = true, features = ["output_format"] } +nym-crypto = { workspace = true, features = ["asymmetric"] } +nym-network-defaults = { workspace = true } +nym-contracts-common = { workspace = true } +nym-bandwidth-controller = { workspace = true } +nym-mixnet-contract-common = { workspace = true } +nym-vesting-contract-common = { workspace = true } +nym-coconut-dkg-common = { workspace = true } +nym-multisig-contract-common = { workspace = true } +nym-ecash-contract-common = { workspace = true } +nym-ecash-time = { workspace = true } +nym-sphinx = { workspace = true } +nym-client-core = { workspace = true } +nym-config = { workspace = true } +nym-credentials = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-credential-storage = { workspace = true } +nym-credential-utils = { workspace = true } +nym-id = { workspace = true } +nym-credential-proxy-requests = { workspace = true } -nym-pemstore = { path = "../../common/pemstore", version = "0.3.0" } -nym-types = { path = "../../common/types" } +nym-pemstore = { workspace = true } +nym-types = { workspace = true } diff --git a/common/config/Cargo.toml b/common/config/Cargo.toml index d978fe4aeeb..4c364f92922 100644 --- a/common/config/Cargo.toml +++ b/common/config/Cargo.toml @@ -1,9 +1,11 @@ [package] name = "nym-config" -version = "0.1.0" +version.workspace = true authors = ["Jedrzej Stuczynski "] edition = "2021" license.workspace = true +homepage.workspace = true +description = "Config related helpers and functions" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -16,7 +18,7 @@ thiserror = { workspace = true } toml = { workspace = true, features = ["display"] } url = { workspace = true } -nym-network-defaults = { path = "../network-defaults", features = ["utoipa"] } +nym-network-defaults = { workspace = true, features = ["utoipa"] } [features] default = ["dirs"] diff --git a/common/cosmwasm-smart-contracts/coconut-dkg/Cargo.toml b/common/cosmwasm-smart-contracts/coconut-dkg/Cargo.toml index d2a9cbd50fd..158b920e242 100644 --- a/common/cosmwasm-smart-contracts/coconut-dkg/Cargo.toml +++ b/common/cosmwasm-smart-contracts/coconut-dkg/Cargo.toml @@ -1,8 +1,12 @@ [package] name = "nym-coconut-dkg-common" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true +description = "Common crate for Nym's DKG cosmwasm contract" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -13,8 +17,8 @@ cw-utils = { workspace = true } cw2 = { workspace = true } cw4 = { workspace = true } -contracts-common = { path = "../contracts-common", package = "nym-contracts-common" } -nym-multisig-contract-common = { path = "../multisig-contract" } +nym-contracts-common = { workspace = true } +nym-multisig-contract-common = { workspace = true } [features] schema = [] diff --git a/common/cosmwasm-smart-contracts/coconut-dkg/src/dealing.rs b/common/cosmwasm-smart-contracts/coconut-dkg/src/dealing.rs index 347a158a558..b65e4109e1e 100644 --- a/common/cosmwasm-smart-contracts/coconut-dkg/src/dealing.rs +++ b/common/cosmwasm-smart-contracts/coconut-dkg/src/dealing.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::types::{ChunkIndex, DealingIndex, EpochId, PartialContractDealingData}; -use contracts_common::dealings::ContractSafeBytes; use cosmwasm_schema::cw_serde; use cosmwasm_std::Addr; +use nym_contracts_common::dealings::ContractSafeBytes; use std::collections::{BTreeMap, HashMap}; /// Defines the maximum size of a dealing chunk. Currently set to 2kB diff --git a/common/cosmwasm-smart-contracts/coconut-dkg/src/msg.rs b/common/cosmwasm-smart-contracts/coconut-dkg/src/msg.rs index d0c8972117a..1783dfaf788 100644 --- a/common/cosmwasm-smart-contracts/coconut-dkg/src/msg.rs +++ b/common/cosmwasm-smart-contracts/coconut-dkg/src/msg.rs @@ -6,8 +6,8 @@ use crate::types::{ ChunkIndex, DealingIndex, EncodedBTEPublicKeyWithProof, EpochId, TimeConfiguration, }; use crate::verification_key::VerificationKeyShare; -use contracts_common::IdentityKey; use cosmwasm_schema::cw_serde; +use nym_contracts_common::IdentityKey; #[cfg(feature = "schema")] use crate::{ diff --git a/common/cosmwasm-smart-contracts/coconut-dkg/src/types.rs b/common/cosmwasm-smart-contracts/coconut-dkg/src/types.rs index 5cf5fd780e0..6e4fdef06a8 100644 --- a/common/cosmwasm-smart-contracts/coconut-dkg/src/types.rs +++ b/common/cosmwasm-smart-contracts/coconut-dkg/src/types.rs @@ -6,9 +6,9 @@ use std::fmt::{Display, Formatter}; use std::str::FromStr; pub use crate::dealer::{DealerDetails, DealerRegistrationDetails, PagedDealerResponse}; -pub use contracts_common::dealings::ContractSafeBytes; pub use cosmwasm_std::{Addr, Coin, Timestamp}; pub use cw4::Cw4Contract; +pub use nym_contracts_common::dealings::ContractSafeBytes; pub type EncodedBTEPublicKeyWithProof = String; pub type EncodedBTEPublicKeyWithProofRef<'a> = &'a str; diff --git a/common/cosmwasm-smart-contracts/contracts-common-testing/Cargo.toml b/common/cosmwasm-smart-contracts/contracts-common-testing/Cargo.toml index 0bb81f17921..69f429b24da 100644 --- a/common/cosmwasm-smart-contracts/contracts-common-testing/Cargo.toml +++ b/common/cosmwasm-smart-contracts/contracts-common-testing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-contracts-common-testing" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +description = "Common crate for cosmwasm contract tests" [dependencies] anyhow = { workspace = true } @@ -20,7 +21,7 @@ rand_chacha = { workspace = true } rand = { workspace = true } cw-multi-test = { workspace = true } -nym-contracts-common = { path = "../contracts-common" } +nym-contracts-common = { workspace = true } [lints] workspace = true diff --git a/common/cosmwasm-smart-contracts/contracts-common/Cargo.toml b/common/cosmwasm-smart-contracts/contracts-common/Cargo.toml index c13d29a7ec8..277351d5d0f 100644 --- a/common/cosmwasm-smart-contracts/contracts-common/Cargo.toml +++ b/common/cosmwasm-smart-contracts/contracts-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-contracts-common" -version = "0.5.0" +version.workspace = true description = "Common library for Nym cosmwasm contracts" edition = { workspace = true } authors = { workspace = true } diff --git a/common/cosmwasm-smart-contracts/easy_addr/Cargo.toml b/common/cosmwasm-smart-contracts/easy_addr/Cargo.toml index 992378fbe06..b8a48b40a78 100644 --- a/common/cosmwasm-smart-contracts/easy_addr/Cargo.toml +++ b/common/cosmwasm-smart-contracts/easy_addr/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "easy-addr" -version = "0.1.0" +version.workspace = true edition = "2021" publish = false license.workspace = true @@ -11,4 +11,4 @@ proc-macro = true [dependencies] cosmwasm-std = { workspace = true } quote = { workspace = true } -syn = { workspace = true, features = ["full", "printing", "extra-traits"] } \ No newline at end of file +syn = { workspace = true, features = ["full", "printing", "extra-traits"] } diff --git a/common/cosmwasm-smart-contracts/ecash-contract/Cargo.toml b/common/cosmwasm-smart-contracts/ecash-contract/Cargo.toml index 54bc53fe185..dce59308ceb 100644 --- a/common/cosmwasm-smart-contracts/ecash-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/ecash-contract/Cargo.toml @@ -1,8 +1,12 @@ [package] name = "nym-ecash-contract-common" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true +description = "Common crate for Nym's ecash/zknym cosmwasm contract" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -11,7 +15,7 @@ bs58.workspace = true cosmwasm-std = { workspace = true } cosmwasm-schema = { workspace = true } cw2 = { workspace = true, optional = true } -nym-multisig-contract-common = { path = "../multisig-contract" } +nym-multisig-contract-common = { workspace = true } thiserror.workspace = true cw-utils = { workspace = true } cw-controllers = { workspace = true } diff --git a/common/cosmwasm-smart-contracts/group-contract/Cargo.toml b/common/cosmwasm-smart-contracts/group-contract/Cargo.toml index e9a942139f0..17cb3e83dbf 100644 --- a/common/cosmwasm-smart-contracts/group-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/group-contract/Cargo.toml @@ -1,8 +1,12 @@ [package] name = "nym-group-contract-common" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true +description = "Common crate for Nym's group cosmwasm contract" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true [dependencies] cosmwasm-schema = { workspace = true } diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml b/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml index ed9b7ac1257..fb7143723d5 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-mixnet-contract-common" -version = "0.6.0" +version.workspace = true description = "Common library for the Nym mixnet contract" rust-version = "1.85" edition = { workspace = true } @@ -22,7 +22,7 @@ semver = { workspace = true, features = ["serde"] } # we still have to preserve that import for `JsonSchema` for `Layer` type (since we can't use cw_serde macro due to custom serde impl) schemars = { workspace = true } thiserror = { workspace = true } -contracts-common = { path = "../contracts-common", package = "nym-contracts-common", version = "0.5.0" } +nym-contracts-common = { workspace = true } humantime-serde = { workspace = true } utoipa = { workspace = true, optional = true } @@ -41,4 +41,4 @@ schema = ["cw2"] generate-ts = ['ts-rs'] [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/error.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/error.rs index 9298b385231..1d27cd69d0a 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/error.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/error.rs @@ -5,10 +5,10 @@ use crate::nym_node::Role; use crate::{ EpochEventId, EpochState, IntervalEventId, NodeId, OperatingCostRange, ProfitMarginRange, }; -use contracts_common::Percent; -use contracts_common::signing::verifier::ApiVerifierError; use cosmwasm_std::{Addr, Coin, Decimal, Uint128}; use cw_controllers::AdminError; +use nym_contracts_common::Percent; +use nym_contracts_common::signing::verifier::ApiVerifierError; use thiserror::Error; #[derive(Error, Debug, PartialEq)] diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/events.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/events.rs index a53c5dc1a90..572b8131a69 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/events.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/events.rs @@ -8,8 +8,8 @@ use crate::nym_node::Role; use crate::reward_params::{ActiveSetUpdate, IntervalRewardParams, IntervalRewardingParamsUpdate}; use crate::rewarding::RewardDistribution; use crate::{BlockHeight, ContractStateParamsUpdate, EpochId, IdentityKeyRef, Interval, NodeId}; -pub use contracts_common::events::*; use cosmwasm_std::{Addr, Coin, Decimal, Event, attr}; +pub use nym_contracts_common::events::*; use std::fmt::Display; pub const EVENT_VERSION_PREFIX: &str = "v2_"; diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/helpers.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/helpers.rs index b5032e64be0..dc563862387 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/helpers.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/helpers.rs @@ -7,8 +7,8 @@ use crate::{ EpochEventId, IntervalEventId, MixNodeBond, MixNodeDetails, NodeId, NodeRewarding, NymNodeBond, NymNodeDetails, PendingNodeChanges, }; -use contracts_common::IdentityKeyRef; use cosmwasm_std::{Coin, Decimal, StdError, StdResult, Uint128}; +use nym_contracts_common::IdentityKeyRef; #[track_caller] pub fn compare_decimals(a: Decimal, b: Decimal, epsilon: Option) { diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/lib.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/lib.rs index eb1d533270c..3c6f4b6b085 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/lib.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/lib.rs @@ -21,7 +21,6 @@ pub mod types; pub use config_score::*; pub use constants::*; -pub use contracts_common::types::*; pub use cosmwasm_std::{Addr, Coin, Decimal, Fraction}; pub use delegation::{ Delegation, PagedAllDelegationsResponse, PagedDelegatorDelegationsResponse, @@ -41,6 +40,7 @@ pub use mixnode::{ NodeRewarding, PagedMixnodeBondsResponse, UnbondedMixnode, }; pub use msg::*; +pub use nym_contracts_common::types::*; pub use nym_node::{NymNode, NymNodeBond, NymNodeDetails, PendingNodeChanges}; pub use pending_events::{ EpochEventId, IntervalEventId, NumberOfPendingEventsResponse, PendingEpochEvent, diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/msg.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/msg.rs index a85d86fedf1..4b0d31016d8 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/msg.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/msg.rs @@ -18,9 +18,9 @@ use crate::{ VersionScoreFormulaParams, }; use crate::{OperatingCostRange, ProfitMarginRange}; -use contracts_common::{IdentityKey, Percent, signing::MessageSignature}; use cosmwasm_schema::cw_serde; use cosmwasm_std::{Coin, Decimal}; +use nym_contracts_common::{IdentityKey, Percent, signing::MessageSignature}; use std::time::Duration; #[cfg(feature = "schema")] @@ -55,9 +55,9 @@ use crate::{ types::{ContractState, ContractStateParams}, }; #[cfg(feature = "schema")] -use contracts_common::{ContractBuildInformation, signing::Nonce}; -#[cfg(feature = "schema")] use cosmwasm_schema::QueryResponses; +#[cfg(feature = "schema")] +use nym_contracts_common::{ContractBuildInformation, signing::Nonce}; #[cw_serde] pub struct InstantiateMsg { diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/nym_node.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/nym_node.rs index 6fc172db09e..d82ca389076 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/nym_node.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/nym_node.rs @@ -3,10 +3,10 @@ use crate::error::MixnetContractError; use crate::{EpochEventId, EpochId, Gateway, IntervalEventId, MixNode, NodeId, NodeRewarding}; -use contracts_common::IdentityKey; use cosmwasm_schema::cw_serde; use cosmwasm_std::{Addr, Coin, Decimal, StdError, StdResult}; use cw_storage_plus::{IntKey, Key, KeyDeserialize, PrimaryKey}; +use nym_contracts_common::IdentityKey; use std::fmt::{Display, Formatter}; #[cw_serde] diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/rewarding/helpers.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/rewarding/helpers.rs index 4d9ca754597..f128a9c2c62 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/rewarding/helpers.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/rewarding/helpers.rs @@ -1,8 +1,8 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use contracts_common::truncate_decimal; use cosmwasm_std::{Coin, Decimal, Uint128}; +use nym_contracts_common::truncate_decimal; /// Truncates all decimal points so that the reward would fit in a `Coin` and so that we would /// never attempt to reward more than the owner is due diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/signing_types.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/signing_types.rs index 00130d52d83..6cd247d18c3 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/signing_types.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/signing_types.rs @@ -3,11 +3,11 @@ use crate::nym_node::NymNode; use crate::{Gateway, MixNode, NodeCostParams}; -use contracts_common::signing::{ +use cosmwasm_std::{Addr, Coin}; +use nym_contracts_common::signing::{ ContractMessageContent, LegacyContractMessageContent, MessageType, Nonce, SignableMessage, SigningPurpose, }; -use cosmwasm_std::{Addr, Coin}; use serde::Serialize; pub type SignableMixNodeBondingMsg = SignableMessage>; diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/types.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/types.rs index ebe198186d5..1b0590df1fc 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/types.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/types.rs @@ -5,10 +5,10 @@ use crate::EpochId; use crate::config_score::{ConfigScoreParams, OutdatedVersionWeights, VersionScoreFormulaParams}; use crate::nym_node::Role; use crate::reward_params::RewardedSetParams; -use contracts_common::Percent; use cosmwasm_schema::cw_serde; use cosmwasm_std::Coin; use cosmwasm_std::{Addr, Uint128}; +use nym_contracts_common::Percent; use std::fmt::{Display, Formatter}; // type aliases for better reasoning about available data diff --git a/common/cosmwasm-smart-contracts/multisig-contract/Cargo.toml b/common/cosmwasm-smart-contracts/multisig-contract/Cargo.toml index 89e039cd1f7..31aef542af2 100644 --- a/common/cosmwasm-smart-contracts/multisig-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/multisig-contract/Cargo.toml @@ -1,8 +1,10 @@ [package] name = "nym-multisig-contract-common" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true +description = "Common code for the Nym multisig CosmWasm smart contract" +homepage.workspace = true [dependencies] cosmwasm-schema = { workspace = true } diff --git a/common/cosmwasm-smart-contracts/nym-performance-contract/Cargo.toml b/common/cosmwasm-smart-contracts/nym-performance-contract/Cargo.toml index 078351a3480..8fd19ff8383 100644 --- a/common/cosmwasm-smart-contracts/nym-performance-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/nym-performance-contract/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-performance-contract-common" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +description = "Common crate for Nym's group performance contract" [dependencies] thiserror = { workspace = true } @@ -19,7 +20,7 @@ cosmwasm-std = { workspace = true } cosmwasm-schema = { workspace = true } cw-controllers = { workspace = true } -nym-contracts-common = { path = "../contracts-common" } +nym-contracts-common = { workspace = true } [features] diff --git a/common/cosmwasm-smart-contracts/nym-pool-contract/Cargo.toml b/common/cosmwasm-smart-contracts/nym-pool-contract/Cargo.toml index 38d7659ece7..a4567fb0c26 100644 --- a/common/cosmwasm-smart-contracts/nym-pool-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/nym-pool-contract/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-pool-contract-common" -version = "0.1.0" +version.workspace = true description = "Common library for the Nym Pool contract" authors.workspace = true repository.workspace = true diff --git a/common/cosmwasm-smart-contracts/vesting-contract/Cargo.toml b/common/cosmwasm-smart-contracts/vesting-contract/Cargo.toml index 9edf0ce49c2..cc29aebe127 100644 --- a/common/cosmwasm-smart-contracts/vesting-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/vesting-contract/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-vesting-contract-common" -version = "0.7.0" +version.workspace = true description = "Common library for the Nym vesting contract" edition = { workspace = true } authors = { workspace = true } @@ -11,8 +11,8 @@ repository = { workspace = true } cosmwasm-std = { workspace = true } cosmwasm-schema = { workspace = true } cw2 = { workspace = true, optional = true } -mixnet-contract-common = { path = "../mixnet-contract", package = "nym-mixnet-contract-common", version = "0.6.0" } -contracts-common = { path = "../contracts-common", package = "nym-contracts-common", version = "0.5.0" } +nym-mixnet-contract-common = { workspace = true } +nym-contracts-common = { workspace = true } serde = { workspace = true, features = ["derive"] } thiserror = { workspace = true } # without this feature, cargo clippy emits a ton of incompatibility warnings diff --git a/common/cosmwasm-smart-contracts/vesting-contract/src/error.rs b/common/cosmwasm-smart-contracts/vesting-contract/src/error.rs index c8b1c035945..996a666f37d 100644 --- a/common/cosmwasm-smart-contracts/vesting-contract/src/error.rs +++ b/common/cosmwasm-smart-contracts/vesting-contract/src/error.rs @@ -3,7 +3,7 @@ use crate::account::VestingAccountStorageKey; use cosmwasm_std::{Addr, Coin, OverflowError, StdError, Uint128}; -use mixnet_contract_common::NodeId; +use nym_mixnet_contract_common::NodeId; use thiserror::Error; #[derive(Error, Debug, PartialEq)] diff --git a/common/cosmwasm-smart-contracts/vesting-contract/src/lib.rs b/common/cosmwasm-smart-contracts/vesting-contract/src/lib.rs index 741fde4f7ba..8e462fb4bc2 100644 --- a/common/cosmwasm-smart-contracts/vesting-contract/src/lib.rs +++ b/common/cosmwasm-smart-contracts/vesting-contract/src/lib.rs @@ -6,7 +6,7 @@ use cosmwasm_schema::cw_serde; use cosmwasm_std::{Addr, Coin}; -use mixnet_contract_common::NodeId; +use nym_mixnet_contract_common::NodeId; pub mod account; pub mod error; @@ -126,8 +126,8 @@ pub struct AccountsResponse { #[cfg(test)] mod test { - use contracts_common::Percent; use cosmwasm_std::Uint128; + use nym_contracts_common::Percent; use std::str::FromStr; use crate::PledgeCap; diff --git a/common/cosmwasm-smart-contracts/vesting-contract/src/messages.rs b/common/cosmwasm-smart-contracts/vesting-contract/src/messages.rs index 9b2d4aa6e9f..cade5dec812 100644 --- a/common/cosmwasm-smart-contracts/vesting-contract/src/messages.rs +++ b/common/cosmwasm-smart-contracts/vesting-contract/src/messages.rs @@ -2,19 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{PledgeCap, VestingSpecification}; -use contracts_common::signing::MessageSignature; use cosmwasm_schema::cw_serde; use cosmwasm_std::{Coin, Timestamp}; -use mixnet_contract_common::{ +use nym_contracts_common::signing::MessageSignature; +use nym_mixnet_contract_common::{ Gateway, MixNode, NodeId, gateway::GatewayConfigUpdate, mixnode::{MixNodeConfigUpdate, NodeCostParams}, }; -#[cfg(feature = "schema")] -use contracts_common::ContractBuildInformation; #[cfg(feature = "schema")] use cosmwasm_schema::QueryResponses; +#[cfg(feature = "schema")] +use nym_contracts_common::ContractBuildInformation; #[cfg(feature = "schema")] use crate::{ diff --git a/common/cosmwasm-smart-contracts/vesting-contract/src/types.rs b/common/cosmwasm-smart-contracts/vesting-contract/src/types.rs index 0b153468042..35ba50a97f3 100644 --- a/common/cosmwasm-smart-contracts/vesting-contract/src/types.rs +++ b/common/cosmwasm-smart-contracts/vesting-contract/src/types.rs @@ -1,10 +1,10 @@ // Copyright 2023 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use contracts_common::Percent; use cosmwasm_schema::cw_serde; use cosmwasm_std::{Coin, Timestamp, Uint128}; -use mixnet_contract_common::NodeId; +use nym_contracts_common::Percent; +use nym_mixnet_contract_common::NodeId; use std::str::FromStr; #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))] diff --git a/common/credential-proxy/Cargo.toml b/common/credential-proxy/Cargo.toml index e06fd612e38..2141e37c422 100644 --- a/common/credential-proxy/Cargo.toml +++ b/common/credential-proxy/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-credential-proxy-lib" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +description = "Build script and core functionality of the Nym Credential Proxy" [dependencies] anyhow = { workspace = true } @@ -33,16 +34,16 @@ uuid = { workspace = true, features = ["serde"] } url = { workspace = true } zeroize = { workspace = true } -nym-credentials = { path = "../credentials" } -nym-crypto = { path = "../crypto", features = ["asymmetric", "rand", "serde"] } -nym-credentials-interface = { path = "../credentials-interface" } -nym-credential-proxy-requests = { path = "../../nym-credential-proxy/nym-credential-proxy-requests" } -nym-ecash-signer-check = { path = "../ecash-signer-check" } -nym-ecash-contract-common = { path = "../cosmwasm-smart-contracts/ecash-contract" } -nym-compact-ecash = { path = "../nym_offline_compact_ecash" } -nym-validator-client = { path = "../client-libs/validator-client" } -nym-network-defaults = { path = "../network-defaults" } -nym-cache = { path = "../nym-cache" } +nym-credentials = { workspace = true } +nym-crypto = { workspace = true, features = ["asymmetric", "rand", "serde"] } +nym-credentials-interface = { workspace = true } +nym-credential-proxy-requests = { workspace = true, features = ["query-types"] } +nym-ecash-signer-check = { workspace = true } +nym-ecash-contract-common = { workspace = true } +nym-compact-ecash = { workspace = true } +nym-validator-client = { workspace = true } +nym-network-defaults = { workspace = true } +nym-cache = { workspace = true } [dev-dependencies] tempfile = { workspace = true } diff --git a/common/credential-storage/Cargo.toml b/common/credential-storage/Cargo.toml index 9ca0eab6f36..42da92cedce 100644 --- a/common/credential-storage/Cargo.toml +++ b/common/credential-storage/Cargo.toml @@ -1,9 +1,13 @@ [package] name = "nym-credential-storage" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true rust-version.workspace = true +description = "Crate for handling and storing spent and unspent zknym ticketbooks" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -18,12 +22,12 @@ time = { workspace = true } tokio = { workspace = true, features = ["sync"] } zeroize = { workspace = true, features = ["zeroize_derive"] } -nym-credentials = { path = "../credentials" } -nym-compact-ecash = { path = "../nym_offline_compact_ecash" } -nym-ecash-time = { path = "../ecash-time" } +nym-credentials = { workspace = true } +nym-compact-ecash = { workspace = true } +nym-ecash-time = { workspace = true } -[target."cfg(not(target_arch = \"wasm32\"))".dependencies.sqlx-pool-guard] -path = "../../sqlx-pool-guard" +[target."cfg(not(target_arch = \"wasm32\"))".dependencies.nym-sqlx-pool-guard] +workspace = true [target."cfg(not(target_arch = \"wasm32\"))".dependencies.sqlx] workspace = true @@ -36,10 +40,10 @@ features = ["rt-multi-thread", "net", "signal", "fs"] [dev-dependencies] anyhow = { workspace = true } -nym-crypto = { path = "../crypto", features = ["asymmetric", "rand"] } -nym-test-utils = { path = "../test-utils" } -nym-credentials-interface = { path = "../credentials-interface" } -nym-compact-ecash = { path = "../nym_offline_compact_ecash" } +nym-crypto = { workspace = true, features = ["asymmetric", "rand"] } +nym-test-utils = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-compact-ecash = { workspace = true } [build-dependencies] diff --git a/common/credential-storage/src/backends/sqlite.rs b/common/credential-storage/src/backends/sqlite.rs index 960e555e1b6..25c7512a9b1 100644 --- a/common/credential-storage/src/backends/sqlite.rs +++ b/common/credential-storage/src/backends/sqlite.rs @@ -7,8 +7,8 @@ use crate::models::{ StoredIssuedTicketbook, StoredPendingTicketbook, }; use nym_ecash_time::Date; +use nym_sqlx_pool_guard::SqlitePoolGuard; use sqlx::{Executor, Sqlite, Transaction}; -use sqlx_pool_guard::SqlitePoolGuard; #[derive(Clone)] pub struct SqliteEcashTicketbookManager { diff --git a/common/credential-storage/src/persistent_storage/mod.rs b/common/credential-storage/src/persistent_storage/mod.rs index 4596bea2555..6f6665dedcd 100644 --- a/common/credential-storage/src/persistent_storage/mod.rs +++ b/common/credential-storage/src/persistent_storage/mod.rs @@ -34,11 +34,11 @@ use nym_credentials::{ IssuanceTicketBook, IssuedTicketBook, }; use nym_ecash_time::{ecash_today, Date, EcashTime}; +use nym_sqlx_pool_guard::SqlitePoolGuard; use sqlx::{ sqlite::{SqliteAutoVacuum, SqliteSynchronous}, ConnectOptions, }; -use sqlx_pool_guard::SqlitePoolGuard; use std::path::Path; use zeroize::Zeroizing; diff --git a/common/credential-utils/Cargo.toml b/common/credential-utils/Cargo.toml index 81ba19a85be..f3d6986d1de 100644 --- a/common/credential-utils/Cargo.toml +++ b/common/credential-utils/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "nym-credential-utils" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true - +description = "Utils crate for dealing with zknym credentials" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] @@ -12,11 +15,11 @@ thiserror = { workspace = true } tokio = { workspace = true } time.workspace = true -nym-bandwidth-controller = { path = "../../common/bandwidth-controller" } -nym-credentials = { path = "../../common/credentials" } -nym-credentials-interface = { path = "../../common/credentials-interface" } -nym-credential-storage = { path = "../../common/credential-storage", features = ["persistent-storage"] } -nym-validator-client = { path = "../../common/client-libs/validator-client" } -nym-config = { path = "../../common/config" } -nym-client-core = { path = "../../common/client-core" } -nym-ecash-time = { path = "../../common/ecash-time" } \ No newline at end of file +nym-bandwidth-controller = { workspace = true } +nym-credentials = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-credential-storage = { workspace = true, features = ["persistent-storage"] } +nym-validator-client = { workspace = true } +nym-config = { workspace = true } +nym-client-core = { workspace = true } +nym-ecash-time = { workspace = true } diff --git a/common/credential-verification/Cargo.toml b/common/credential-verification/Cargo.toml index 06c45efdc55..48016459c83 100644 --- a/common/credential-verification/Cargo.toml +++ b/common/credential-verification/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-credential-verification" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +description = "Store and verify zknym credentials" [dependencies] async-trait = { workspace = true } @@ -23,13 +24,13 @@ tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } time = { workspace = true } tracing = { workspace = true } -nym-api-requests = { path = "../../nym-api/nym-api-requests" } -nym-credentials = { path = "../credentials" } -nym-credentials-interface = { path = "../credentials-interface" } -nym-crypto = { path = "../crypto", features = ["asymmetric"] } -nym-ecash-contract-common = { path = "../cosmwasm-smart-contracts/ecash-contract" } -nym-gateway-requests = { path = "../gateway-requests" } -nym-gateway-storage = { path = "../gateway-storage" } -nym-task = { path = "../task" } -nym-validator-client = { path = "../client-libs/validator-client" } -nym-upgrade-mode-check = { path = "../upgrade-mode-check" } +nym-api-requests = { workspace = true } +nym-credentials = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-crypto = { workspace = true, features = ["asymmetric"] } +nym-ecash-contract-common = { workspace = true } +nym-gateway-requests = { workspace = true } +nym-gateway-storage = { workspace = true } +nym-task = { workspace = true } +nym-validator-client = { workspace = true, features = ["http-client"] } +nym-upgrade-mode-check = { workspace = true } diff --git a/common/credentials-interface/Cargo.toml b/common/credentials-interface/Cargo.toml index 57a88ea603f..fd2f6d895d7 100644 --- a/common/credentials-interface/Cargo.toml +++ b/common/credentials-interface/Cargo.toml @@ -1,17 +1,18 @@ [package] name = "nym-credentials-interface" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Interface for Nym's compact eacash / zknym credential scheme" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bls12_381 = { workspace = true, default-features = false } +nym-bls12_381-fork = { workspace = true } serde = { workspace = true, features = ["derive"] } thiserror = { workspace = true } strum = { workspace = true, features = ["derive"] } @@ -20,8 +21,7 @@ time = { workspace = true, features = ["serde"] } utoipa = { workspace = true } rand = { workspace = true } -nym-compact-ecash = { path = "../nym_offline_compact_ecash" } -nym-ecash-time = { path = "../ecash-time" } -nym-network-defaults = { path = "../network-defaults" } -nym-upgrade-mode-check = { path = "../upgrade-mode-check" } - +nym-compact-ecash = { workspace = true } +nym-ecash-time = { workspace = true } +nym-network-defaults = { workspace = true } +nym-upgrade-mode-check = { workspace = true } diff --git a/common/credentials/Cargo.toml b/common/credentials/Cargo.toml index e3cb06ec408..1a429bc24c8 100644 --- a/common/credentials/Cargo.toml +++ b/common/credentials/Cargo.toml @@ -1,13 +1,17 @@ [package] name = "nym-credentials" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true +description = "Crate for using Nym's zknym credentials" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bls12_381 = { workspace = true, default-features = false, features = ["pairings", "alloc", "experimental"] } +nym-bls12_381-fork = { workspace = true, default-features = false, features = ["pairings", "alloc", "experimental"] } bincode = { workspace = true } cosmrs = { workspace = true } thiserror = { workspace = true } @@ -16,18 +20,17 @@ time = { workspace = true, features = ["serde"] } serde = { workspace = true, features = ["derive"] } zeroize = { workspace = true } -nym-ecash-time = { path = "../ecash-time", features = ["expiration"] } +nym-ecash-time = { workspace = true, features = ["expiration"] } # I guess temporarily until we get serde support in coconut up and running -nym-credentials-interface = { path = "../credentials-interface" } -nym-crypto = { path = "../crypto" } -nym-api-requests = { path = "../../nym-api/nym-api-requests" } -nym-http-api-client = { path = "../http-api-client" } -nym-validator-client = { path = "../client-libs/validator-client", default-features = false } -nym-ecash-contract-common = { path = "../cosmwasm-smart-contracts/ecash-contract" } -nym-network-defaults = { path = "../network-defaults" } -nym-serde-helpers = { path = "../serde-helpers", features = ["date"] } +nym-credentials-interface = { workspace = true } +nym-crypto = { workspace = true } +nym-api-requests = { workspace = true } +nym-http-api-client = { workspace = true } +nym-validator-client = { workspace = true, default-features = false } +nym-ecash-contract-common = { workspace = true } +nym-network-defaults = { workspace = true } +nym-serde-helpers = { workspace = true, features = ["date"] } [dev-dependencies] rand = { workspace = true } - diff --git a/common/crypto/Cargo.toml b/common/crypto/Cargo.toml index 37a1e317e54..a0477212b81 100644 --- a/common/crypto/Cargo.toml +++ b/common/crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-crypto" -version = "0.4.0" +version.workspace = true description = "Crypto library for the nym mixnet" edition = { workspace = true } authors = { workspace = true } @@ -32,14 +32,14 @@ thiserror = { workspace = true } zeroize = { workspace = true, optional = true, features = ["zeroize_derive"] } # internal -nym-sphinx-types = { path = "../nymsphinx/types", version = "0.2.0", default-features = false } -nym-pemstore = { path = "../../common/pemstore", version = "0.3.0" } +nym-sphinx-types = { workspace = true } +nym-pemstore = { workspace = true } [dev-dependencies] anyhow = { workspace = true } rand_chacha = { workspace = true } serde_json = { workspace = true } -nym-test-utils = { path = "../test-utils" } +nym-test-utils = { workspace = true } [features] @@ -48,9 +48,9 @@ aead = ["dep:aead", "aead/std", "aes-gcm-siv", "generic-array"] naive_jwt = ["asymmetric", "jwt-simple"] serde = ["dep:serde", "serde_bytes", "ed25519-dalek/serde", "x25519-dalek/serde"] asymmetric = ["x25519-dalek", "ed25519-dalek", "zeroize"] -hashing = ["blake3", "digest", "hkdf", "hmac", "generic-array", "sha2"] +hashing = ["blake3", "digest", "hkdf", "hmac", "generic-array", "sha2", "zeroize"] stream_cipher = ["aes", "ctr", "cipher", "generic-array"] sphinx = ["nym-sphinx-types/sphinx"] [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/common/dkg/Cargo.toml b/common/dkg/Cargo.toml index b8e4f557319..e45a2a8d7f3 100644 --- a/common/dkg/Cargo.toml +++ b/common/dkg/Cargo.toml @@ -1,19 +1,23 @@ [package] name = "nym-dkg" -version = "0.1.0" +version.workspace = true edition = "2021" resolver = "2" license.workspace = true +description = "Nym's Distributed Key Generation functionality" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] bitvec = { workspace = true } -# unfortunately until https://github.com/zkcrypto/bls12_381/issues/10 is resolved, we have to rely on the fork +# unfortunately until https://github.com/zkcrypto/nym-bls12_381-fork/issues/10 is resolved, we have to rely on the fork # as we need to be able to serialize Gt so that we could create the lookup table for baby-step-giant-step algorithm -bls12_381 = { workspace = true, default-features = false, features = ["alloc", "pairings", "experimental", "zeroize"] } -nym-contracts-common = { path = "../cosmwasm-smart-contracts/contracts-common", optional = true } +nym-bls12_381-fork = { workspace = true, features = ["alloc", "pairings", "experimental", "zeroize"] } +nym-contracts-common = { workspace = true, optional = true } bs58 = { workspace = true } @@ -26,7 +30,7 @@ serde_derive = { workspace = true } thiserror = { workspace = true } zeroize = { workspace = true, features = ["zeroize_derive"] } -nym-pemstore = { path = "../pemstore" } +nym-pemstore = { workspace = true } [dependencies.group] workspace = true diff --git a/common/dkg/benches/benchmarks.rs b/common/dkg/benches/benchmarks.rs index d12305bba77..a3602688900 100644 --- a/common/dkg/benches/benchmarks.rs +++ b/common/dkg/benches/benchmarks.rs @@ -1,9 +1,9 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use bls12_381::{G1Projective, G2Affine, G2Prepared, Scalar}; use criterion::{black_box, criterion_group, criterion_main, Criterion}; use ff::Field; +use nym_bls12_381_fork::{G1Projective, G2Affine, G2Prepared, Scalar}; use nym_dkg::bte::encryption::BabyStepGiantStepLookup; use nym_dkg::bte::proof_chunking::ProofOfChunking; use nym_dkg::bte::proof_discrete_log::ProofOfDiscreteLog; diff --git a/common/dkg/src/bte/encryption.rs b/common/dkg/src/bte/encryption.rs index 438192757fa..9cc11f989d4 100644 --- a/common/dkg/src/bte/encryption.rs +++ b/common/dkg/src/bte/encryption.rs @@ -6,9 +6,9 @@ use crate::bte::{evaluate_f, Params, CHUNK_SIZE, G2_GENERATOR_PREPARED, NUM_CHUN use crate::error::DkgError; use crate::utils::{combine_g1_chunks, combine_scalar_chunks, deserialize_g1, deserialize_g2}; use crate::{Chunk, ChunkedShare, Share}; -use bls12_381::{G1Affine, G1Projective, G2Prepared, G2Projective, Gt, Scalar}; use ff::Field; use group::{Curve, Group, GroupEncoding}; +use nym_bls12_381_fork::{G1Affine, G1Projective, G2Prepared, G2Projective, Gt, Scalar}; use rand::CryptoRng; use rand_core::RngCore; use std::collections::HashMap; @@ -43,7 +43,7 @@ impl Ciphertexts { // which is equivalent to checking whether e(R_j, f) • e(S_i, h) • e(g1, Z_i)^-1 == id // and due to bilinear property whether e(R_j, f) • e(S_i, h) • e(g1^-1, Z_i) == id for i in 0..self.rr.len() { - let miller = bls12_381::multi_miller_loop(&[ + let miller = nym_bls12_381_fork::multi_miller_loop(&[ (&self.rr[i].to_affine(), &f_prepared), (&self.ss[i].to_affine(), ¶ms._h_prepared), (&g1_neg, &G2Prepared::from(self.zz[i].to_affine())), @@ -294,7 +294,7 @@ pub fn decrypt_share( let zz_j = ciphertext.zz[j].to_affine(); let cc_ij = &ciphertext.ciphertext_chunks[i][j]; - let miller = bls12_381::multi_miller_loop(&[ + let miller = nym_bls12_381_fork::multi_miller_loop(&[ (&cc_ij.to_affine(), &G2_GENERATOR_PREPARED), (&rr_j.to_affine(), &G2Prepared::from(b_neg)), (&dk.a.to_affine(), &G2Prepared::from(zz_j)), diff --git a/common/dkg/src/bte/keys.rs b/common/dkg/src/bte/keys.rs index b81d6cbf778..9bd1406115b 100644 --- a/common/dkg/src/bte/keys.rs +++ b/common/dkg/src/bte/keys.rs @@ -5,9 +5,9 @@ use crate::bte::proof_discrete_log::ProofOfDiscreteLog; use crate::bte::Params; use crate::error::DkgError; use crate::utils::{deserialize_g1, deserialize_g2, deserialize_scalar}; -use bls12_381::{G1Projective, G2Projective, Scalar}; use ff::Field; use group::GroupEncoding; +use nym_bls12_381_fork::{G1Projective, G2Projective, Scalar}; use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair}; use rand::CryptoRng; use rand_core::RngCore; diff --git a/common/dkg/src/bte/mod.rs b/common/dkg/src/bte/mod.rs index ea5c9a70c6f..e1d72855650 100644 --- a/common/dkg/src/bte/mod.rs +++ b/common/dkg/src/bte/mod.rs @@ -6,8 +6,8 @@ use std::sync::LazyLock; use crate::bte::encryption::BabyStepGiantStepLookup; use crate::utils::hash_g2; use crate::{Chunk, Share}; -use bls12_381::{G1Affine, G2Affine, G2Prepared, G2Projective, Gt}; use group::Curve; +use nym_bls12_381_fork::{G1Affine, G2Affine, G2Prepared, G2Projective, Gt}; pub mod encryption; pub mod keys; @@ -19,7 +19,7 @@ pub use encryption::{decrypt_share, encrypt_shares, Ciphertexts}; pub use keys::{keygen, DecryptionKey, PublicKey, PublicKeyWithProof}; pub(crate) static PAIRING_BASE: LazyLock = - LazyLock::new(|| bls12_381::pairing(&G1Affine::generator(), &G2Affine::generator())); + LazyLock::new(|| nym_bls12_381_fork::pairing(&G1Affine::generator(), &G2Affine::generator())); pub(crate) static G2_GENERATOR_PREPARED: LazyLock = LazyLock::new(|| G2Prepared::from(G2Affine::generator())); pub static BSGS_TABLE: LazyLock = diff --git a/common/dkg/src/bte/proof_chunking.rs b/common/dkg/src/bte/proof_chunking.rs index 7e5b5cec2f3..cfa4e6262e9 100644 --- a/common/dkg/src/bte/proof_chunking.rs +++ b/common/dkg/src/bte/proof_chunking.rs @@ -7,9 +7,9 @@ use crate::ensure_len; use crate::error::DkgError; use crate::utils::{deserialize_g1, hash_to_scalar}; use crate::utils::{deserialize_scalar, RandomOracleBuilder}; -use bls12_381::{G1Projective, Scalar}; use ff::Field; use group::{Group, GroupEncoding}; +use nym_bls12_381_fork::{G1Projective, Scalar}; use rand::{CryptoRng, Rng}; use rand_core::{RngCore, SeedableRng}; use zeroize::{Zeroize, ZeroizeOnDrop}; diff --git a/common/dkg/src/bte/proof_discrete_log.rs b/common/dkg/src/bte/proof_discrete_log.rs index de186f8fb6c..59746de7214 100644 --- a/common/dkg/src/bte/proof_discrete_log.rs +++ b/common/dkg/src/bte/proof_discrete_log.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::utils::hash_to_scalar; -use bls12_381::{G1Projective, Scalar}; use ff::Field; use group::GroupEncoding; +use nym_bls12_381_fork::{G1Projective, Scalar}; use rand::CryptoRng; use rand_core::RngCore; use zeroize::{Zeroize, ZeroizeOnDrop}; diff --git a/common/dkg/src/bte/proof_sharing.rs b/common/dkg/src/bte/proof_sharing.rs index 5659ec92350..2cf8f293524 100644 --- a/common/dkg/src/bte/proof_sharing.rs +++ b/common/dkg/src/bte/proof_sharing.rs @@ -6,9 +6,9 @@ use crate::error::DkgError; use crate::interpolation::polynomial::PublicCoefficients; use crate::utils::{deserialize_g1, deserialize_g2, deserialize_scalar, hash_to_scalar}; use crate::{NodeIndex, Share}; -use bls12_381::{G1Projective, G2Projective, Scalar}; use ff::Field; use group::GroupEncoding; +use nym_bls12_381_fork::{G1Projective, G2Projective, Scalar}; use rand::CryptoRng; use rand_core::RngCore; use std::collections::BTreeMap; diff --git a/common/dkg/src/dealing.rs b/common/dkg/src/dealing.rs index 832e1260ff7..def4aa09577 100644 --- a/common/dkg/src/dealing.rs +++ b/common/dkg/src/dealing.rs @@ -11,8 +11,8 @@ use crate::interpolation::{ }; use crate::utils::deserialize_g2; use crate::{NodeIndex, Share, Threshold}; -use bls12_381::{G2Projective, Scalar}; use group::GroupEncoding; +use nym_bls12_381_fork::{G2Projective, Scalar}; use rand::CryptoRng; use rand_core::RngCore; use std::collections::BTreeMap; diff --git a/common/dkg/src/interpolation/mod.rs b/common/dkg/src/interpolation/mod.rs index caedc1114ef..ade36327c03 100644 --- a/common/dkg/src/interpolation/mod.rs +++ b/common/dkg/src/interpolation/mod.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::error::DkgError; -use bls12_381::Scalar; use core::iter::Sum; use core::ops::Mul; +use nym_bls12_381_fork::Scalar; use std::collections::HashSet; pub mod polynomial; diff --git a/common/dkg/src/interpolation/polynomial.rs b/common/dkg/src/interpolation/polynomial.rs index b6a2331c130..04844000081 100644 --- a/common/dkg/src/interpolation/polynomial.rs +++ b/common/dkg/src/interpolation/polynomial.rs @@ -3,9 +3,9 @@ use crate::error::DkgError; use crate::utils::deserialize_g2; -use bls12_381::{G2Projective, Scalar}; use ff::Field; use group::GroupEncoding; +use nym_bls12_381_fork::{G2Projective, Scalar}; use rand::CryptoRng; use rand_core::RngCore; use std::ops::{Add, Index, IndexMut}; diff --git a/common/dkg/src/lib.rs b/common/dkg/src/lib.rs index d11fa6071ba..14d929604ad 100644 --- a/common/dkg/src/lib.rs +++ b/common/dkg/src/lib.rs @@ -13,8 +13,8 @@ pub mod dealing; pub(crate) mod share; pub(crate) mod utils; -pub use bls12_381::{G2Projective, Scalar}; pub use dealing::*; +pub use nym_bls12_381_fork::{G2Projective, Scalar}; pub use share::*; // TODO: presumably this should live in a some different, common, crate? @@ -25,7 +25,7 @@ pub type NodeIndex = u64; mod tests { use crate::interpolation::perform_lagrangian_interpolation_at_origin; use crate::interpolation::polynomial::Polynomial; - use bls12_381::Scalar; + use nym_bls12_381_fork::Scalar; use rand_chacha::rand_core::SeedableRng; #[test] diff --git a/common/dkg/src/share.rs b/common/dkg/src/share.rs index 96039048be4..d448587b89f 100644 --- a/common/dkg/src/share.rs +++ b/common/dkg/src/share.rs @@ -5,7 +5,7 @@ use crate::bte::{CHUNK_BYTES, NUM_CHUNKS, SCALAR_SIZE}; use crate::error::DkgError; use crate::interpolation::perform_lagrangian_interpolation_at_origin; use crate::NodeIndex; -use bls12_381::Scalar; +use nym_bls12_381_fork::Scalar; use zeroize::{Zeroize, ZeroizeOnDrop}; // if this type is changed, one must ensure all values can fit in it diff --git a/common/dkg/src/utils.rs b/common/dkg/src/utils.rs index e654a83f8c1..c852379d49a 100644 --- a/common/dkg/src/utils.rs +++ b/common/dkg/src/utils.rs @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 use crate::bte::CHUNK_SIZE; -use bls12_381::hash_to_curve::{ExpandMsgXmd, HashToCurve, HashToField}; -use bls12_381::G1Projective; -use bls12_381::{G2Projective, Scalar}; use group::GroupEncoding; +use nym_bls12_381_fork::hash_to_curve::{ExpandMsgXmd, HashToCurve, HashToField}; +use nym_bls12_381_fork::G1Projective; +use nym_bls12_381_fork::{G2Projective, Scalar}; use sha2::{Digest, Sha256}; #[macro_export] @@ -116,7 +116,7 @@ pub(crate) fn deserialize_g2(b: &[u8]) -> Option { #[cfg(test)] mod tests { use super::*; - use bls12_381::G2Affine; + use nym_bls12_381_fork::G2Affine; #[test] fn test_hash_to_scalar() { diff --git a/common/dkg/tests/integration.rs b/common/dkg/tests/integration.rs index e34195488ed..c5560e70bf4 100644 --- a/common/dkg/tests/integration.rs +++ b/common/dkg/tests/integration.rs @@ -1,7 +1,7 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use bls12_381::{G2Projective, Scalar}; +use nym_bls12_381_fork::{G2Projective, Scalar}; use nym_dkg::bte::{decrypt_share, keygen, setup}; use nym_dkg::dealing::RecoveredVerificationKeys; use nym_dkg::interpolation::perform_lagrangian_interpolation_at_origin; diff --git a/common/ecash-signer-check-types/Cargo.toml b/common/ecash-signer-check-types/Cargo.toml index 0f07437c710..ac3a6f084da 100644 --- a/common/ecash-signer-check-types/Cargo.toml +++ b/common/ecash-signer-check-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-ecash-signer-check-types" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +description = "Crate containing types for the `ecash-signer-check` crate used to check if zknym signers are up and running properly" [dependencies] semver = { workspace = true } @@ -19,8 +20,8 @@ time = { workspace = true } tracing = { workspace = true } utoipa = { workspace = true } -nym-coconut-dkg-common = { path = "../cosmwasm-smart-contracts/coconut-dkg" } -nym-crypto = { path = "../crypto", features = ["asymmetric"] } +nym-coconut-dkg-common = { workspace = true } +nym-crypto = { workspace = true, features = ["asymmetric"] } [lints] diff --git a/common/ecash-signer-check/Cargo.toml b/common/ecash-signer-check/Cargo.toml index cc8fb6ec296..8549930a037 100644 --- a/common/ecash-signer-check/Cargo.toml +++ b/common/ecash-signer-check/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-ecash-signer-check" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +description = "Functions to interact with zknym signers, checking their status and health" [dependencies] futures = { workspace = true } @@ -19,10 +20,10 @@ tracing = { workspace = true } url = { workspace = true } -nym-validator-client = { path = "../client-libs/validator-client" } -nym-network-defaults = { path = "../network-defaults" } -nym-ecash-signer-check-types = { path = "../ecash-signer-check-types" } -nym-http-api-client = { path = "../http-api-client" } +nym-validator-client = { workspace = true, features = ["http-client"] } +nym-network-defaults = { workspace = true } +nym-ecash-signer-check-types = { workspace = true } +nym-http-api-client = { workspace = true } [lints] workspace = true diff --git a/common/ecash-time/Cargo.toml b/common/ecash-time/Cargo.toml index 4eaee90438a..1780a96afe4 100644 --- a/common/ecash-time/Cargo.toml +++ b/common/ecash-time/Cargo.toml @@ -1,19 +1,20 @@ [package] name = "nym-ecash-time" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Time-related helper functions for Nym's zknym scheme" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] time.workspace = true -nym-compact-ecash = { path = "../nym_offline_compact_ecash", optional = true } +nym-compact-ecash = { workspace = true, optional = true } [features] -expiration = ["nym-compact-ecash"] \ No newline at end of file +expiration = ["nym-compact-ecash"] diff --git a/common/exit-policy/Cargo.toml b/common/exit-policy/Cargo.toml index a5e8f26974d..3db220a9203 100644 --- a/common/exit-policy/Cargo.toml +++ b/common/exit-policy/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-exit-policy" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Get and set the Nym Exit Policy, used by Exit Gateways" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/gateway-requests/Cargo.toml b/common/gateway-requests/Cargo.toml index 65a5704fdc8..b9cdf43d01e 100644 --- a/common/gateway-requests/Cargo.toml +++ b/common/gateway-requests/Cargo.toml @@ -3,10 +3,14 @@ [package] name = "nym-gateway-requests" -version = "0.1.0" +version.workspace = true authors = ["Jedrzej Stuczynski "] edition = "2021" license.workspace = true +description = "Request and response definitions for Nym Gateway <> client communication" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -24,15 +28,15 @@ time = { workspace = true } subtle = { workspace = true } zeroize = { workspace = true } -nym-crypto = { path = "../crypto", features = ["aead", "hashing"] } -nym-pemstore = { path = "../pemstore" } -nym-sphinx = { path = "../nymsphinx" } -nym-serde-helpers = { path = "../serde-helpers", features = ["base64"] } -nym-statistics-common = { path = "../statistics" } -nym-task = { path = "../task" } +nym-crypto = { workspace = true, features = ["aead", "hashing"] } +nym-pemstore = { workspace = true } +nym-sphinx = { workspace = true } +nym-serde-helpers = { workspace = true, features = ["base64"] } +nym-statistics-common = { workspace = true } +nym-task = { workspace = true } -nym-credentials = { path = "../credentials" } -nym-credentials-interface = { path = "../credentials-interface" } +nym-credentials = { workspace = true } +nym-credentials-interface = { workspace = true } [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio] workspace = true @@ -48,9 +52,9 @@ default-features = false [dev-dependencies] anyhow = { workspace = true } -nym-compact-ecash = { path = "../nym_offline_compact_ecash" } # we need specific imports in tests -nym-test-utils = { path = "../test-utils" } +nym-compact-ecash = { workspace = true } # we need specific imports in tests +nym-test-utils = { workspace = true } tokio = { workspace = true, features = ["full"] } [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/common/gateway-stats-storage/Cargo.toml b/common/gateway-stats-storage/Cargo.toml index e958e255260..7c1f9960592 100644 --- a/common/gateway-stats-storage/Cargo.toml +++ b/common/gateway-stats-storage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-gateway-stats-storage" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -8,6 +8,7 @@ documentation.workspace = true edition.workspace = true license.workspace = true rust-version.workspace = true +description = "Functionality Nym Gateway statistics storage" [dependencies] sqlx = { workspace = true, features = [ @@ -22,9 +23,9 @@ time = { workspace = true } thiserror = { workspace = true } tracing = { workspace = true } -nym-sphinx = { path = "../nymsphinx" } -nym-node-metrics = { path = "../../nym-node/nym-node-metrics" } -nym-statistics-common = { path = "../statistics" } +nym-sphinx = { workspace = true } +nym-node-metrics = { workspace = true } +nym-statistics-common = { workspace = true } [build-dependencies] diff --git a/common/gateway-storage/Cargo.toml b/common/gateway-storage/Cargo.toml index c7878511be6..32424e7d4ab 100644 --- a/common/gateway-storage/Cargo.toml +++ b/common/gateway-storage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-gateway-storage" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -8,6 +8,7 @@ documentation.workspace = true edition.workspace = true license.workspace = true rust-version.workspace = true +description = "Crate handling db setup and use for Nym Gateways, used for credentials, packets, connections" [dependencies] async-trait = { workspace = true } @@ -27,9 +28,9 @@ thiserror = { workspace = true } tokio = { workspace = true, features = ["sync"], optional = true } tracing = { workspace = true } -nym-credentials-interface = { path = "../credentials-interface" } -nym-gateway-requests = { path = "../gateway-requests" } -nym-sphinx = { path = "../nymsphinx" } +nym-credentials-interface = { workspace = true } +nym-gateway-requests = { workspace = true } +nym-sphinx = { workspace = true } [build-dependencies] anyhow = { workspace = true } @@ -43,4 +44,4 @@ sqlx = { workspace = true, features = [ [features] default = [] -mock = ["tokio"] \ No newline at end of file +mock = ["tokio"] diff --git a/common/http-api-client-macro/Cargo.toml b/common/http-api-client-macro/Cargo.toml index ea23bbd23af..f5e12bef4cf 100644 --- a/common/http-api-client-macro/Cargo.toml +++ b/common/http-api-client-macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-http-api-client-macro" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +description = "Proc-macros for configuring HTTP clients globally via the `inventory` crate" [lib] proc-macro = true @@ -21,7 +22,7 @@ proc-macro-crate = "3" uuid = { version = "1.0", features = ["v4"] } [dev-dependencies] -nym-http-api-client = { path = "../http-api-client" } +nym-http-api-client = { workspace = true } reqwest = { workspace = true } [features] diff --git a/common/http-api-client/Cargo.toml b/common/http-api-client/Cargo.toml index e748e37888f..43daed794f8 100644 --- a/common/http-api-client/Cargo.toml +++ b/common/http-api-client/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-http-api-client" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Nym's HTTP API client, examples, and tests" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -38,10 +39,10 @@ bytes = { workspace = true } encoding_rs = { workspace = true } mime = { workspace = true } -nym-http-api-common = { path = "../http-api-common", default-features = false } -nym-bin-common = { path = "../bin-common" } -nym-network-defaults = { path = "../network-defaults", optional = true } -nym-http-api-client-macro = { path = "../http-api-client-macro" } +nym-http-api-common = { workspace = true } +nym-bin-common = { workspace = true } +nym-network-defaults = { workspace = true, optional = true } +nym-http-api-client-macro = { workspace = true } [target."cfg(not(target_arch = \"wasm32\"))".dependencies] hickory-resolver = { workspace = true, features = ["https-ring", "tls-ring", "webpki-roots"] } diff --git a/common/http-api-common/Cargo.toml b/common/http-api-common/Cargo.toml index 4a405c155ea..17d7521788a 100644 --- a/common/http-api-common/Cargo.toml +++ b/common/http-api-common/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-http-api-common" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Common crate for Nym-related HTTP API interaction" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -52,4 +53,4 @@ middleware = [ utoipa = ["dep:utoipa"] [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/common/inclusion-probability/Cargo.toml b/common/inclusion-probability/Cargo.toml index b98a1ec5e8e..d27d0a23fa9 100644 --- a/common/inclusion-probability/Cargo.toml +++ b/common/inclusion-probability/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-inclusion-probability" -version = "0.1.0" +version.workspace = true description = "Nym active set probability simulator" edition.workspace = true authors.workspace = true diff --git a/common/ip-packet-requests/Cargo.toml b/common/ip-packet-requests/Cargo.toml index cd9663dc90b..487ff4d7820 100644 --- a/common/ip-packet-requests/Cargo.toml +++ b/common/ip-packet-requests/Cargo.toml @@ -1,20 +1,22 @@ [package] name = "nym-ip-packet-requests" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Codec, signing functionality, and different version definitions for IP packet request and responses" + [dependencies] bincode = { workspace = true } bytes = { workspace = true } -nym-bin-common = { path = "../bin-common" } -nym-crypto = { path = "../crypto" } -nym-service-provider-requests-common = { path = "../service-provider-requests-common" } -nym-sphinx = { path = "../nymsphinx" } +nym-bin-common = { workspace = true } +nym-crypto = { workspace = true } +nym-service-provider-requests-common = { workspace = true } +nym-sphinx = { workspace = true } rand = { workspace = true } serde = { workspace = true, features = ["derive"] } thiserror = { workspace = true } diff --git a/common/ledger/Cargo.toml b/common/ledger/Cargo.toml index 72de9bb0034..ff3cf35adf2 100644 --- a/common/ledger/Cargo.toml +++ b/common/ledger/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "nym-ledger" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/mixnode-common/Cargo.toml b/common/mixnode-common/Cargo.toml index 8fbab39525c..50d1c94cde6 100644 --- a/common/mixnode-common/Cargo.toml +++ b/common/mixnode-common/Cargo.toml @@ -1,9 +1,13 @@ [package] name = "nym-mixnode-common" -version = "0.1.0" +version.workspace = true authors = ["JÄ™drzej StuczyÅ„ski "] edition = "2021" license.workspace = true +description = "Common crate for Nym Mix Nodes" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -26,14 +30,13 @@ url = { workspace = true } time.workspace = true thiserror = { workspace = true } -nym-crypto = { path = "../crypto", features = ["asymmetric"] } -nym-network-defaults = { path = "../network-defaults" } -nym-sphinx-acknowledgements = { path = "../nymsphinx/acknowledgements" } -nym-sphinx-addressing = { path = "../nymsphinx/addressing" } -nym-sphinx-forwarding = { path = "../nymsphinx/forwarding" } -nym-sphinx-framing = { path = "../nymsphinx/framing" } -nym-sphinx-params = { path = "../nymsphinx/params" } -nym-sphinx-types = { path = "../nymsphinx/types" } -nym-task = { path = "../task" } -nym-metrics = { path = "../nym-metrics" } - +nym-crypto = { workspace = true, features = ["asymmetric"] } +nym-network-defaults = { workspace = true } +nym-sphinx-acknowledgements = { workspace = true } +nym-sphinx-addressing = { workspace = true } +nym-sphinx-forwarding = { workspace = true } +nym-sphinx-framing = { workspace = true } +nym-sphinx-params = { workspace = true } +nym-sphinx-types = { workspace = true } +nym-task = { workspace = true } +nym-metrics = { workspace = true } diff --git a/common/network-defaults/Cargo.toml b/common/network-defaults/Cargo.toml index d8cbc367118..5c3a73e2793 100644 --- a/common/network-defaults/Cargo.toml +++ b/common/network-defaults/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-network-defaults" -version = "0.1.0" +version.workspace = true description = "Nym network defaults" edition.workspace = true authors.workspace = true diff --git a/common/node-tester-utils/Cargo.toml b/common/node-tester-utils/Cargo.toml index 89e4043ad39..d3845fb0948 100644 --- a/common/node-tester-utils/Cargo.toml +++ b/common/node-tester-utils/Cargo.toml @@ -1,8 +1,12 @@ [package] name = "nym-node-tester-utils" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true +description = "Utils for the Nym Node Tester" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -16,17 +20,17 @@ serde_json = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true, features = ["macros"] } -nym-crypto = { path = "../crypto", features = ["asymmetric"] } -nym-task = { path = "../task" } -nym-topology = { path = "../topology" } -nym-sphinx-params = { path = "../nymsphinx/params" } +nym-crypto = { workspace = true, features = ["asymmetric"] } +nym-task = { workspace = true } +nym-topology = { workspace = true } +nym-sphinx-params = { workspace = true } # TODO: do we need the whole nymsphinx? -nym-sphinx = { path = "../nymsphinx" } +nym-sphinx = { workspace = true } ## non-wasm-only dependencies [target."cfg(not(target_arch = \"wasm32\"))".dependencies.log] workspace = true ## wasm-only dependencies -[target."cfg(target_arch = \"wasm32\")".dependencies.wasm-utils] -path = "../wasm/utils" +[target."cfg(target_arch = \"wasm32\")".dependencies.nym-wasm-utils] +workspace = true diff --git a/common/node-tester-utils/src/lib.rs b/common/node-tester-utils/src/lib.rs index 444d1780f80..6a164c460b1 100644 --- a/common/node-tester-utils/src/lib.rs +++ b/common/node-tester-utils/src/lib.rs @@ -21,7 +21,7 @@ pub(crate) type NodeId = u32; macro_rules! log_err { ($($t:tt)*) => {{ #[cfg(target_arch = "wasm32")] - {::wasm_utils::console_error!($($t)*)} + {::nym_wasm_utils::console_error!($($t)*)} #[cfg(not(target_arch = "wasm32"))] {::log::error!($($t)*)} @@ -32,7 +32,7 @@ macro_rules! log_err { macro_rules! log_warn { ($($t:tt)*) => {{ #[cfg(target_arch = "wasm32")] - {::wasm_utils::console_warn!($($t)*)} + {::nym_wasm_utils::console_warn!($($t)*)} #[cfg(not(target_arch = "wasm32"))] {::log::warn!($($t)*)} @@ -43,7 +43,7 @@ macro_rules! log_warn { macro_rules! log_info { ($($t:tt)*) => {{ #[cfg(target_arch = "wasm32")] - {::wasm_utils::console_log!($($t)*)} + {::nym_wasm_utils::console_log!($($t)*)} #[cfg(not(target_arch = "wasm32"))] {::log::info!($($t)*)} diff --git a/common/nonexhaustive-delayqueue/Cargo.toml b/common/nonexhaustive-delayqueue/Cargo.toml index 76903a4b5f2..f8d46716884 100644 --- a/common/nonexhaustive-delayqueue/Cargo.toml +++ b/common/nonexhaustive-delayqueue/Cargo.toml @@ -1,9 +1,13 @@ [package] name = "nym-nonexhaustive-delayqueue" -version = "0.1.0" +version.workspace = true authors = ["JÄ™drzej StuczyÅ„ski "] edition = "2021" license.workspace = true +description = "A copy of tokio-util delay_queue with `Sleep` and `Instant` being replaced with`wasm_timer` equivalents" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -20,4 +24,3 @@ features = ["time"] [target."cfg(target_arch = \"wasm32\")".dependencies.wasmtimer] workspace = true features = ["tokio", "tokio-util"] - diff --git a/common/nym-cache/Cargo.toml b/common/nym-cache/Cargo.toml index 8bcfc2e9975..3d935c3e896 100644 --- a/common/nym-cache/Cargo.toml +++ b/common/nym-cache/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-cache" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +description = "Helper functions around a RwLock for writing to local cache of items" [dependencies] tokio = { workspace = true, features = ["sync"] } diff --git a/common/nym-common/Cargo.toml b/common/nym-common/Cargo.toml index 5bf119c8eeb..6bdbef1bcea 100644 --- a/common/nym-common/Cargo.toml +++ b/common/nym-common/Cargo.toml @@ -1,10 +1,11 @@ [package] name = "nym-common" -version = "1.18.0" +version.workspace = true authors.workspace = true repository.workspace = true license.workspace = true edition.workspace = true +description = "Runtime diagnostics for high frequency logging, debugging and error handling utilities" [lints] workspace = true diff --git a/common/nym-connection-monitor/Cargo.toml b/common/nym-connection-monitor/Cargo.toml index e19991d3e47..03de5da740b 100644 --- a/common/nym-connection-monitor/Cargo.toml +++ b/common/nym-connection-monitor/Cargo.toml @@ -7,6 +7,7 @@ homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +publish = false [lints] workspace = true @@ -15,10 +16,10 @@ workspace = true bincode.workspace = true bytes.workspace = true futures.workspace = true -nym-config = { path = "../config" } -nym-common = { path = "../nym-common" } -nym-ip-packet-requests = { path = "../ip-packet-requests" } -nym-sdk = { path = "../../sdk/rust/nym-sdk" } +nym-config = { workspace = true } +nym-common = { workspace = true } +nym-ip-packet-requests = { workspace = true } +nym-sdk = { workspace = true } pnet_packet.workspace = true thiserror.workspace = true tokio.workspace = true diff --git a/common/nym-id/Cargo.toml b/common/nym-id/Cargo.toml index eb80073fb76..17b4ac31ef3 100644 --- a/common/nym-id/Cargo.toml +++ b/common/nym-id/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-id" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Functionality for importing and storing credentials and cryptographic keys" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -16,5 +17,5 @@ time.workspace = true tracing.workspace = true zeroize.workspace = true -nym-credential-storage = { path = "../credential-storage" } -nym-credentials = { path = "../credentials" } +nym-credential-storage = { workspace = true } +nym-credentials = { workspace = true } diff --git a/common/nym-metrics/Cargo.toml b/common/nym-metrics/Cargo.toml index 1ac3bce16af..491b72f07d0 100644 --- a/common/nym-metrics/Cargo.toml +++ b/common/nym-metrics/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-metrics" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Metrics macros" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/nym_offline_compact_ecash/Cargo.toml b/common/nym_offline_compact_ecash/Cargo.toml index 718787b457c..e70063bd170 100644 --- a/common/nym_offline_compact_ecash/Cargo.toml +++ b/common/nym_offline_compact_ecash/Cargo.toml @@ -3,15 +3,19 @@ [package] name = "nym-compact-ecash" -version = "0.1.0" +version.workspace = true authors = ["Ania Piotrowska "] edition = "2021" license = { workspace = true } +description = "Nym's ecash implementation" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bls12_381 = { workspace = true, features = ["alloc", "pairings", "experimental", "zeroize", "experimental_serde"] } +nym-bls12_381-fork = { workspace = true, features = ["alloc", "pairings", "experimental", "zeroize", "experimental_serde"] } bincode.workspace = true cfg-if.workspace = true itertools = { workspace = true } @@ -27,8 +31,8 @@ ff = { workspace = true } group = { workspace = true } subtle = { workspace = true } -nym-pemstore = { path = "../pemstore" } -nym-network-defaults = { path = "../network-defaults", default-features = false } +nym-pemstore = { workspace = true } +nym-network-defaults = { workspace = true } [dev-dependencies] criterion = { workspace = true, features = ["html_reports"] } diff --git a/common/nym_offline_compact_ecash/benches/benchmarks_group_operations.rs b/common/nym_offline_compact_ecash/benches/benchmarks_group_operations.rs index 73c74472e73..a6769200b0c 100644 --- a/common/nym_offline_compact_ecash/benches/benchmarks_group_operations.rs +++ b/common/nym_offline_compact_ecash/benches/benchmarks_group_operations.rs @@ -4,24 +4,24 @@ use std::ops::Neg; use std::time::Duration; -use bls12_381::{ - multi_miller_loop, G1Affine, G1Projective, G2Affine, G2Prepared, G2Projective, Gt, Scalar, -}; use criterion::{criterion_group, criterion_main, Criterion}; use ff::Field; use group::{Curve, Group}; +use nym_bls12_381_fork::{ + multi_miller_loop, G1Affine, G1Projective, G2Affine, G2Prepared, G2Projective, Gt, Scalar, +}; use nym_compact_ecash::utils::check_bilinear_pairing; #[allow(unused)] fn double_pairing(g11: &G1Affine, g21: &G2Affine, g12: &G1Affine, g22: &G2Affine) { - let gt1 = bls12_381::pairing(g11, g21); - let gt2 = bls12_381::pairing(g12, g22); + let gt1 = nym_bls12_381_fork::pairing(g11, g21); + let gt2 = nym_bls12_381_fork::pairing(g12, g22); assert_eq!(gt1, gt2) } #[allow(unused)] fn single_pairing(g11: &G1Affine, g21: &G2Affine) { - let gt1 = bls12_381::pairing(g11, g21); + let gt1 = nym_bls12_381_fork::pairing(g11, g21); } #[allow(unused)] @@ -98,7 +98,7 @@ fn bench_group_operations(c: &mut Criterion) { let g22 = (g2 * r).to_affine(); let g22_prep = G2Prepared::from(g22); - let gt = bls12_381::pairing(&g11, &g21); + let gt = nym_bls12_381_fork::pairing(&g11, &g21); let gen1 = G1Projective::generator(); let gen2 = G2Projective::generator(); diff --git a/common/nym_offline_compact_ecash/src/common_types.rs b/common/nym_offline_compact_ecash/src/common_types.rs index bc450f97a4e..90ce4ac0f7a 100644 --- a/common/nym_offline_compact_ecash/src/common_types.rs +++ b/common/nym_offline_compact_ecash/src/common_types.rs @@ -7,7 +7,7 @@ use crate::helpers::{g1_tuple_to_bytes, recover_g1_tuple}; use serde::{Deserialize, Serialize}; use subtle::Choice; -pub use bls12_381::{G1Projective, G2Projective, Scalar}; +pub use nym_bls12_381_fork::{G1Projective, G2Projective, Scalar}; pub type SignerIndex = u64; #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)] diff --git a/common/nym_offline_compact_ecash/src/constants.rs b/common/nym_offline_compact_ecash/src/constants.rs index 0902c2fa0fc..b58762d9a86 100644 --- a/common/nym_offline_compact_ecash/src/constants.rs +++ b/common/nym_offline_compact_ecash/src/constants.rs @@ -1,7 +1,7 @@ // Copyright 2024 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use bls12_381::Scalar; +use nym_bls12_381_fork::Scalar; use nym_network_defaults::ecash::TICKETBOOK_VALIDITY_DAYS; use nym_network_defaults::TICKETBOOK_SIZE; diff --git a/common/nym_offline_compact_ecash/src/helpers.rs b/common/nym_offline_compact_ecash/src/helpers.rs index af741d5f341..856bb397e43 100644 --- a/common/nym_offline_compact_ecash/src/helpers.rs +++ b/common/nym_offline_compact_ecash/src/helpers.rs @@ -3,8 +3,8 @@ use crate::utils::try_deserialize_g1_projective; use crate::{CompactEcashError, EncodedDate, EncodedTicketType}; -use bls12_381::{G1Projective, Scalar}; use group::Curve; +use nym_bls12_381_fork::{G1Projective, Scalar}; use std::any::{type_name, Any}; pub(crate) fn g1_tuple_to_bytes(el: (G1Projective, G1Projective)) -> [u8; 96] { diff --git a/common/nym_offline_compact_ecash/src/lib.rs b/common/nym_offline_compact_ecash/src/lib.rs index 77e1ce5199b..46bb93ec9bc 100644 --- a/common/nym_offline_compact_ecash/src/lib.rs +++ b/common/nym_offline_compact_ecash/src/lib.rs @@ -6,14 +6,14 @@ #![warn(clippy::todo)] #![warn(clippy::dbg_macro)] -use bls12_381::Scalar; +use nym_bls12_381_fork::Scalar; use std::sync::OnceLock; pub use crate::error::CompactEcashError; pub use crate::traits::Bytable; -pub use bls12_381::G1Projective; pub use common_types::{BlindedSignature, Signature}; pub use helpers::{date_scalar, type_scalar}; +pub use nym_bls12_381_fork::G1Projective; pub use scheme::aggregation::aggregate_verification_keys; pub use scheme::aggregation::aggregate_wallets; pub use scheme::identify; diff --git a/common/nym_offline_compact_ecash/src/proofs/mod.rs b/common/nym_offline_compact_ecash/src/proofs/mod.rs index 5133c2bedd1..c1a19acc8c3 100644 --- a/common/nym_offline_compact_ecash/src/proofs/mod.rs +++ b/common/nym_offline_compact_ecash/src/proofs/mod.rs @@ -3,9 +3,9 @@ use std::borrow::Borrow; -use bls12_381::Scalar; use digest::generic_array::typenum::Unsigned; use digest::Digest; +use nym_bls12_381_fork::Scalar; use sha2::Sha256; pub mod proof_spend; diff --git a/common/nym_offline_compact_ecash/src/proofs/proof_spend.rs b/common/nym_offline_compact_ecash/src/proofs/proof_spend.rs index 966dd2211ce..6b81e50cb19 100644 --- a/common/nym_offline_compact_ecash/src/proofs/proof_spend.rs +++ b/common/nym_offline_compact_ecash/src/proofs/proof_spend.rs @@ -5,8 +5,8 @@ use crate::ecash_group_parameters; use crate::proofs::{compute_challenge, produce_response, produce_responses, ChallengeDigest}; use crate::scheme::keygen::VerificationKeyAuth; use crate::scheme::PayInfo; -use bls12_381::{G1Projective, G2Projective, Scalar}; use group::GroupEncoding; +use nym_bls12_381_fork::{G1Projective, G2Projective, Scalar}; use serde::{Deserialize, Serialize}; use zeroize::{Zeroize, ZeroizeOnDrop}; diff --git a/common/nym_offline_compact_ecash/src/proofs/proof_withdrawal.rs b/common/nym_offline_compact_ecash/src/proofs/proof_withdrawal.rs index b16b66d7ffe..0d8576e5d19 100644 --- a/common/nym_offline_compact_ecash/src/proofs/proof_withdrawal.rs +++ b/common/nym_offline_compact_ecash/src/proofs/proof_withdrawal.rs @@ -4,9 +4,9 @@ use crate::ecash_group_parameters; use crate::proofs::{compute_challenge, produce_response, produce_responses, ChallengeDigest}; use crate::scheme::keygen::PublicKeyUser; -use bls12_381::{G1Projective, Scalar}; use group::GroupEncoding; use itertools::izip; +use nym_bls12_381_fork::{G1Projective, Scalar}; use serde::{Deserialize, Serialize}; #[derive(Debug, Serialize, Deserialize)] diff --git a/common/nym_offline_compact_ecash/src/scheme/aggregation.rs b/common/nym_offline_compact_ecash/src/scheme/aggregation.rs index 148a619a41c..87131dcd33e 100644 --- a/common/nym_offline_compact_ecash/src/scheme/aggregation.rs +++ b/common/nym_offline_compact_ecash/src/scheme/aggregation.rs @@ -9,11 +9,11 @@ use crate::scheme::withdrawal::RequestInfo; use crate::scheme::{PartialWallet, Wallet, WalletSignatures}; use crate::utils::{check_bilinear_pairing, perform_lagrangian_interpolation_at_origin}; use crate::{ecash_group_parameters, Attribute}; -use bls12_381::{G2Prepared, G2Projective, Scalar}; use core::iter::Sum; use core::ops::Mul; use group::Curve; use itertools::Itertools; +use nym_bls12_381_fork::{G2Prepared, G2Projective, Scalar}; use zeroize::Zeroizing; pub(crate) trait Aggregatable: Sized { diff --git a/common/nym_offline_compact_ecash/src/scheme/coin_indices_signatures.rs b/common/nym_offline_compact_ecash/src/scheme/coin_indices_signatures.rs index c98047570e2..f140cc5f6ed 100644 --- a/common/nym_offline_compact_ecash/src/scheme/coin_indices_signatures.rs +++ b/common/nym_offline_compact_ecash/src/scheme/coin_indices_signatures.rs @@ -8,8 +8,8 @@ use crate::scheme::keygen::{SecretKeyAuth, VerificationKeyAuth}; use crate::scheme::setup::Parameters; use crate::utils::generate_lagrangian_coefficients_at_origin; use crate::utils::{batch_verify_signatures, hash_g1}; -use bls12_381::{G1Projective, Scalar}; use itertools::Itertools; +use nym_bls12_381_fork::{G1Projective, Scalar}; use serde::{Deserialize, Serialize}; use std::borrow::Borrow; diff --git a/common/nym_offline_compact_ecash/src/scheme/expiration_date_signatures.rs b/common/nym_offline_compact_ecash/src/scheme/expiration_date_signatures.rs index c475943b7bb..06a2395271b 100644 --- a/common/nym_offline_compact_ecash/src/scheme/expiration_date_signatures.rs +++ b/common/nym_offline_compact_ecash/src/scheme/expiration_date_signatures.rs @@ -8,8 +8,8 @@ use crate::scheme::keygen::{SecretKeyAuth, VerificationKeyAuth}; use crate::utils::generate_lagrangian_coefficients_at_origin; use crate::utils::{batch_verify_signatures, hash_g1}; use crate::{constants, EncodedDate}; -use bls12_381::{G1Projective, Scalar}; use itertools::Itertools; +use nym_bls12_381_fork::{G1Projective, Scalar}; use serde::{Deserialize, Serialize}; use std::borrow::Borrow; diff --git a/common/nym_offline_compact_ecash/src/scheme/keygen.rs b/common/nym_offline_compact_ecash/src/scheme/keygen.rs index 151de7c17a8..c771b6658f3 100644 --- a/common/nym_offline_compact_ecash/src/scheme/keygen.rs +++ b/common/nym_offline_compact_ecash/src/scheme/keygen.rs @@ -11,11 +11,11 @@ use crate::utils::{ try_deserialize_scalar_vec, }; use crate::{ecash_group_parameters, Base58}; -use bls12_381::{G1Projective, G2Projective, Scalar}; use core::borrow::Borrow; use core::iter::Sum; use core::ops::{Add, Mul}; use group::{Curve, GroupEncoding}; +use nym_bls12_381_fork::{G1Projective, G2Projective, Scalar}; use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair}; use serde::{Deserialize, Serialize}; use zeroize::{Zeroize, ZeroizeOnDrop}; diff --git a/common/nym_offline_compact_ecash/src/scheme/mod.rs b/common/nym_offline_compact_ecash/src/scheme/mod.rs index 7f9687a380a..8d830c1aaff 100644 --- a/common/nym_offline_compact_ecash/src/scheme/mod.rs +++ b/common/nym_offline_compact_ecash/src/scheme/mod.rs @@ -15,8 +15,8 @@ use crate::utils::{ }; use crate::{constants, ecash_group_parameters}; use crate::{Base58, EncodedDate, EncodedTicketType}; -use bls12_381::{G1Projective, G2Prepared, G2Projective, Scalar}; use group::Curve; +use nym_bls12_381_fork::{G1Projective, G2Prepared, G2Projective, Scalar}; use serde::{Deserialize, Deserializer, Serialize, Serializer}; use std::borrow::Borrow; use zeroize::{Zeroize, ZeroizeOnDrop}; diff --git a/common/nym_offline_compact_ecash/src/scheme/setup.rs b/common/nym_offline_compact_ecash/src/scheme/setup.rs index 349706fe47c..abbd7e1fbb6 100644 --- a/common/nym_offline_compact_ecash/src/scheme/setup.rs +++ b/common/nym_offline_compact_ecash/src/scheme/setup.rs @@ -3,9 +3,9 @@ use crate::ecash_group_parameters; use crate::utils::hash_g1; -use bls12_381::{G1Affine, G1Projective, G2Affine, G2Prepared, Scalar}; use ff::Field; use group::GroupEncoding; +use nym_bls12_381_fork::{G1Affine, G1Projective, G2Affine, G2Prepared, Scalar}; use rand::thread_rng; #[derive(Debug)] diff --git a/common/nym_offline_compact_ecash/src/scheme/withdrawal.rs b/common/nym_offline_compact_ecash/src/scheme/withdrawal.rs index af620f3159c..454ad6b613e 100644 --- a/common/nym_offline_compact_ecash/src/scheme/withdrawal.rs +++ b/common/nym_offline_compact_ecash/src/scheme/withdrawal.rs @@ -12,8 +12,8 @@ use crate::scheme::setup::GroupParameters; use crate::scheme::PartialWallet; use crate::utils::{check_bilinear_pairing, hash_g1}; use crate::{constants, ecash_group_parameters, Attribute, EncodedDate, EncodedTicketType}; -use bls12_381::{multi_miller_loop, G1Projective, G2Prepared, G2Projective, Scalar}; use group::{Curve, Group, GroupEncoding}; +use nym_bls12_381_fork::{multi_miller_loop, G1Projective, G2Prepared, G2Projective, Scalar}; use serde::{Deserialize, Serialize}; use std::ops::Neg; use zeroize::{Zeroize, ZeroizeOnDrop}; @@ -569,7 +569,7 @@ mod tests { use crate::common_types::BlindedSignature; use crate::ecash_group_parameters; use crate::scheme::keygen::{SecretKeyUser, VerificationKeyAuth}; - use bls12_381::G1Projective; + use nym_bls12_381_fork::G1Projective; #[test] fn test_generate_non_identity_h() { diff --git a/common/nym_offline_compact_ecash/src/traits.rs b/common/nym_offline_compact_ecash/src/traits.rs index a9a22144b97..5e3ff82bf2b 100644 --- a/common/nym_offline_compact_ecash/src/traits.rs +++ b/common/nym_offline_compact_ecash/src/traits.rs @@ -7,8 +7,8 @@ use crate::proofs::proof_withdrawal::{WithdrawalReqInstance, WithdrawalReqProof} use crate::scheme::withdrawal::RequestInfo; use crate::scheme::{Payment, WalletSignatures}; use crate::{Attribute, CompactEcashError, PartialWallet, WithdrawalRequest}; -use bls12_381::{G1Affine, G1Projective}; use group::GroupEncoding; +use nym_bls12_381_fork::{G1Affine, G1Projective}; #[macro_export] macro_rules! impl_byteable_bs58 { diff --git a/common/nym_offline_compact_ecash/src/utils.rs b/common/nym_offline_compact_ecash/src/utils.rs index 9042975dec4..1c262541a36 100644 --- a/common/nym_offline_compact_ecash/src/utils.rs +++ b/common/nym_offline_compact_ecash/src/utils.rs @@ -5,15 +5,15 @@ use crate::common_types::SignerIndex; use crate::error::{CompactEcashError, Result}; use crate::scheme::setup::GroupParameters; use crate::{ecash_group_parameters, Signature, VerificationKeyAuth}; -use bls12_381::hash_to_curve::{ExpandMsgXmd, HashToCurve, HashToField}; -use bls12_381::{ - multi_miller_loop, G1Affine, G1Projective, G2Affine, G2Prepared, G2Projective, Scalar, -}; use core::iter::Sum; use core::ops::Mul; use ff::Field; use group::{Curve, Group}; use itertools::Itertools; +use nym_bls12_381_fork::hash_to_curve::{ExpandMsgXmd, HashToCurve, HashToField}; +use nym_bls12_381_fork::{ + multi_miller_loop, G1Affine, G1Projective, G2Affine, G2Prepared, G2Projective, Scalar, +}; use std::borrow::Borrow; use std::ops::Neg; diff --git a/common/nymnoise/Cargo.toml b/common/nymnoise/Cargo.toml index 63050814ef7..64dd0470f5c 100644 --- a/common/nymnoise/Cargo.toml +++ b/common/nymnoise/Cargo.toml @@ -1,9 +1,13 @@ [package] name = "nym-noise" -version = "0.1.0" +version.workspace = true authors = ["Simon Wicky "] edition = "2021" license.workspace = true +description = "Nym's Noise protocol implementation" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true [dependencies] arc-swap = { workspace = true } @@ -20,15 +24,15 @@ tokio = { workspace = true, features = ["net", "io-util", "time"] } tokio-util = { workspace = true, features = ["codec"] } # internal -nym-crypto = { path = "../crypto" } -nym-noise-keys = { path = "keys" } +nym-crypto = { workspace = true } +nym-noise-keys = { workspace = true } [dev-dependencies] anyhow = { workspace = true } tokio = { workspace = true, features = ["full"] } rand_chacha = { workspace = true } -nym-crypto = { path = "../crypto", features = ["rand"] } -nym-test-utils = { path = "../test-utils" } +nym-crypto = { workspace = true, features = ["rand"] } +nym-test-utils = { workspace = true } [lints] diff --git a/common/nymnoise/keys/Cargo.toml b/common/nymnoise/keys/Cargo.toml index 94080a004b1..3dfc1c64d25 100644 --- a/common/nymnoise/keys/Cargo.toml +++ b/common/nymnoise/keys/Cargo.toml @@ -1,9 +1,13 @@ [package] name = "nym-noise-keys" -version = "0.1.0" +version.workspace = true authors = ["Simon Wicky "] edition = "2021" license.workspace = true +description = "Helpers and type definition of Nym's Noise protocol keys" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true [dependencies] schemars = { workspace = true, features = ["preserve_order"] } @@ -11,7 +15,7 @@ serde = { workspace = true, features = ["derive"] } utoipa = { workspace = true } # internal -nym-crypto = { path = "../../crypto", features = ["asymmetric", "serde"] } +nym-crypto = { workspace = true, features = ["asymmetric", "serde"] } [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/common/nymsphinx/Cargo.toml b/common/nymsphinx/Cargo.toml index d6b77f6969b..1fba34a0c21 100644 --- a/common/nymsphinx/Cargo.toml +++ b/common/nymsphinx/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx" -version = "0.1.0" +version.workspace = true description = "Top-level crate for sphinx packets as used by the Nym mixnet" edition = { workspace = true } authors = { workspace = true } @@ -14,32 +14,32 @@ rand_distr = { workspace = true } rand_chacha = { workspace = true } thiserror = { workspace = true } -nym-sphinx-acknowledgements = { path = "acknowledgements" } -nym-sphinx-addressing = { path = "addressing" } -nym-sphinx-anonymous-replies = { path = "anonymous-replies" } -nym-sphinx-chunking = { path = "chunking" } -nym-sphinx-cover = { path = "cover" } -nym-sphinx-forwarding = { path = "forwarding" } -nym-sphinx-params = { path = "params" } -nym-sphinx-routing = { path = "routing" } -nym-sphinx-types = { path = "types" } +nym-sphinx-acknowledgements = { workspace = true } +nym-sphinx-addressing = { workspace = true } +nym-sphinx-anonymous-replies = { workspace = true } +nym-sphinx-chunking = { workspace = true } +nym-sphinx-cover = { workspace = true } +nym-sphinx-forwarding = { workspace = true } +nym-sphinx-params = { workspace = true } +nym-sphinx-routing = { workspace = true } +nym-sphinx-types = { workspace = true } # those dependencies are due to intriducing preparer and receiver. Perpaphs that indicates they should be moved # to separate crate? -nym-crypto = { path = "../crypto", version = "0.4.0" } -nym-topology = { path = "../topology" } -nym-metrics = { path = "../nym-metrics" } +nym-crypto = { workspace = true } +nym-topology = { workspace = true } +nym-metrics = { workspace = true } [dev-dependencies] -nym-mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" } -nym-crypto = { path = "../crypto", version = "0.4.0", features = [ +nym-mixnet-contract-common = { workspace = true } +nym-crypto = { workspace = true, features = [ "asymmetric", ] } # do not include this when compiling into wasm as it somehow when combined together with reqwest, it will require # net2 via tokio-util -> tokio -> mio -> net2 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.nym-sphinx-framing] -path = "framing" +workspace = true [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio] workspace = true diff --git a/common/nymsphinx/acknowledgements/Cargo.toml b/common/nymsphinx/acknowledgements/Cargo.toml index 117bc6b7d51..6d0fe4fcff6 100644 --- a/common/nymsphinx/acknowledgements/Cargo.toml +++ b/common/nymsphinx/acknowledgements/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-acknowledgements" -version = "0.1.0" +version.workspace = true description = "Sphinx packet ack messages" edition = { workspace = true } authors = { workspace = true } @@ -14,13 +14,13 @@ generic-array = { workspace = true, optional = true, features = ["serde"] } thiserror = { workspace = true } zeroize = { workspace = true } -nym-crypto = { path = "../../crypto", features = ["stream_cipher", "rand"] } -nym-pemstore = { path = "../../pemstore" } -nym-sphinx-addressing = { path = "../addressing" } -nym-sphinx-params = { path = "../params" } -nym-sphinx-routing = { path = "../routing" } -nym-sphinx-types = { path = "../types", features = ["sphinx"] } -nym-topology = { path = "../../topology" } +nym-crypto = { workspace = true, features = ["stream_cipher", "rand"] } +nym-pemstore = { workspace = true } +nym-sphinx-addressing = { workspace = true } +nym-sphinx-params = { workspace = true } +nym-sphinx-routing = { workspace = true } +nym-sphinx-types = { workspace = true, features = ["sphinx"] } +nym-topology = { workspace = true } [features] serde = ["dep:serde", "generic-array"] diff --git a/common/nymsphinx/addressing/Cargo.toml b/common/nymsphinx/addressing/Cargo.toml index c7f756cb5c6..5aec9af3ed6 100644 --- a/common/nymsphinx/addressing/Cargo.toml +++ b/common/nymsphinx/addressing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-addressing" -version = "0.1.0" +version.workspace = true description = "Nym mixnet addressing" edition = { workspace = true } authors = { workspace = true } @@ -8,14 +8,14 @@ license = { workspace = true } repository = { workspace = true } [dependencies] -nym-crypto = { path = "../../crypto", features = ["asymmetric", "sphinx"] } # all addresses are expressed in terms on their crypto keys -nym-sphinx-types = { path = "../types", features = ["sphinx"] } # we need to be able to refer to some types defined inside sphinx crate +nym-crypto = { workspace = true, features = ["asymmetric", "sphinx"] } # all addresses are expressed in terms on their crypto keys +nym-sphinx-types = { workspace = true, features = ["sphinx"] } # we need to be able to refer to some types defined inside sphinx crate serde = { workspace = true } # implementing serialization/deserialization for some types, like `Recipient` thiserror = { workspace = true } [dev-dependencies] rand = { workspace = true } -nym-crypto = { path = "../../crypto", features = ["rand"] } +nym-crypto = { workspace = true, features = ["rand"] } bincode = { workspace = true } serde_json = { workspace = true } -serde = { workspace = true, features = ["derive"] } \ No newline at end of file +serde = { workspace = true, features = ["derive"] } diff --git a/common/nymsphinx/anonymous-replies/Cargo.toml b/common/nymsphinx/anonymous-replies/Cargo.toml index ef9c74b73da..fe9f272146a 100644 --- a/common/nymsphinx/anonymous-replies/Cargo.toml +++ b/common/nymsphinx/anonymous-replies/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-anonymous-replies" -version = "0.1.0" +version.workspace = true description = "Anonymous sphinx packet replies using singly-use-reply-blocks (SURB)" edition = { workspace = true } authors = { workspace = true } @@ -13,12 +13,12 @@ bs58 = { workspace = true } thiserror = { workspace = true } tracing = { workspace = true } -nym-crypto = { path = "../../crypto", features = ["stream_cipher", "rand"] } -nym-sphinx-addressing = { path = "../addressing" } -nym-sphinx-params = { path = "../params" } -nym-sphinx-routing = { path = "../routing" } -nym-sphinx-types = { path = "../types" } -nym-topology = { path = "../../topology" } +nym-crypto = { workspace = true, features = ["stream_cipher", "rand"] } +nym-sphinx-addressing = { workspace = true } +nym-sphinx-params = { workspace = true } +nym-sphinx-routing = { workspace = true } +nym-sphinx-types = { workspace = true } +nym-topology = { workspace = true } [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen] workspace = true diff --git a/common/nymsphinx/chunking/Cargo.toml b/common/nymsphinx/chunking/Cargo.toml index f5ea2408599..708ecb5c103 100644 --- a/common/nymsphinx/chunking/Cargo.toml +++ b/common/nymsphinx/chunking/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-chunking" -version = "0.1.0" +version.workspace = true description = "Sphinx packet chunking of underlying data packets" edition = { workspace = true } authors = { workspace = true } @@ -17,11 +17,11 @@ dashmap = { workspace = true, features = ["serde"] } serde = { workspace = true, features = ["derive"] } utoipa = { workspace = true } -nym-sphinx-addressing = { path = "../addressing" } -nym-sphinx-params = { path = "../params" } -nym-sphinx-types = { path = "../types" } -nym-metrics = { path = "../../nym-metrics" } -nym-crypto = { path = "../../crypto", version = "0.4.0", features = [ +nym-sphinx-addressing = { workspace = true } +nym-sphinx-params = { workspace = true } +nym-sphinx-types = { workspace = true } +nym-metrics = { workspace = true } +nym-crypto = { workspace = true, features = [ "asymmetric", ] } diff --git a/common/nymsphinx/cover/Cargo.toml b/common/nymsphinx/cover/Cargo.toml index 59710923d17..69dcf6fe65f 100644 --- a/common/nymsphinx/cover/Cargo.toml +++ b/common/nymsphinx/cover/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-cover" -version = "0.1.0" +version.workspace = true description = "Sphinx packets used as cover traffic" edition = { workspace = true } authors = { workspace = true } @@ -11,12 +11,12 @@ repository = { workspace = true } rand = { workspace = true } thiserror = { workspace = true } -nym-crypto = { path = "../../crypto" } -nym-sphinx-acknowledgements = { path = "../acknowledgements" } -nym-sphinx-addressing = { path = "../addressing" } -nym-sphinx-chunking = { path = "../chunking" } -nym-sphinx-forwarding = { path = "../forwarding" } -nym-sphinx-params = { path = "../params" } -nym-sphinx-routing = { path = "../routing" } -nym-sphinx-types = { path = "../types" } -nym-topology = { path = "../../topology" } +nym-crypto = { workspace = true } +nym-sphinx-acknowledgements = { workspace = true } +nym-sphinx-addressing = { workspace = true } +nym-sphinx-chunking = { workspace = true } +nym-sphinx-forwarding = { workspace = true } +nym-sphinx-params = { workspace = true } +nym-sphinx-routing = { workspace = true } +nym-sphinx-types = { workspace = true } +nym-topology = { workspace = true } diff --git a/common/nymsphinx/forwarding/Cargo.toml b/common/nymsphinx/forwarding/Cargo.toml index c8beb33b12f..e9a299c6261 100644 --- a/common/nymsphinx/forwarding/Cargo.toml +++ b/common/nymsphinx/forwarding/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-forwarding" -version = "0.1.0" +version.workspace = true description = "Sphinx packet forwarding as Nym mix packets" edition = { workspace = true } authors = { workspace = true } @@ -8,8 +8,8 @@ license = { workspace = true } repository = { workspace = true } [dependencies] -nym-sphinx-addressing = { path = "../addressing" } -nym-sphinx-params = { path = "../params" } -nym-sphinx-types = { path = "../types", features = ["sphinx", "outfox"] } -nym-sphinx-anonymous-replies = { path = "../anonymous-replies" } +nym-sphinx-addressing = { workspace = true } +nym-sphinx-params = { workspace = true } +nym-sphinx-types = { workspace = true, features = ["sphinx", "outfox"] } +nym-sphinx-anonymous-replies = { workspace = true } thiserror = { workspace = true } diff --git a/common/nymsphinx/framing/Cargo.toml b/common/nymsphinx/framing/Cargo.toml index dc9447aebd2..6b67d2c5315 100644 --- a/common/nymsphinx/framing/Cargo.toml +++ b/common/nymsphinx/framing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-framing" -version = "0.1.0" +version.workspace = true description = "Sphinx packet framing for the Nym mixnet" edition = { workspace = true } authors = { workspace = true } @@ -13,11 +13,11 @@ tokio-util = { workspace = true, features = ["codec"] } thiserror = { workspace = true } tracing = { workspace = true } -nym-sphinx-types = { path = "../types", features = ["sphinx", "outfox"] } -nym-sphinx-params = { path = "../params", features = ["sphinx", "outfox"] } -nym-sphinx-forwarding = { path = "../forwarding" } -nym-sphinx-addressing = { path = "../addressing" } -nym-sphinx-acknowledgements = { path = "../acknowledgements" } +nym-sphinx-types = { workspace = true, features = ["sphinx", "outfox"] } +nym-sphinx-params = { workspace = true, features = ["sphinx", "outfox"] } +nym-sphinx-forwarding = { workspace = true } +nym-sphinx-addressing = { workspace = true } +nym-sphinx-acknowledgements = { workspace = true } [dev-dependencies] tokio = { workspace = true, features = ["full"] } diff --git a/common/nymsphinx/params/Cargo.toml b/common/nymsphinx/params/Cargo.toml index 8db26e7b1d5..c5fd617d639 100644 --- a/common/nymsphinx/params/Cargo.toml +++ b/common/nymsphinx/params/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-params" -version = "0.1.0" +version.workspace = true description = "Sphinx packet parameters for the Nym mixnet" edition = { workspace = true } authors = { workspace = true } @@ -11,8 +11,8 @@ repository = { workspace = true } thiserror = { workspace = true } serde = { workspace = true, features = ["derive"] } -nym-crypto = { path = "../../crypto", features = ["hashing", "stream_cipher", "aead"] } -nym-sphinx-types = { path = "../types" } +nym-crypto = { workspace = true, features = ["hashing", "stream_cipher", "aead"] } +nym-sphinx-types = { workspace = true } [features] default = ["sphinx"] diff --git a/common/nymsphinx/routing/Cargo.toml b/common/nymsphinx/routing/Cargo.toml index 37b8d5a4dc2..209c9baefb4 100644 --- a/common/nymsphinx/routing/Cargo.toml +++ b/common/nymsphinx/routing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-routing" -version = "0.1.0" +version.workspace = true description = "Sphinx packet routing as Nym mix packets" edition = { workspace = true } authors = { workspace = true } @@ -10,7 +10,7 @@ repository = { workspace = true } [dependencies] thiserror = { workspace = true } -nym-sphinx-addressing = { path = "../addressing" } -nym-sphinx-types = { path = "../types", features = ["sphinx"] } +nym-sphinx-addressing = { workspace = true } +nym-sphinx-types = { workspace = true, features = ["sphinx"] } -[features] \ No newline at end of file +[features] diff --git a/common/nymsphinx/types/Cargo.toml b/common/nymsphinx/types/Cargo.toml index b12d22d7f6a..776f88a41ae 100644 --- a/common/nymsphinx/types/Cargo.toml +++ b/common/nymsphinx/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-types" -version = "0.2.0" +version.workspace = true description = "Re-export sphinx packet types" edition = { workspace = true } authors = { workspace = true } @@ -9,7 +9,7 @@ repository = { workspace = true } [dependencies] sphinx-packet = { workspace = true, optional = true } -nym-outfox = { path = "../../../nym-outfox", optional = true } +nym-outfox = { workspace = true, optional = true } thiserror = { workspace = true } [features] diff --git a/common/nyxd-scraper-psql/Cargo.toml b/common/nyxd-scraper-psql/Cargo.toml index 0c2253cf9ba..c99249f0cdd 100644 --- a/common/nyxd-scraper-psql/Cargo.toml +++ b/common/nyxd-scraper-psql/Cargo.toml @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +publish = false [dependencies] async-trait = { workspace = true } @@ -21,7 +22,7 @@ thiserror = { workspace = true } tokio = { workspace = true, features = ["full"] } tracing.workspace = true -nyxd-scraper-shared = { path = "../nyxd-scraper-shared" } +nyxd-scraper-shared = { workspace = true } # temp due to cosmrs redefinitions for serde cosmrs = { workspace = true } diff --git a/common/nyxd-scraper-shared/Cargo.toml b/common/nyxd-scraper-shared/Cargo.toml index 3f7a343ec23..299d2a6186d 100644 --- a/common/nyxd-scraper-shared/Cargo.toml +++ b/common/nyxd-scraper-shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nyxd-scraper-shared" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +description = "Common crate for the sqlite and psql Nyxd blockchain scrapers" [dependencies] async-trait.workspace = true diff --git a/common/nyxd-scraper-sqlite/Cargo.toml b/common/nyxd-scraper-sqlite/Cargo.toml index eb10336f0bb..bcf59ce2cfb 100644 --- a/common/nyxd-scraper-sqlite/Cargo.toml +++ b/common/nyxd-scraper-sqlite/Cargo.toml @@ -7,6 +7,7 @@ homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -17,7 +18,7 @@ thiserror = { workspace = true } tokio = { workspace = true, features = ["full"] } tracing.workspace = true -nyxd-scraper-shared = { path = "../nyxd-scraper-shared" } +nyxd-scraper-shared = { workspace = true } [build-dependencies] @@ -26,4 +27,4 @@ tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } anyhow.workspace = true [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/common/pemstore/Cargo.toml b/common/pemstore/Cargo.toml index 9c93dc122d6..5534b81dd04 100644 --- a/common/pemstore/Cargo.toml +++ b/common/pemstore/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "nym-pemstore" description = "Store private-public keypairs in PEM format" -version = "0.3.0" +version.workspace = true edition = { workspace = true } authors = { workspace = true } license = { workspace = true } @@ -10,4 +10,4 @@ repository = { workspace = true } [dependencies] pem = { workspace = true } tracing = { workspace = true } -zeroize = { workspace = true } \ No newline at end of file +zeroize = { workspace = true } diff --git a/common/published-crates.txt b/common/published-crates.txt deleted file mode 100644 index 5aee0f41d82..00000000000 --- a/common/published-crates.txt +++ /dev/null @@ -1,8 +0,0 @@ -# List of published common crates -nym-bin-common -nym-contracts-common -nym-crypto -nym-mixnet-contract-common -nym-pemstore -nym-sphinx-types -nym-vesting-contract-common diff --git a/common/registration/Cargo.toml b/common/registration/Cargo.toml index 9133bad4de1..71a5ae1b6d0 100644 --- a/common/registration/Cargo.toml +++ b/common/registration/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-registration-common" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Struct definitions for NymNode, GatewayData, and AssignedAddresses" [lints] workspace = true @@ -15,7 +16,7 @@ workspace = true tokio-util.workspace = true serde.workspace = true -nym-authenticator-requests = { path = "../authenticator-requests" } -nym-crypto = { path = "../crypto" } -nym-ip-packet-requests = { path = "../ip-packet-requests" } -nym-sphinx = { path = "../nymsphinx" } +nym-authenticator-requests = { workspace = true } +nym-crypto = { workspace = true } +nym-ip-packet-requests = { workspace = true } +nym-sphinx = { workspace = true } diff --git a/common/serde-helpers/Cargo.toml b/common/serde-helpers/Cargo.toml index bc9de1862e3..9b219e23cb9 100644 --- a/common/serde-helpers/Cargo.toml +++ b/common/serde-helpers/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-serde-helpers" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Serde helpers for hex/base64/base58/datetime" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -22,4 +23,4 @@ time = { workspace = true, features = ["formatting", "parsing"], optional = true hex = ["dep:hex"] bs58 = ["dep:bs58"] base64 = ["dep:base64"] -date = ["time"] \ No newline at end of file +date = ["time"] diff --git a/common/service-provider-requests-common/Cargo.toml b/common/service-provider-requests-common/Cargo.toml index 63aef2eb76d..b289a776b73 100644 --- a/common/service-provider-requests-common/Cargo.toml +++ b/common/service-provider-requests-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-service-provider-requests-common" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +description = "Common crate for requests and responses for Nym Service Providers" [dependencies] serde = { workspace = true, features = ["derive"] } diff --git a/common/socks5-client-core/Cargo.toml b/common/socks5-client-core/Cargo.toml index ce8421f3d73..f86c6cf6867 100644 --- a/common/socks5-client-core/Cargo.toml +++ b/common/socks5-client-core/Cargo.toml @@ -1,8 +1,12 @@ [package] name = "nym-socks5-client-core" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true +description = "Core functionality of the Nym SOCKS client" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -21,19 +25,19 @@ thiserror = { workspace = true } tokio = { workspace = true, features = ["rt-multi-thread", "net", "signal"] } url = { workspace = true } -nym-bandwidth-controller = { path = "../../common/bandwidth-controller" } -nym-client-core = { path = "../client-core", features = ["fs-credentials-storage", "fs-surb-storage", "fs-gateways-storage"] } -nym-config = { path = "../config" } -nym-contracts-common = { path = "../cosmwasm-smart-contracts/contracts-common" } -nym-credential-storage = { path = "../credential-storage" } -nym-mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" } -nym-network-defaults = { path = "../network-defaults" } -nym-service-providers-common = { path = "../../service-providers/common" } -nym-socks5-proxy-helpers = { path = "../socks5/proxy-helpers" } -nym-socks5-requests = { path = "../socks5/requests" } -nym-sphinx = { path = "../nymsphinx" } -nym-task = { path = "../task" } -nym-validator-client = { path = "../client-libs/validator-client" } +nym-bandwidth-controller = { workspace = true } +nym-client-core = { workspace = true, features = ["fs-credentials-storage", "fs-surb-storage", "fs-gateways-storage"] } +nym-config = { workspace = true } +nym-contracts-common = { workspace = true } +nym-credential-storage = { workspace = true } +nym-mixnet-contract-common = { workspace = true } +nym-network-defaults = { workspace = true } +nym-service-providers-common = { workspace = true } +nym-socks5-proxy-helpers = { workspace = true } +nym-socks5-requests = { workspace = true } +nym-sphinx = { workspace = true } +nym-task = { workspace = true } +nym-validator-client = { workspace = true } [features] default = [] diff --git a/common/socks5/ordered-buffer/Cargo.toml b/common/socks5/ordered-buffer/Cargo.toml index f8d684cd1f7..572f2c0d59c 100644 --- a/common/socks5/ordered-buffer/Cargo.toml +++ b/common/socks5/ordered-buffer/Cargo.toml @@ -1,9 +1,13 @@ [package] name = "nym-ordered-buffer" -version = "0.1.0" +version.workspace = true authors = ["Dave Hrycyszyn "] edition = "2021" license.workspace = true +description = "This crate takes care of reliably and speedily turning bytes into a series of ordered message fragments on one side, and of reliably reassembling the fragments into the original message on the other" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/socks5/proxy-helpers/Cargo.toml b/common/socks5/proxy-helpers/Cargo.toml index da1d98e254f..9b74fd005df 100644 --- a/common/socks5/proxy-helpers/Cargo.toml +++ b/common/socks5/proxy-helpers/Cargo.toml @@ -1,9 +1,13 @@ [package] name = "nym-socks5-proxy-helpers" -version = "0.1.0" +version.workspace = true authors = ["Jedrzej Stuczynski "] edition = "2021" license.workspace = true +description = "Helpers for the Nym SOCKS client" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -17,9 +21,9 @@ futures = { workspace = true } log = { workspace = true } # internal -nym-ordered-buffer = { path = "../ordered-buffer" } -nym-socks5-requests = { path = "../requests" } -nym-task = { path = "../../task" } +nym-ordered-buffer = { workspace = true } +nym-socks5-requests = { workspace = true } +nym-task = { workspace = true } [dev-dependencies] tokio-test = { workspace = true } diff --git a/common/socks5/requests/Cargo.toml b/common/socks5/requests/Cargo.toml index be8ec4f8cae..1197c4beb3e 100644 --- a/common/socks5/requests/Cargo.toml +++ b/common/socks5/requests/Cargo.toml @@ -1,18 +1,22 @@ [package] name = "nym-socks5-requests" -version = "0.1.0" +version.workspace = true authors = ["Dave Hrycyszyn "] edition = "2021" license.workspace = true +description = "Request and response definitions for the Nym SOCKS client" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] bincode = { workspace = true } log = { workspace = true } -nym-exit-policy = { path = "../../../common/exit-policy"} -nym-service-providers-common = { path = "../../../service-providers/common" } -nym-sphinx-addressing = { path = "../../../common/nymsphinx/addressing" } +nym-exit-policy = { workspace = true} +nym-service-providers-common = { workspace = true } +nym-sphinx-addressing = { workspace = true } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } tap = { workspace = true } diff --git a/common/statistics/Cargo.toml b/common/statistics/Cargo.toml index b0f122646c8..c086bd83740 100644 --- a/common/statistics/Cargo.toml +++ b/common/statistics/Cargo.toml @@ -3,9 +3,13 @@ [package] name = "nym-statistics-common" -version = "0.1.0" +version.workspace = true edition.workspace = true license.workspace = true +description = "This crate contains basic statistics utilities and abstractions to be re-used and applied throughout both the client and gateway implementations" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -23,11 +27,11 @@ si-scale = { workspace = true } strum = { workspace = true } strum_macros = { workspace = true } -nym-crypto = { path = "../crypto" } -nym-sphinx = { path = "../nymsphinx" } -nym-credentials-interface = { path = "../credentials-interface" } -nym-metrics = { path = "../nym-metrics" } -nym-task = { path = "../task" } +nym-crypto = { workspace = true } +nym-sphinx = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-metrics = { workspace = true } +nym-task = { workspace = true } utoipa = { workspace = true, optional = true } diff --git a/common/store-cipher/Cargo.toml b/common/store-cipher/Cargo.toml index ca0a6286350..124d5b18693 100644 --- a/common/store-cipher/Cargo.toml +++ b/common/store-cipher/Cargo.toml @@ -1,8 +1,12 @@ [package] name = "nym-store-cipher" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true +description = "Helpers for various ciphers used throughout the Nym network" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/task/Cargo.toml b/common/task/Cargo.toml index d96fcbe0686..0daef2c7636 100644 --- a/common/task/Cargo.toml +++ b/common/task/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-task" -version = "0.1.0" +version.workspace = true description = "Task handling" edition.workspace = true authors.workspace = true @@ -36,7 +36,7 @@ tokio-tracing = ["tokio/tracing"] [dev-dependencies] anyhow = { workspace = true } tokio = { workspace = true, features = ["rt-multi-thread", "net", "signal", "test-util", "macros"] } -nym-test-utils = { path = "../test-utils" } +nym-test-utils = { workspace = true } [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/common/test-utils/Cargo.toml b/common/test-utils/Cargo.toml index 8c937797022..9a8602f9626 100644 --- a/common/test-utils/Cargo.toml +++ b/common/test-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-test-utils" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +description = "Helpers, traits, and mock definitions for tests" [dependencies] anyhow = { workspace = true } diff --git a/common/ticketbooks-merkle/Cargo.toml b/common/ticketbooks-merkle/Cargo.toml index 3c3f278c6bf..037852a91d1 100644 --- a/common/ticketbooks-merkle/Cargo.toml +++ b/common/ticketbooks-merkle/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-ticketbooks-merkle" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +description = "Generate and verify merkleproofs of zknym ticketbooks" [dependencies] sha2 = { workspace = true } @@ -18,8 +19,8 @@ utoipa = { workspace = true } serde = { workspace = true, features = ["derive"] } time = { workspace = true } -nym-credentials-interface = { path = "../credentials-interface" } -nym-serde-helpers = { path = "../serde-helpers", features = ["date", "base64", "hex"] } +nym-credentials-interface = { workspace = true } +nym-serde-helpers = { workspace = true, features = ["date", "base64", "hex"] } [dev-dependencies] rand_chacha = { workspace = true } diff --git a/common/topology/Cargo.toml b/common/topology/Cargo.toml index 64d60171f4b..da51f63bbda 100644 --- a/common/topology/Cargo.toml +++ b/common/topology/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-topology" -version = "0.1.0" +version.workspace = true edition = { workspace = true } authors = { workspace = true } license = { workspace = true } repository = { workspace = true } homepage = { workspace = true } documentation = { workspace = true } +description = "Nym's topology crate" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -27,25 +28,25 @@ tsify = { workspace = true, features = ["js"], optional = true } wasm-bindgen = { workspace = true, optional = true } ## internal -nym-crypto = { path = "../crypto" } -nym-mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" } -nym-sphinx-addressing = { path = "../nymsphinx/addressing" } -nym-sphinx-types = { path = "../nymsphinx/types", features = [ +nym-crypto = { workspace = true } +nym-mixnet-contract-common = { workspace = true } +nym-sphinx-addressing = { workspace = true } +nym-sphinx-types = { workspace = true, features = [ "sphinx", "outfox", ] } # I'm not sure how to feel about pulling in this dependency here... -nym-api-requests = { path = "../../nym-api/nym-api-requests" } +nym-api-requests = { workspace = true } # 'wasm-serde-types' feature -wasm-utils = { path = "../wasm/utils", default-features = false, optional = true } +nym-wasm-utils = { workspace = true, optional = true } [features] default = ["provider-trait"] provider-trait = ["async-trait"] -wasm-serde-types = ["tsify", "wasm-bindgen", "wasm-utils"] +wasm-serde-types = ["tsify", "wasm-bindgen", "nym-wasm-utils"] persistence = ["serde_json"] outfox = [] diff --git a/common/topology/src/wasm_helpers.rs b/common/topology/src/wasm_helpers.rs index 1abf88272b7..8d07cbcce0f 100644 --- a/common/topology/src/wasm_helpers.rs +++ b/common/topology/src/wasm_helpers.rs @@ -6,13 +6,13 @@ use crate::node::{EntryDetails, RoutingNode, RoutingNodeError, SupportedRoles}; use crate::{CachedEpochRewardedSet, NymTopology, NymTopologyMetadata}; +use nym_wasm_utils::error::simple_js_error; use serde::{Deserialize, Serialize}; use std::collections::HashMap; use std::net::SocketAddr; use thiserror::Error; use tsify::Tsify; use wasm_bindgen::{JsValue, prelude::wasm_bindgen}; -use wasm_utils::error::simple_js_error; #[derive(Debug, Error)] pub enum SerializableTopologyError { diff --git a/common/tun/Cargo.toml b/common/tun/Cargo.toml index 3915e481e3f..e5451f0f819 100644 --- a/common/tun/Cargo.toml +++ b/common/tun/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-tun" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Nym's tun implementation" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -15,7 +16,7 @@ thiserror.workspace = true tokio = { workspace = true, features = ["rt-multi-thread", "net", "io-util", "time", "sync", "macros"] } etherparse = { workspace = true } log.workspace = true -nym-wireguard-types = { path = "../wireguard-types", optional = true } +nym-wireguard-types = { workspace = true, optional = true } [target.'cfg(target_os = "linux")'.dependencies] tokio-tun.workspace = true diff --git a/common/types/Cargo.toml b/common/types/Cargo.toml index 620ec264d14..2f6ae032b47 100644 --- a/common/types/Cargo.toml +++ b/common/types/Cargo.toml @@ -1,11 +1,14 @@ [package] name = "nym-types" -version = "1.0.0" +version.workspace = true description = "Nym common types" authors.workspace = true edition = "2021" rust-version.workspace = true license.workspace = true +repository.workspace = true +homepage.workspace = true +documentation.workspace = true [dependencies] base64 = { workspace = true } @@ -29,11 +32,11 @@ x25519-dalek = { workspace = true, features = ["static_secrets"] } cosmwasm-std = { workspace = true } cosmrs = { workspace = true } -nym-validator-client = { path = "../../common/client-libs/validator-client" } -nym-mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract" } -nym-vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract" } -nym-config = { path = "../../common/config" } -nym-crypto = { path = "../../common/crypto", features = ["asymmetric"] } +nym-validator-client = { workspace = true } +nym-mixnet-contract-common = { workspace = true } +nym-vesting-contract-common = { workspace = true } +nym-config = { workspace = true } +nym-crypto = { workspace = true, features = ["asymmetric"] } [dev-dependencies] tempfile = { workspace = true } diff --git a/common/upgrade-mode-check/Cargo.toml b/common/upgrade-mode-check/Cargo.toml index 17f292a5669..8078ede9a43 100644 --- a/common/upgrade-mode-check/Cargo.toml +++ b/common/upgrade-mode-check/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-upgrade-mode-check" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +description = "Functions and tests for checking Nym's Credential Proxy is being properly upgraded" [dependencies] jwt-simple = { workspace = true } @@ -20,14 +21,14 @@ thiserror = { workspace = true } tracing = { workspace = true } utoipa = { workspace = true, optional = true } -nym-http-api-client = { path = "../http-api-client", default-features = false } -nym-crypto = { path = "../crypto", features = ["asymmetric", "serde", "naive_jwt"] } +nym-http-api-client = { workspace = true } +nym-crypto = { workspace = true, features = ["asymmetric", "serde", "naive_jwt"] } [dev-dependencies] anyhow = { workspace = true } time = { workspace = true, features = ["macros"] } -nym-test-utils = { path = "../test-utils" } -nym-crypto = { path = "../crypto", features = ["rand"] } +nym-test-utils = { workspace = true } +nym-crypto = { workspace = true, features = ["rand"] } [features] diff --git a/common/verloc/Cargo.toml b/common/verloc/Cargo.toml index 32b81ed1d66..fa218f9aeec 100644 --- a/common/verloc/Cargo.toml +++ b/common/verloc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-verloc" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +description = "Nym's verloc (Verifiable Location) implementation" [dependencies] bytes = { workspace = true } @@ -22,8 +23,8 @@ thiserror = { workspace = true } rand = { workspace = true } url = { workspace = true } -nym-crypto = { path = "../crypto", features = ["asymmetric"] } -nym-task = { path = "../task" } -nym-validator-client = { path = "../client-libs/validator-client" } -nym-http-api-client = { path = "../http-api-client" } -nym-api-requests = { path = "../../nym-api/nym-api-requests" } +nym-crypto = { workspace = true, features = ["asymmetric"] } +nym-task = { workspace = true } +nym-validator-client = { workspace = true } +nym-http-api-client = { workspace = true } +nym-api-requests = { workspace = true } diff --git a/common/wasm/client-core/Cargo.toml b/common/wasm/client-core/Cargo.toml index 85668972f96..f7811e6f848 100644 --- a/common/wasm/client-core/Cargo.toml +++ b/common/wasm/client-core/Cargo.toml @@ -1,10 +1,11 @@ [package] -name = "wasm-client-core" +name = "nym-wasm-client-core" authors = ["Jedrzej Stuczynski "] -version = "0.1.0" +version.workspace = true edition = "2021" license = "Apache-2.0" repository = "https://github.com/nymtech/nym" +description = "Crate containing core WASM client functionality and configs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -22,21 +23,21 @@ wasm-bindgen = { workspace = true } wasm-bindgen-futures = { workspace = true } zeroize = { workspace = true } -nym-bandwidth-controller = { path = "../../bandwidth-controller" } -nym-client-core = { path = "../../client-core", default-features = false, features = ["wasm"] } -nym-config = { path = "../../config" } -nym-credential-storage = { path = "../../credential-storage" } -nym-crypto = { path = "../../crypto", features = ["asymmetric", "serde"] } -nym-gateway-client = { path = "../../client-libs/gateway-client", default-features = false, features = ["wasm"] } -nym-sphinx = { path = "../../nymsphinx" } -nym-sphinx-acknowledgements = { path = "../../nymsphinx/acknowledgements", features = ["serde"] } -nym-statistics-common = { path = "../../statistics" } -nym-task = { path = "../../task" } -nym-topology = { path = "../../topology", features = ["wasm-serde-types"] } -nym-validator-client = { path = "../../client-libs/validator-client", default-features = false } -nym-http-api-client = { path = "../../http-api-client" } -wasm-utils = { path = "../utils" } -wasm-storage = { path = "../storage" } +nym-bandwidth-controller = { workspace = true } +nym-client-core = { workspace = true, default-features = false, features = ["wasm"] } +nym-config = { workspace = true } +nym-credential-storage = { workspace = true } +nym-crypto = { workspace = true, features = ["asymmetric", "serde"] } +nym-gateway-client = { workspace = true, default-features = false, features = ["wasm"] } +nym-sphinx = { workspace = true } +nym-sphinx-acknowledgements = { workspace = true, features = ["serde"] } +nym-statistics-common = { workspace = true } +nym-task = { workspace = true } +nym-topology = { workspace = true, features = ["wasm-serde-types"] } +nym-validator-client = { workspace = true, default-features = false } +nym-http-api-client = { workspace = true } +nym-wasm-utils = { workspace = true } +nym-wasm-storage = { workspace = true } # The `console_error_panic_hook` crate provides better debugging of panics by diff --git a/common/wasm/client-core/src/error.rs b/common/wasm/client-core/src/error.rs index ab41b190dde..6c93b1846aa 100644 --- a/common/wasm/client-core/src/error.rs +++ b/common/wasm/client-core/src/error.rs @@ -11,8 +11,8 @@ use nym_sphinx::addressing::clients::RecipientFormattingError; use nym_sphinx::anonymous_replies::requests::InvalidAnonymousSenderTagRepresentation; use nym_topology::NymTopologyError; use nym_validator_client::ValidatorClientError; +use nym_wasm_utils::wasm_error; use thiserror::Error; -use wasm_utils::wasm_error; #[derive(Debug, Error)] pub enum WasmCoreError { @@ -85,7 +85,7 @@ pub enum WasmCoreError { #[error(transparent)] BaseStorageError { #[from] - source: wasm_storage::error::StorageError, + source: nym_wasm_storage::error::StorageError, }, #[error(transparent)] diff --git a/common/wasm/client-core/src/helpers.rs b/common/wasm/client-core/src/helpers.rs index 8d7c4dc6e4d..2b69630cf7f 100644 --- a/common/wasm/client-core/src/helpers.rs +++ b/common/wasm/client-core/src/helpers.rs @@ -22,15 +22,15 @@ use nym_topology::wasm_helpers::WasmFriendlyNymTopology; use nym_topology::{EpochRewardedSet, NymTopology, RoutingNode}; use nym_validator_client::client::IdentityKey; use nym_validator_client::{nym_api::NymApiClientExt, UserAgent}; +use nym_wasm_utils::error::PromisableResult; use rand::thread_rng; use url::Url; use wasm_bindgen::prelude::wasm_bindgen; use wasm_bindgen_futures::future_to_promise; -use wasm_utils::error::PromisableResult; pub use nym_credential_storage::ephemeral_storage::EphemeralStorage as EphemeralCredentialStorage; use nym_topology::provider_trait::ToTopologyMetadata; -use wasm_utils::{console_log, console_warn}; +use nym_wasm_utils::{console_log, console_warn}; // don't get too excited about the name, under the hood it's just a big fat placeholder // with no disk_persistence diff --git a/common/wasm/client-core/src/lib.rs b/common/wasm/client-core/src/lib.rs index 761df16ae43..90c70febfd4 100644 --- a/common/wasm/client-core/src/lib.rs +++ b/common/wasm/client-core/src/lib.rs @@ -35,4 +35,4 @@ pub use nym_validator_client::{DirectSigningReqwestRpcNyxdClient, QueryReqwestRp pub use nym_validator_client::client::IdentityKey; #[cfg(target_arch = "wasm32")] -pub use wasm_utils::set_panic_hook; +pub use nym_wasm_utils::set_panic_hook; diff --git a/common/wasm/client-core/src/storage/core_client_traits.rs b/common/wasm/client-core/src/storage/core_client_traits.rs index 9e1e4098916..7526b28eaba 100644 --- a/common/wasm/client-core/src/storage/core_client_traits.rs +++ b/common/wasm/client-core/src/storage/core_client_traits.rs @@ -18,7 +18,7 @@ use nym_client_core::client::key_manager::ClientKeys; use nym_client_core::client::replies::reply_storage::browser_backend; use nym_credential_storage::ephemeral_storage::EphemeralStorage as EphemeralCredentialStorage; use nym_crypto::asymmetric::ed25519; -use wasm_utils::console_log; +use nym_wasm_utils::console_log; // temporary until other variants are properly implemented (probably it should get changed into `ClientStorage` // implementing all traits and everything getting combined diff --git a/common/wasm/client-core/src/storage/mod.rs b/common/wasm/client-core/src/storage/mod.rs index b129ab331bf..08c988adefd 100644 --- a/common/wasm/client-core/src/storage/mod.rs +++ b/common/wasm/client-core/src/storage/mod.rs @@ -5,15 +5,15 @@ use crate::error::WasmCoreError; use crate::storage::wasm_client_traits::{v1, v2, WasmClientStorage}; use async_trait::async_trait; use js_sys::Promise; +use nym_wasm_storage::traits::BaseWasmStorage; +use nym_wasm_storage::{ + Build, Database, RawDbResult, TryFromJs, TryToJs, VersionChangeEvent, WasmStorage, +}; +use nym_wasm_utils::error::{simple_js_error, PromisableResult}; use serde::de::DeserializeOwned; use serde::Serialize; use wasm_bindgen::prelude::*; use wasm_bindgen_futures::future_to_promise; -use wasm_storage::traits::BaseWasmStorage; -use wasm_storage::{ - Build, Database, RawDbResult, TryFromJs, TryToJs, VersionChangeEvent, WasmStorage, -}; -use wasm_utils::error::{simple_js_error, PromisableResult}; use zeroize::Zeroizing; pub mod core_client_traits; diff --git a/common/wasm/client-core/src/storage/wasm_client_traits.rs b/common/wasm/client-core/src/storage/wasm_client_traits.rs index 916d22cd1db..eb6d791b39c 100644 --- a/common/wasm/client-core/src/storage/wasm_client_traits.rs +++ b/common/wasm/client-core/src/storage/wasm_client_traits.rs @@ -6,10 +6,10 @@ use async_trait::async_trait; use nym_client_core::client::base_client::storage::gateways_storage::RawActiveGateway; use nym_crypto::asymmetric::{ed25519, x25519}; use nym_sphinx_acknowledgements::AckKey; +use nym_wasm_storage::traits::BaseWasmStorage; use std::error::Error; use thiserror::Error; use wasm_bindgen::JsValue; -use wasm_storage::traits::BaseWasmStorage; // v1 tables pub(crate) mod v1 { diff --git a/common/wasm/storage/Cargo.toml b/common/wasm/storage/Cargo.toml index 71364c0c57c..884a7b89b61 100644 --- a/common/wasm/storage/Cargo.toml +++ b/common/wasm/storage/Cargo.toml @@ -1,9 +1,13 @@ [package] -name = "wasm-storage" -version = "0.1.0" +name = "nym-wasm-storage" +version.workspace = true authors = ["Jedrzej Stuczynski "] edition = "2021" license.workspace = true +description = "indexeddb-backed in-browser storage with optional encryption implentation and helpers" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -17,5 +21,5 @@ serde-wasm-bindgen = { workspace = true } indexed_db_futures = { workspace = true } thiserror = { workspace = true } -nym-store-cipher = { path = "../../store-cipher", features = ["json"] } -wasm-utils = { path = "../utils", default-features = false } +nym-store-cipher = { workspace = true, features = ["json"] } +nym-wasm-utils = { workspace = true, default-features = false } diff --git a/common/wasm/storage/src/error.rs b/common/wasm/storage/src/error.rs index 3ca74adee43..ee28306c8bc 100644 --- a/common/wasm/storage/src/error.rs +++ b/common/wasm/storage/src/error.rs @@ -1,10 +1,10 @@ // Copyright 2023 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 +use nym_wasm_utils::error::simple_js_error; use serde_wasm_bindgen::Error; use thiserror::Error; use wasm_bindgen::JsValue; -use wasm_utils::error::simple_js_error; #[derive(Debug, Error)] pub enum StorageError { diff --git a/common/wasm/storage/src/lib.rs b/common/wasm/storage/src/lib.rs index 8d9e7952708..c20015ab534 100644 --- a/common/wasm/storage/src/lib.rs +++ b/common/wasm/storage/src/lib.rs @@ -8,11 +8,11 @@ use nym_store_cipher::{ Aes256Gcm, Algorithm, EncryptedData, KdfInfo, KeySizeUser, Params, StoreCipher, Unsigned, Version, }; +use nym_wasm_utils::console_log; use serde::de::DeserializeOwned; use serde::Serialize; use std::future::IntoFuture; use wasm_bindgen::JsValue; -use wasm_utils::console_log; pub use indexed_db_futures::database::{Database, VersionChangeEvent}; pub use indexed_db_futures::prelude::*; diff --git a/common/wasm/utils/Cargo.toml b/common/wasm/utils/Cargo.toml index 7305908344e..49af79aa419 100644 --- a/common/wasm/utils/Cargo.toml +++ b/common/wasm/utils/Cargo.toml @@ -1,9 +1,13 @@ [package] -name = "wasm-utils" -version = "0.1.0" +name = "nym-wasm-utils" +version.workspace = true authors = ["Jedrzej Stuczynski "] edition = "2021" license.workspace = true +description = "Helpers and macros for the Nym WASM client" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -15,7 +19,7 @@ wasm-bindgen-futures = { workspace = true } getrandom = { workspace = true, features = ["js"], optional = true } gloo-utils = { workspace = true } gloo-net = { workspace = true, features = ["websocket"], optional = true } -#gloo-net = { path = "../../../../gloo/crates/net", features = ["websocket"], optional = true } +#gloo-net = { workspace = truepath = "../../../../gloo/crates/net", features = ["websocket"], optional = true } console_error_panic_hook = { workspace = true, optional = true } diff --git a/common/wireguard-private-metadata/client/Cargo.toml b/common/wireguard-private-metadata/client/Cargo.toml index d7d23ce4450..d0398103875 100644 --- a/common/wireguard-private-metadata/client/Cargo.toml +++ b/common/wireguard-private-metadata/client/Cargo.toml @@ -1,18 +1,19 @@ [package] name = "nym-wireguard-private-metadata-client" -version = "1.0.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "nym-wireguard client implementation" [dependencies] async-trait = { workspace = true } tracing = { workspace = true } -nym-http-api-client = { path = "../../http-api-client" } -nym-wireguard-private-metadata-shared = { path = "../shared" } +nym-http-api-client = { workspace = true } +nym-wireguard-private-metadata-shared = { workspace = true } [lints] workspace = true diff --git a/common/wireguard-private-metadata/server/Cargo.toml b/common/wireguard-private-metadata/server/Cargo.toml index fa850181f13..b16725b1493 100644 --- a/common/wireguard-private-metadata/server/Cargo.toml +++ b/common/wireguard-private-metadata/server/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-wireguard-private-metadata-server" -version = "1.0.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "nym-wireguard server implementation" [dependencies] anyhow = { workspace = true } @@ -25,15 +26,15 @@ tower-http = { workspace = true, features = [ utoipa = { workspace = true, features = ["axum_extras", "time"] } utoipa-swagger-ui = { workspace = true, features = ["axum"] } -nym-credentials-interface = { path = "../../credentials-interface" } -nym-credential-verification = { path = "../../credential-verification" } -nym-http-api-common = { path = "../../http-api-common", features = [ +nym-credentials-interface = { workspace = true } +nym-credential-verification = { workspace = true } +nym-http-api-common = { workspace = true, features = [ "middleware", "utoipa", "output", ] } -nym-wireguard = { path = "../../wireguard" } -nym-wireguard-private-metadata-shared = { path = "../shared" } +nym-wireguard = { workspace = true } +nym-wireguard-private-metadata-shared = { workspace = true } [dev-dependencies] async-trait = { workspace = true } diff --git a/common/wireguard-private-metadata/shared/Cargo.toml b/common/wireguard-private-metadata/shared/Cargo.toml index 26b3cc6cd6d..4c4ffacca88 100644 --- a/common/wireguard-private-metadata/shared/Cargo.toml +++ b/common/wireguard-private-metadata/shared/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-wireguard-private-metadata-shared" -version = "1.0.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Common crate for nym-wireguard server, client, and tests" [dependencies] axum = { workspace = true } @@ -16,7 +17,7 @@ serde = { workspace = true } thiserror = { workspace = true } utoipa = { workspace = true } -nym-credentials-interface = { path = "../../credentials-interface" } +nym-credentials-interface = { workspace = true } [features] testing = [] diff --git a/common/wireguard-private-metadata/tests/Cargo.toml b/common/wireguard-private-metadata/tests/Cargo.toml index 074d088f154..de8a2ab5016 100644 --- a/common/wireguard-private-metadata/tests/Cargo.toml +++ b/common/wireguard-private-metadata/tests/Cargo.toml @@ -1,28 +1,29 @@ [package] name = "nym-wireguard-private-metadata-tests" -version = "1.0.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Tests for nym-wireguard implementation" [dependencies] async-trait = { workspace = true } axum = { workspace = true, features = ["tokio", "macros"] } futures = { workspace = true } -nym-credential-verification = { path = "../../credential-verification" } -nym-credentials-interface = { path = "../../credentials-interface" } -nym-crypto = { path = "../../crypto", features = ["asymmetric"] } -nym-http-api-client = { path = "../../http-api-client" } -nym-http-api-common = { path = "../../http-api-common", features = [ +nym-credential-verification = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-crypto = { workspace = true, features = ["asymmetric"] } +nym-http-api-client = { workspace = true } +nym-http-api-common = { workspace = true, features = [ "middleware", "utoipa", "output", ] } -nym-upgrade-mode-check = { path = "../../upgrade-mode-check" } -nym-wireguard = { path = "../../wireguard" } +nym-upgrade-mode-check = { workspace = true } +nym-wireguard = { workspace = true } time = { workspace = true, features = ["macros"] } tokio = { workspace = true, features = ["rt-multi-thread", "net", "io-util"] } tower = { workspace = true } @@ -36,9 +37,8 @@ tower-http = { workspace = true, features = [ ] } utoipa = { workspace = true, features = ["axum_extras", "time"] } -nym-wireguard-private-metadata-client = { path = "../client" } -nym-wireguard-private-metadata-shared = { path = "../shared", features = [ +nym-wireguard-private-metadata-client = { workspace = true } +nym-wireguard-private-metadata-shared = { workspace = true, features = [ "testing", ] } -nym-wireguard-private-metadata-server = { path = "../server" } - +nym-wireguard-private-metadata-server = { workspace = true } diff --git a/common/wireguard-types/Cargo.toml b/common/wireguard-types/Cargo.toml index 9a8a783db01..35af9c23416 100644 --- a/common/wireguard-types/Cargo.toml +++ b/common/wireguard-types/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-wireguard-types" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Wireguard public key and config definitions" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -16,8 +17,8 @@ serde = { workspace = true, features = ["derive"] } thiserror = { workspace = true } x25519-dalek = { workspace = true, features = ["static_secrets"] } -nym-crypto = { path = "../crypto", features = ["asymmetric"] } +nym-crypto = { workspace = true, features = ["asymmetric"] } [dev-dependencies] rand = { workspace = true } -nym-crypto = { path = "../crypto", features = ["rand"] } +nym-crypto = { workspace = true, features = ["rand"] } diff --git a/common/wireguard/Cargo.toml b/common/wireguard/Cargo.toml index f2a773d4ec3..82ecda0186d 100644 --- a/common/wireguard/Cargo.toml +++ b/common/wireguard/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-wireguard" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Interface and peer handling functionality for Wireguard protocol" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -20,18 +21,18 @@ tokio = { workspace = true, features = ["rt-multi-thread", "net", "io-util"] } tokio-stream = { workspace = true } tracing = { workspace = true } -nym-credentials-interface = { path = "../credentials-interface" } -nym-credential-verification = { path = "../credential-verification" } -nym-crypto = { path = "../crypto", features = ["asymmetric"] } -nym-gateway-storage = { path = "../gateway-storage" } -nym-gateway-requests = { path = "../gateway-requests" } -nym-network-defaults = { path = "../network-defaults" } -nym-task = { path = "../task" } -nym-wireguard-types = { path = "../wireguard-types" } -nym-node-metrics = { path = "../../nym-node/nym-node-metrics" } +nym-credentials-interface = { workspace = true } +nym-credential-verification = { workspace = true } +nym-crypto = { workspace = true, features = ["asymmetric"] } +nym-gateway-storage = { workspace = true } +nym-gateway-requests = { workspace = true } +nym-network-defaults = { workspace = true } +nym-task = { workspace = true } +nym-wireguard-types = { workspace = true } +nym-node-metrics = { workspace = true } [dev-dependencies] -nym-gateway-storage = { path = "../gateway-storage", features = ["mock"] } +nym-gateway-storage = { workspace = true, features = ["mock"] } [features] default = [] diff --git a/common/zulip-client/Cargo.toml b/common/zulip-client/Cargo.toml index acfc84a5401..cc065e917c3 100644 --- a/common/zulip-client/Cargo.toml +++ b/common/zulip-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zulip-client" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +publish = false [dependencies] thiserror = { workspace = true } @@ -18,8 +19,8 @@ url = { workspace = true, features = ["serde"] } serde = { workspace = true, features = ["derive"] } zeroize = { workspace = true } -nym-bin-common = { path = "../bin-common" } -nym-http-api-client = { path = "../http-api-client" } +nym-bin-common = { workspace = true } +nym-http-api-client = { workspace = true } reqwest = { workspace = true } tracing = { workspace = true } diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock index 42e5e1352a2..b6b4d2fda1e 100644 --- a/contracts/Cargo.lock +++ b/contracts/Cargo.lock @@ -2,6 +2,17 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + [[package]] name = "ahash" version = "0.8.11" @@ -76,7 +87,7 @@ dependencies = [ "ark-serialize", "ark-std", "derivative", - "digest", + "digest 0.10.7", "itertools 0.10.5", "num-bigint", "num-traits", @@ -130,7 +141,7 @@ checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" dependencies = [ "ark-serialize-derive", "ark-std", - "digest", + "digest 0.10.7", "num-bigint", ] @@ -156,6 +167,12 @@ dependencies = [ "rayon", ] +[[package]] +name = "arrayref" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" + [[package]] name = "autocfg" version = "1.2.0" @@ -198,13 +215,25 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d" +[[package]] +name = "blake2" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330" +dependencies = [ + "byte-tools", + "crypto-mac", + "digest 0.8.1", + "opaque-debug", +] + [[package]] name = "block-buffer" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array", + "generic-array 0.14.7", ] [[package]] @@ -222,6 +251,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "byte-tools" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" + [[package]] name = "byteorder" version = "1.5.0" @@ -286,6 +321,26 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "chacha" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf3c081b5fba1e5615640aae998e0fbd10c24cbd897ee39ed754a77601a4862" +dependencies = [ + "byteorder", + "keystream", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + [[package]] name = "const-oid" version = "0.9.6" @@ -325,7 +380,7 @@ dependencies = [ "ark-serialize", "cosmwasm-core", "curve25519-dalek", - "digest", + "digest 0.10.7", "ecdsa", "ed25519-zebra", "k256", @@ -436,9 +491,9 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ - "generic-array", + "generic-array 0.14.7", "rand_core", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -448,10 +503,29 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array", + "generic-array 0.14.7", "typenum", ] +[[package]] +name = "crypto-mac" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" +dependencies = [ + "generic-array 0.12.4", + "subtle 1.0.0", +] + +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + [[package]] name = "curve25519-dalek" version = "4.1.3" @@ -461,10 +535,10 @@ dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", - "digest", + "digest 0.10.7", "fiat-crypto", "rustc_version", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -722,6 +796,15 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "digest" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +dependencies = [ + "generic-array 0.12.4", +] + [[package]] name = "digest" version = "0.10.7" @@ -731,7 +814,7 @@ dependencies = [ "block-buffer", "const-oid", "crypto-common", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -742,7 +825,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "easy-addr" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cosmwasm-std", "quote", @@ -756,7 +839,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ "der", - "digest", + "digest 0.10.7", "elliptic-curve", "rfc6979", "signature", @@ -783,7 +866,7 @@ dependencies = [ "rand_core", "serde", "sha2", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -816,13 +899,13 @@ checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct", "crypto-bigint", - "digest", + "digest 0.10.7", "ff", - "generic-array", + "generic-array 0.14.7", "group", "rand_core", "sec1", - "subtle", + "subtle 2.4.1", "zeroize", ] @@ -839,7 +922,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "rand_core", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -848,6 +931,15 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" +[[package]] +name = "generic-array" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +dependencies = [ + "typenum", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -878,7 +970,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", "rand_core", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -912,13 +1004,22 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + [[package]] name = "hmac" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest", + "digest 0.10.7", ] [[package]] @@ -947,6 +1048,15 @@ dependencies = [ "hashbrown 0.15.2", ] +[[package]] +name = "inout" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" +dependencies = [ + "generic-array 0.14.7", +] + [[package]] name = "itertools" version = "0.10.5" @@ -992,6 +1102,12 @@ dependencies = [ "sha2", ] +[[package]] +name = "keystream" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28" + [[package]] name = "konst" version = "0.3.16" @@ -1025,6 +1141,24 @@ version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +[[package]] +name = "libm" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" + +[[package]] +name = "lioness" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae926706ba42c425c9457121178330d75e273df2e82e28b758faf3de3a9acb9" +dependencies = [ + "arrayref", + "blake2", + "chacha", + "keystream", +] + [[package]] name = "memchr" version = "2.7.2" @@ -1078,6 +1212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -1113,7 +1248,7 @@ dependencies = [ [[package]] name = "nym-coconut-dkg-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1126,7 +1261,7 @@ dependencies = [ [[package]] name = "nym-contracts-common" -version = "0.5.0" +version = "1.20.1" dependencies = [ "bs58", "cosmwasm-schema", @@ -1140,7 +1275,7 @@ dependencies = [ [[package]] name = "nym-contracts-common-testing" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "cosmwasm-std", @@ -1154,7 +1289,7 @@ dependencies = [ [[package]] name = "nym-crypto" -version = "0.4.0" +version = "1.20.1" dependencies = [ "base64 0.22.1", "bs58", @@ -1198,7 +1333,7 @@ dependencies = [ [[package]] name = "nym-ecash-contract-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bs58", "cosmwasm-schema", @@ -1212,7 +1347,7 @@ dependencies = [ [[package]] name = "nym-group-contract-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cosmwasm-schema", "cw-controllers", @@ -1247,7 +1382,7 @@ dependencies = [ [[package]] name = "nym-mixnet-contract-common" -version = "0.6.0" +version = "1.20.1" dependencies = [ "bs58", "cosmwasm-schema", @@ -1267,7 +1402,7 @@ dependencies = [ [[package]] name = "nym-multisig-contract-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1282,7 +1417,7 @@ dependencies = [ [[package]] name = "nym-network-defaults" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cargo_metadata 0.19.2", "regex", @@ -1290,7 +1425,7 @@ dependencies = [ [[package]] name = "nym-pemstore" -version = "0.3.0" +version = "1.20.1" dependencies = [ "pem", "tracing", @@ -1318,7 +1453,7 @@ dependencies = [ [[package]] name = "nym-performance-contract-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1346,7 +1481,7 @@ dependencies = [ [[package]] name = "nym-pool-contract-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1358,8 +1493,9 @@ dependencies = [ [[package]] name = "nym-sphinx-types" -version = "0.2.0" +version = "1.20.1" dependencies = [ + "sphinx-packet", "thiserror 2.0.12", ] @@ -1386,7 +1522,7 @@ dependencies = [ [[package]] name = "nym-vesting-contract-common" -version = "0.7.0" +version = "1.20.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1403,6 +1539,12 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "opaque-debug" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" + [[package]] name = "p256" version = "0.13.2" @@ -1573,6 +1715,16 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand", +] + [[package]] name = "rayon" version = "1.10.0" @@ -1629,7 +1781,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ "hmac", - "subtle", + "subtle 2.4.1", ] [[package]] @@ -1707,8 +1859,8 @@ checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct", "der", - "generic-array", - "subtle", + "generic-array 0.14.7", + "subtle 2.4.1", "zeroize", ] @@ -1801,7 +1953,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest", + "digest 0.10.7", ] [[package]] @@ -1810,10 +1962,36 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ - "digest", + "digest 0.10.7", "rand_core", ] +[[package]] +name = "sphinx-packet" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c26f0c20d909fdda1c5d0ece3973127ca421984d55b000215df365e93722fc6e" +dependencies = [ + "aes", + "arrayref", + "blake2", + "bs58", + "byteorder", + "chacha", + "ctr", + "curve25519-dalek", + "digest 0.10.7", + "hkdf", + "hmac", + "lioness", + "rand", + "rand_distr", + "sha2", + "subtle 2.4.1", + "x25519-dalek", + "zeroize", +] + [[package]] name = "spki" version = "0.7.3" @@ -1830,6 +2008,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "subtle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" + [[package]] name = "subtle" version = "2.4.1" diff --git a/contracts/Cargo.toml b/contracts/Cargo.toml index ec3239772cf..edcaf4b3355 100644 --- a/contracts/Cargo.toml +++ b/contracts/Cargo.toml @@ -57,6 +57,41 @@ schemars = "0.8.16" thiserror = "2.0.11" +# Common crates from parent workspace (paths relative to contracts/) +# +# TODO: Once these crates are published to crates.io, switch from path dependencies +# to crates.io versions. +# +# TODO add a [patch.crates-io] section at the bottom for local development if you need to use a modded version of common import instead e.g.: +# +# [patch.crates-io] +# nym-contracts-common = { path = "../common/cosmwasm-smart-contracts/contracts-common" } +# +easy-addr = { version = "1.20.1", path = "../common/cosmwasm-smart-contracts/easy_addr" } +nym-coconut-dkg-common = { version = "1.20.1", path = "../common/cosmwasm-smart-contracts/coconut-dkg" } +nym-contracts-common = { version = "1.20.1", path = "../common/cosmwasm-smart-contracts/contracts-common" } +nym-contracts-common-testing = { version = "1.20.1", path = "../common/cosmwasm-smart-contracts/contracts-common-testing" } +nym-crypto = { version = "1.20.1", path = "../common/crypto", default-features = false } +nym-ecash-contract-common = { version = "1.20.1", path = "../common/cosmwasm-smart-contracts/ecash-contract" } +nym-group-contract-common = { version = "1.20.1", path = "../common/cosmwasm-smart-contracts/group-contract" } +nym-mixnet-contract-common = { version = "1.20.1", path = "../common/cosmwasm-smart-contracts/mixnet-contract" } +nym-multisig-contract-common = { version = "1.20.1", path = "../common/cosmwasm-smart-contracts/multisig-contract" } +nym-network-defaults = { version = "1.20.1", path = "../common/network-defaults", default-features = false } +nym-performance-contract-common = { version = "1.20.1", path = "../common/cosmwasm-smart-contracts/nym-performance-contract" } +nym-pool-contract-common = { version = "1.20.1", path = "../common/cosmwasm-smart-contracts/nym-pool-contract" } +nym-vesting-contract-common = { version = "1.20.1", path = "../common/cosmwasm-smart-contracts/vesting-contract" } + +# Aliases for crates that some contracts import under different names +contracts-common = { version = "1.20.1", path = "../common/cosmwasm-smart-contracts/contracts-common", package = "nym-contracts-common" } +mixnet-contract-common = { version = "1.20.1", path = "../common/cosmwasm-smart-contracts/mixnet-contract", package = "nym-mixnet-contract-common" } +vesting-contract-common = { version = "1.20.1", path = "../common/cosmwasm-smart-contracts/vesting-contract", package = "nym-vesting-contract-common" } + +# Internal contract workspace members (for cross-contract testing) +cw3-flex-multisig = { version = "2.0.0", path = "multisig/cw3-flex-multisig" } +cw4-group = { version = "2.0.0", path = "multisig/cw4-group" } +nym-mixnet-contract = { version = "1.5.1", path = "mixnet" } +nym-vesting-contract = { version = "1.4.1", path = "vesting" } + [workspace.lints.clippy] unwrap_used = "deny" expect_used = "deny" diff --git a/contracts/coconut-dkg/Cargo.toml b/contracts/coconut-dkg/Cargo.toml index 977448b9e73..66cb2acbe09 100644 --- a/contracts/coconut-dkg/Cargo.toml +++ b/contracts/coconut-dkg/Cargo.toml @@ -16,10 +16,10 @@ required-features = ["schema-gen"] crate-type = ["cdylib", "rlib"] [dependencies] -nym-coconut-dkg-common = { path = "../../common/cosmwasm-smart-contracts/coconut-dkg" } -nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common" } -nym-contracts-common-testing = { path = "../../common/cosmwasm-smart-contracts/contracts-common-testing", optional = true } -nym-group-contract-common = { path = "../../common/cosmwasm-smart-contracts/group-contract", optional = true } +nym-coconut-dkg-common = { workspace = true } +nym-contracts-common = { workspace = true } +nym-contracts-common-testing = { workspace = true, optional = true } +nym-group-contract-common = { workspace = true, optional = true } cosmwasm-schema = { workspace = true, optional = true } cosmwasm-std = { workspace = true } @@ -30,15 +30,15 @@ cw2 = { workspace = true } cw4 = { workspace = true } thiserror = { workspace = true } -cw3-flex-multisig = { path = "../multisig/cw3-flex-multisig", features = ["testable-cw3-contract"], optional = true } -cw4-group = { path = "../multisig/cw4-group", features = ["testable-cw4-contract"], optional = true } +cw3-flex-multisig = { workspace = true, features = ["testable-cw3-contract"], optional = true } +cw4-group = { workspace = true, features = ["testable-cw4-contract"], optional = true } [dev-dependencies] anyhow = { workspace = true } -easy-addr = { path = "../../common/cosmwasm-smart-contracts/easy_addr" } -nym-group-contract-common = { path = "../../common/cosmwasm-smart-contracts/group-contract" } +easy-addr = { workspace = true } +nym-group-contract-common = { workspace = true } cw-multi-test = { workspace = true } -cw4-group = { path = "../multisig/cw4-group" } +cw4-group = { workspace = true } [features] schema-gen = ["nym-coconut-dkg-common/schema", "cosmwasm-schema"] diff --git a/contracts/ecash/Cargo.toml b/contracts/ecash/Cargo.toml index a80b0fb2412..4badeb44602 100644 --- a/contracts/ecash/Cargo.toml +++ b/contracts/ecash/Cargo.toml @@ -30,15 +30,15 @@ cw4 = { workspace = true } cw-utils = { workspace = true } semver = { workspace = true, default-features = false } -nym-ecash-contract-common = { path = "../../common/cosmwasm-smart-contracts/ecash-contract" } -nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common" } -nym-multisig-contract-common = { path = "../../common/cosmwasm-smart-contracts/multisig-contract" } -nym-network-defaults = { path = "../../common/network-defaults", default-features = false } +nym-ecash-contract-common = { workspace = true } +nym-contracts-common = { workspace = true } +nym-multisig-contract-common = { workspace = true } +nym-network-defaults = { workspace = true, default-features = false } [dev-dependencies] anyhow = { workspace = true } sylvia = { workspace = true, features = ["mt"] } -nym-crypto = { path = "../../common/crypto", features = ["rand", "asymmetric"] } +nym-crypto = { workspace = true, features = ["rand", "asymmetric"] } rand_chacha = "0.3" cw-multi-test = { workspace = true } diff --git a/contracts/mixnet-vesting-integration-tests/Cargo.toml b/contracts/mixnet-vesting-integration-tests/Cargo.toml index c3fc07974ff..a1f6aa31044 100644 --- a/contracts/mixnet-vesting-integration-tests/Cargo.toml +++ b/contracts/mixnet-vesting-integration-tests/Cargo.toml @@ -16,15 +16,15 @@ cosmwasm-std = { workspace = true } cw-multi-test = { workspace = true } # contracts dependencies -nym-mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract" } -nym-vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract" } -nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common" } +nym-mixnet-contract-common = { workspace = true } +nym-vesting-contract-common = { workspace = true } +nym-contracts-common = { workspace = true } -nym-mixnet-contract = { path = "../mixnet" } -nym-vesting-contract = { path = "../vesting" } +nym-mixnet-contract = { workspace = true } +nym-vesting-contract = { workspace = true } # other local dependencies -nym-crypto = { path = "../../common/crypto", features = ["asymmetric", "rand"] } +nym-crypto = { workspace = true, features = ["asymmetric", "rand"] } # external dependencies rand_chacha = "0.3" diff --git a/contracts/mixnet/Cargo.toml b/contracts/mixnet/Cargo.toml index ae2ad99d36c..e5c7b477195 100644 --- a/contracts/mixnet/Cargo.toml +++ b/contracts/mixnet/Cargo.toml @@ -26,10 +26,10 @@ name = "mixnet_contract" crate-type = ["cdylib", "rlib"] [dependencies] -mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract", package = "nym-mixnet-contract-common" } -vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract", package = "nym-vesting-contract-common" } -nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common" } -nym-contracts-common-testing = { path = "../../common/cosmwasm-smart-contracts/contracts-common-testing", optional = true } +mixnet-contract-common = { workspace = true } +vesting-contract-common = { workspace = true } +nym-contracts-common = { workspace = true } +nym-contracts-common-testing = { workspace = true, optional = true } cosmwasm-schema = { workspace = true, optional = true } cosmwasm-std = { workspace = true } @@ -46,12 +46,12 @@ semver = { workspace = true } anyhow.workspace = true rand_chacha = { workspace = true } rand = { workspace = true } -nym-crypto = { path = "../../common/crypto", features = ["asymmetric", "rand"] } -easy-addr = { path = "../../common/cosmwasm-smart-contracts/easy_addr" } +nym-crypto = { workspace = true, features = ["asymmetric", "rand"] } +easy-addr = { workspace = true } # activate the `testable-mixnet-contract` in tests (weird workaround, but it does the trick) -nym-mixnet-contract = { path = ".", features = ["testable-mixnet-contract"] } -nym-contracts-common-testing = { path = "../../common/cosmwasm-smart-contracts/contracts-common-testing" } +nym-mixnet-contract = { workspace = true, features = ["testable-mixnet-contract"] } +nym-contracts-common-testing = { workspace = true } [features] default = [] @@ -60,4 +60,4 @@ testable-mixnet-contract = ["nym-contracts-common-testing"] schema-gen = ["mixnet-contract-common/schema", "cosmwasm-schema"] [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/contracts/multisig/cw3-flex-multisig/Cargo.toml b/contracts/multisig/cw3-flex-multisig/Cargo.toml index 695ec7bcac3..e016a5f4c86 100644 --- a/contracts/multisig/cw3-flex-multisig/Cargo.toml +++ b/contracts/multisig/cw3-flex-multisig/Cargo.toml @@ -27,18 +27,18 @@ cw-storage-plus = { workspace = true } cosmwasm-schema = { workspace = true, optional = true } cosmwasm-std = { workspace = true } -nym-group-contract-common = { path = "../../../common/cosmwasm-smart-contracts/group-contract" } -nym-multisig-contract-common = { path = "../../../common/cosmwasm-smart-contracts/multisig-contract" } -nym-contracts-common = { path = "../../../common/cosmwasm-smart-contracts/contracts-common" } -nym-contracts-common-testing = { path = "../../../common/cosmwasm-smart-contracts/contracts-common-testing", optional = true } +nym-group-contract-common = { workspace = true } +nym-multisig-contract-common = { workspace = true } +nym-contracts-common = { workspace = true } +nym-contracts-common-testing = { workspace = true, optional = true } [dev-dependencies] -easy-addr = { path = "../../../common/cosmwasm-smart-contracts/easy_addr" } -cw4-group = { path = "../cw4-group" } +easy-addr = { workspace = true } +cw4-group = { workspace = true } cw-multi-test = { workspace = true } cw20-base = { workspace = true } [features] # use library feature to disable all instantiate/execute/query exports library = [] -testable-cw3-contract = ["nym-contracts-common-testing"] \ No newline at end of file +testable-cw3-contract = ["nym-contracts-common-testing"] diff --git a/contracts/multisig/cw4-group/Cargo.toml b/contracts/multisig/cw4-group/Cargo.toml index f0f37116319..b8334b756e7 100644 --- a/contracts/multisig/cw4-group/Cargo.toml +++ b/contracts/multisig/cw4-group/Cargo.toml @@ -23,9 +23,9 @@ name = "schema" crate-type = ["cdylib", "rlib"] [dependencies] -nym-group-contract-common = { path = "../../../common/cosmwasm-smart-contracts/group-contract" } -nym-contracts-common = { path = "../../../common/cosmwasm-smart-contracts/contracts-common" } -nym-contracts-common-testing = { path = "../../../common/cosmwasm-smart-contracts/contracts-common-testing", optional = true } +nym-group-contract-common = { workspace = true } +nym-contracts-common = { workspace = true } +nym-contracts-common-testing = { workspace = true, optional = true } cw-utils = { workspace = true } cw2 = { workspace = true } @@ -39,9 +39,9 @@ serde = { workspace = true, default-features = false, features = ["derive"] } thiserror = { workspace = true } [dev-dependencies] -easy-addr = { path = "../../../common/cosmwasm-smart-contracts/easy_addr" } +easy-addr = { workspace = true } [features] # use library feature to disable all instantiate/execute/query exports library = [] -testable-cw4-contract = ["nym-contracts-common-testing"] \ No newline at end of file +testable-cw4-contract = ["nym-contracts-common-testing"] diff --git a/contracts/nym-pool/Cargo.toml b/contracts/nym-pool/Cargo.toml index 5bd54bb3bcb..f3fc80740ee 100644 --- a/contracts/nym-pool/Cargo.toml +++ b/contracts/nym-pool/Cargo.toml @@ -22,12 +22,12 @@ cw-controllers = { workspace = true } cosmwasm-schema = { workspace = true, optional = true } -nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common" } -nym-pool-contract-common = { path = "../../common/cosmwasm-smart-contracts/nym-pool-contract" } +nym-contracts-common = { workspace = true } +nym-pool-contract-common = { workspace = true } [dev-dependencies] anyhow = { workspace = true } -nym-contracts-common-testing = { path = "../../common/cosmwasm-smart-contracts/contracts-common-testing" } +nym-contracts-common-testing = { workspace = true } [features] schema-gen = ["nym-pool-contract-common/schema", "cosmwasm-schema"] diff --git a/contracts/performance/Cargo.toml b/contracts/performance/Cargo.toml index abeef17f401..72086ad4199 100644 --- a/contracts/performance/Cargo.toml +++ b/contracts/performance/Cargo.toml @@ -25,18 +25,18 @@ serde = { workspace = true } cosmwasm-schema = { workspace = true, optional = true } -nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common" } -nym-performance-contract-common = { path = "../../common/cosmwasm-smart-contracts/nym-performance-contract" } -nym-mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract" } +nym-contracts-common = { workspace = true } +nym-performance-contract-common = { workspace = true } +nym-mixnet-contract-common = { workspace = true } [dev-dependencies] anyhow = { workspace = true } -nym-contracts-common-testing = { path = "../../common/cosmwasm-smart-contracts/contracts-common-testing" } -nym-mixnet-contract = { path = "../mixnet", features = ["testable-mixnet-contract"] } -nym-crypto = { path = "../../common/crypto", features = ["asymmetric", "rand"] } +nym-contracts-common-testing = { workspace = true } +nym-mixnet-contract = { workspace = true, features = ["testable-mixnet-contract"] } +nym-crypto = { workspace = true, features = ["asymmetric", "rand"] } [features] schema-gen = ["nym-performance-contract-common/schema", "cosmwasm-schema"] [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/contracts/vesting/Cargo.toml b/contracts/vesting/Cargo.toml index 2845ee15a11..bc227c58065 100644 --- a/contracts/vesting/Cargo.toml +++ b/contracts/vesting/Cargo.toml @@ -24,9 +24,9 @@ name = "vesting_contract" crate-type = ["cdylib", "rlib"] [dependencies] -mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract", package = "nym-mixnet-contract-common", version = "0.6.0" } -contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common", package = "nym-contracts-common", version = "0.5.0" } -vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract", package = "nym-vesting-contract-common", version = "0.7.0" } +mixnet-contract-common = { workspace = true } +contracts-common = { workspace = true } +vesting-contract-common = { workspace = true } cosmwasm-schema = { workspace = true, optional = true } cosmwasm-std = { workspace = true } diff --git a/documentation/autodoc/Cargo.toml b/documentation/autodoc/Cargo.toml index 9fae8c54348..1905285f995 100644 --- a/documentation/autodoc/Cargo.toml +++ b/documentation/autodoc/Cargo.toml @@ -7,6 +7,7 @@ homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +publish = false [dependencies] env_logger = { workspace = true } diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml index cf1b8f286b3..53d033a2e97 100644 --- a/gateway/Cargo.toml +++ b/gateway/Cargo.toml @@ -12,6 +12,7 @@ authors = [ description = "Implementation of the Nym Mixnet Gateway" edition = "2021" rust-version = "1.85" +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -46,42 +47,42 @@ zeroize = { workspace = true } # internal -nym-credentials = { path = "../common/credentials" } -nym-credentials-interface = { path = "../common/credentials-interface" } -nym-credential-verification = { path = "../common/credential-verification" } -nym-crypto = { path = "../common/crypto", features = ["sphinx"] } -nym-gateway-storage = { path = "../common/gateway-storage" } -nym-gateway-stats-storage = { path = "../common/gateway-stats-storage" } -nym-gateway-requests = { path = "../common/gateway-requests" } -nym-mixnet-client = { path = "../common/client-libs/mixnet-client" } -nym-network-defaults = { path = "../common/network-defaults" } +nym-credentials = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-credential-verification = { workspace = true } +nym-crypto = { workspace = true, features = ["sphinx"] } +nym-gateway-storage = { workspace = true } +nym-gateway-stats-storage = { workspace = true } +nym-gateway-requests = { workspace = true } +nym-mixnet-client = { workspace = true } +nym-network-defaults = { workspace = true } nym-network-requester = { path = "../service-providers/network-requester" } -nym-sdk = { path = "../sdk/rust/nym-sdk" } -nym-sphinx = { path = "../common/nymsphinx" } -nym-statistics-common = { path = "../common/statistics" } -nym-task = { path = "../common/task" } -nym-topology = { path = "../common/topology" } -nym-validator-client = { path = "../common/client-libs/validator-client" } +nym-sdk = { workspace = true } +nym-sphinx = { workspace = true } +nym-statistics-common = { workspace = true } +nym-task = { workspace = true } +nym-topology = { workspace = true } +nym-validator-client = { workspace = true } nym-ip-packet-router = { path = "../service-providers/ip-packet-router" } -nym-node-metrics = { path = "../nym-node/nym-node-metrics" } -nym-upgrade-mode-check = { path = "../common/upgrade-mode-check" } +nym-node-metrics = { workspace = true } +nym-upgrade-mode-check = { workspace = true } -nym-wireguard = { path = "../common/wireguard" } -nym-wireguard-private-metadata-server = { path = "../common/wireguard-private-metadata/server" } -nym-wireguard-types = { path = "../common/wireguard-types", default-features = false } +nym-wireguard = { workspace = true } +nym-wireguard-private-metadata-server = { workspace = true } +nym-wireguard-types = { workspace = true } -nym-authenticator-requests = { path = "../common/authenticator-requests" } -nym-client-core = { path = "../common/client-core", features = ["cli"] } -nym-id = { path = "../common/nym-id" } -nym-service-provider-requests-common = { path = "../common/service-provider-requests-common" } +nym-authenticator-requests = { workspace = true } +nym-client-core = { workspace = true, features = ["cli"] } +nym-id = { workspace = true } +nym-service-provider-requests-common = { workspace = true } defguard_wireguard_rs = { workspace = true } [dev-dependencies] -nym-gateway-storage = { path = "../common/gateway-storage", features = ["mock"] } -nym-wireguard = { path = "../common/wireguard", features = ["mock"] } +nym-gateway-storage = { workspace = true, features = ["mock"] } +nym-wireguard = { workspace = true, features = ["mock"] } mock_instant = "0.6.0" time = { workspace = true } [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/nym-api/Cargo.toml b/nym-api/Cargo.toml index 362c78f7314..96715767c43 100644 --- a/nym-api/Cargo.toml +++ b/nym-api/Cargo.toml @@ -4,10 +4,11 @@ [package] name = "nym-api" license = "GPL-3.0" -version = "1.1.70" +version.workspace = true authors.workspace = true edition = "2021" rust-version.workspace = true +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -67,43 +68,43 @@ utoipa-swagger-ui = { workspace = true, features = ["axum"] } tracing = { workspace = true } ## internal -nym-cache = { path = "../common/nym-cache" } -nym-bandwidth-controller = { path = "../common/bandwidth-controller" } -nym-ecash-contract-common = { path = "../common/cosmwasm-smart-contracts/ecash-contract" } -nym-ecash-time = { path = "../common/ecash-time", features = ["expiration"] } -nym-coconut-dkg-common = { path = "../common/cosmwasm-smart-contracts/coconut-dkg" } -nym-compact-ecash = { path = "../common/nym_offline_compact_ecash" } -nym-credentials-interface = { path = "../common/credentials-interface" } -nym-config = { path = "../common/config" } +nym-cache = { workspace = true } +nym-bandwidth-controller = { workspace = true } +nym-ecash-contract-common = { workspace = true } +nym-ecash-time = { workspace = true, features = ["expiration"] } +nym-coconut-dkg-common = { workspace = true } +nym-compact-ecash = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-config = { workspace = true } cosmwasm-std = { workspace = true } -nym-credential-storage = { path = "../common/credential-storage", features = [ +nym-credential-storage = { workspace = true, features = [ "persistent-storage", ] } -nym-credentials = { path = "../common/credentials" } -nym-crypto = { path = "../common/crypto" } +nym-credentials = { workspace = true } +nym-crypto = { workspace = true } cw2 = { workspace = true } cw3 = { workspace = true } cw4 = { workspace = true } -nym-dkg = { path = "../common/dkg", features = ["cw-types"] } -nym-gateway-client = { path = "../common/client-libs/gateway-client" } -nym-mixnet-contract-common = { path = "../common/cosmwasm-smart-contracts/mixnet-contract", features = ["utoipa"] } -nym-contracts-common = { path = "../common/cosmwasm-smart-contracts/contracts-common", features = ["naive_float", "utoipa"] } -nym-sphinx = { path = "../common/nymsphinx" } -nym-pemstore = { path = "../common/pemstore" } -nym-task = { path = "../common/task" } -nym-topology = { path = "../common/topology" } -nym-api-requests = { path = "nym-api-requests" } -nym-validator-client = { path = "../common/client-libs/validator-client" } -nym-http-api-client = { path = "../common/http-api-client" } -nym-bin-common = { path = "../common/bin-common", features = ["output_format", "openapi", "basic_tracing"] } -nym-node-tester-utils = { path = "../common/node-tester-utils" } -nym-node-requests = { path = "../nym-node/nym-node-requests" } -nym-types = { path = "../common/types" } -nym-http-api-common = { path = "../common/http-api-common", features = ["utoipa", "output", "middleware"] } -nym-serde-helpers = { path = "../common/serde-helpers", features = ["date"] } -nym-ticketbooks-merkle = { path = "../common/ticketbooks-merkle" } -nym-statistics-common = { path = "../common/statistics" } -nym-ecash-signer-check = { path = "../common/ecash-signer-check" } +nym-dkg = { workspace = true, features = ["cw-types"] } +nym-gateway-client = { workspace = true } +nym-mixnet-contract-common = { workspace = true, features = ["utoipa"] } +nym-contracts-common = { workspace = true, features = ["naive_float", "utoipa"] } +nym-sphinx = { workspace = true } +nym-pemstore = { workspace = true } +nym-task = { workspace = true } +nym-topology = { workspace = true } +nym-api-requests = { workspace = true } +nym-validator-client = { workspace = true } +nym-http-api-client = { workspace = true } +nym-bin-common = { workspace = true, features = ["output_format", "openapi", "basic_tracing"] } +nym-node-tester-utils = { workspace = true } +nym-node-requests = { workspace = true, features = ["client"] } +nym-types = { workspace = true } +nym-http-api-common = { workspace = true, features = ["utoipa", "output", "middleware"] } +nym-serde-helpers = { workspace = true, features = ["date"] } +nym-ticketbooks-merkle = { workspace = true } +nym-statistics-common = { workspace = true } +nym-ecash-signer-check = { workspace = true } [features] diff --git a/nym-api/nym-api-requests/Cargo.toml b/nym-api/nym-api-requests/Cargo.toml index 267cb731f7e..0a683ef8b8d 100644 --- a/nym-api/nym-api-requests/Cargo.toml +++ b/nym-api/nym-api-requests/Cargo.toml @@ -1,8 +1,12 @@ [package] name = "nym-api-requests" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true +description = "Nym API request types and functions" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -27,26 +31,26 @@ tracing = { workspace = true } # for serde on secp256k1 signatures ecdsa = { workspace = true, features = ["serde"] } -nym-serde-helpers = { path = "../../common/serde-helpers", features = ["bs58", "base64", "date"] } -nym-credentials-interface = { path = "../../common/credentials-interface" } -nym-crypto = { path = "../../common/crypto", features = ["serde", "asymmetric"] } +nym-serde-helpers = { workspace = true, features = ["bs58", "base64", "date"] } +nym-credentials-interface = { workspace = true } +nym-crypto = { workspace = true, features = ["serde", "asymmetric"] } -nym-config = { path = "../../common/config" } -nym-ecash-time = { path = "../../common/ecash-time" } -nym-compact-ecash = { path = "../../common/nym_offline_compact_ecash" } -nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common", features = ["naive_float"] } -nym-mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract", features = ["utoipa"] } -nym-coconut-dkg-common = { path = "../../common/cosmwasm-smart-contracts/coconut-dkg" } -nym-node-requests = { path = "../../nym-node/nym-node-requests", default-features = false, features = ["openapi"] } -nym-noise-keys = { path = "../../common/nymnoise/keys" } -nym-network-defaults = { path = "../../common/network-defaults" } -nym-ticketbooks-merkle = { path = "../../common/ticketbooks-merkle" } -nym-ecash-signer-check-types = { path = "../../common/ecash-signer-check-types" } +nym-config = { workspace = true } +nym-ecash-time = { workspace = true } +nym-compact-ecash = { workspace = true } +nym-contracts-common = { workspace = true , features = ["naive_float"] } +nym-mixnet-contract-common = { workspace = true , features = ["utoipa"] } +nym-coconut-dkg-common = { workspace = true } +nym-node-requests = { workspace = true, default-features = false, features = ["openapi"] } +nym-noise-keys = { workspace = true } +nym-network-defaults = { workspace = true } +nym-ticketbooks-merkle = { workspace = true } +nym-ecash-signer-check-types = { workspace = true } [dev-dependencies] rand_chacha = { workspace = true } -nym-crypto = { path = "../../common/crypto", features = ["rand"] } +nym-crypto = { workspace = true, features = ["rand"] } [features] diff --git a/nym-authenticator-client/Cargo.toml b/nym-authenticator-client/Cargo.toml index 770aff710d9..b1793b6cbf9 100644 --- a/nym-authenticator-client/Cargo.toml +++ b/nym-authenticator-client/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-authenticator-client" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +publish = false [lints] workspace = true @@ -20,12 +21,12 @@ tokio-util.workspace = true tokio.workspace = true tracing.workspace = true -nym-authenticator-requests = { path = "../common/authenticator-requests" } -nym-bandwidth-controller = { path = "../common/bandwidth-controller" } -nym-credentials-interface = { path = "../common/credentials-interface" } -nym-crypto = { path = "../common/crypto" } -nym-registration-common = { path = "../common/registration" } -nym-sdk = { path = "../sdk/rust/nym-sdk" } -nym-service-provider-requests-common = { path = "../common/service-provider-requests-common" } -nym-validator-client = { path = "../common/client-libs/validator-client" } -nym-wireguard-types = { path = "../common/wireguard-types" } +nym-authenticator-requests = { workspace = true } +nym-bandwidth-controller = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-crypto = { workspace = true } +nym-registration-common = { workspace = true } +nym-sdk = { workspace = true } +nym-service-provider-requests-common = { workspace = true } +nym-validator-client = { workspace = true } +nym-wireguard-types = { workspace = true } diff --git a/nym-browser-extension/storage/Cargo.toml b/nym-browser-extension/storage/Cargo.toml index 61a34e51e77..e25c1b107fb 100644 --- a/nym-browser-extension/storage/Cargo.toml +++ b/nym-browser-extension/storage/Cargo.toml @@ -6,6 +6,7 @@ license = "Apache-2.0" repository = "https://github.com/nymtech/nym" description = "WebAssembly-based secure storage for browser extension mnemonics" authors = ["Nym Technologies SA "] +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -13,20 +14,20 @@ authors = ["Nym Technologies SA "] crate-type = ["cdylib", "rlib"] [dependencies] -bip39 = { workspace = true } -zeroize = { workspace = true } +bip39 = { workspace = true } +zeroize = { workspace = true } -js-sys = { workspace = true } -wasm-bindgen = { workspace = true } -wasm-bindgen-futures = { workspace = true } +js-sys = { workspace = true } +wasm-bindgen = { workspace = true } +wasm-bindgen-futures = { workspace = true } serde-wasm-bindgen = { workspace = true } -thiserror = { workspace = true } +thiserror = { workspace = true } -console_error_panic_hook = { workspace = true, optional = true } +console_error_panic_hook = { workspace = true, optional = true } -wasm-utils = { path = "../../common/wasm/utils" } -wasm-storage = { path = "../../common/wasm/storage" } +nym-wasm-utils = { workspace = true } +nym-wasm-storage = { workspace = true } #[package.metadata.wasm-pack.profile.release] diff --git a/nym-browser-extension/storage/src/error.rs b/nym-browser-extension/storage/src/error.rs index e05d0d5b9a5..88f3a605824 100644 --- a/nym-browser-extension/storage/src/error.rs +++ b/nym-browser-extension/storage/src/error.rs @@ -1,9 +1,9 @@ // Copyright 2023 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 +use nym_wasm_storage::error::StorageError; +use nym_wasm_utils::wasm_error; use thiserror::Error; -use wasm_storage::error::StorageError; -use wasm_utils::wasm_error; #[derive(Debug, Error)] pub enum ExtensionStorageError { diff --git a/nym-browser-extension/storage/src/lib.rs b/nym-browser-extension/storage/src/lib.rs index d8bd0d694ee..94e5809cc8b 100644 --- a/nym-browser-extension/storage/src/lib.rs +++ b/nym-browser-extension/storage/src/lib.rs @@ -14,4 +14,4 @@ pub use error::ExtensionStorageError; pub use storage::ExtensionStorage; #[cfg(target_arch = "wasm32")] -pub use wasm_utils::set_panic_hook; +pub use nym_wasm_utils::set_panic_hook; diff --git a/nym-browser-extension/storage/src/storage.rs b/nym-browser-extension/storage/src/storage.rs index ba484f46aad..88c93eaa59a 100644 --- a/nym-browser-extension/storage/src/storage.rs +++ b/nym-browser-extension/storage/src/storage.rs @@ -9,13 +9,13 @@ use crate::ExtensionStorageError; use js_sys::Promise; +use nym_wasm_storage::RawDbResult; +use nym_wasm_storage::{Build, Database, VersionChangeEvent, WasmStorage}; +use nym_wasm_utils::check_promise_result; +use nym_wasm_utils::error::{PromisableResult, PromisableResultError}; use std::sync::Arc; use wasm_bindgen::prelude::*; use wasm_bindgen_futures::future_to_promise; -use wasm_storage::RawDbResult; -use wasm_storage::{Build, Database, VersionChangeEvent, WasmStorage}; -use wasm_utils::check_promise_result; -use wasm_utils::error::{PromisableResult, PromisableResultError}; use zeroize::Zeroizing; const STORAGE_NAME: &str = "nym-extension-storage"; diff --git a/nym-credential-proxy/nym-credential-proxy-requests/Cargo.toml b/nym-credential-proxy/nym-credential-proxy-requests/Cargo.toml index 76f91373b89..dbe84bf6f1e 100644 --- a/nym-credential-proxy/nym-credential-proxy-requests/Cargo.toml +++ b/nym-credential-proxy/nym-credential-proxy-requests/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-credential-proxy-requests" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Request and response definitions for interacting with the Nym Credential Proxy" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -25,12 +26,12 @@ wasm-bindgen = { workspace = true, optional = true } ## openapi: utoipa = { workspace = true, optional = true, features = ["uuid"] } -nym-credentials = { path = "../../common/credentials" } -nym-credentials-interface = { path = "../../common/credentials-interface" } -nym-http-api-common = { path = "../../common/http-api-common", optional = true } -nym-http-api-client = { path = "../../common/http-api-client" } -nym-serde-helpers = { path = "../../common/serde-helpers", features = ["bs58"] } -nym-upgrade-mode-check = { path = "../../common/upgrade-mode-check" } +nym-credentials = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-http-api-common = { workspace = true, optional = true } +nym-http-api-client = { workspace = true } +nym-serde-helpers = { workspace = true, features = ["bs58"] } +nym-upgrade-mode-check = { workspace = true } [target."cfg(target_arch = \"wasm32\")".dependencies.wasmtimer] workspace = true @@ -43,4 +44,4 @@ openapi = ["utoipa", "nym-http-api-common/utoipa", "nym-upgrade-mode-check/opena tsify = ["dep:tsify", "wasm-bindgen"] [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/nym-credential-proxy/nym-credential-proxy/Cargo.toml b/nym-credential-proxy/nym-credential-proxy/Cargo.toml index c727488d374..3d81b37f0f1 100644 --- a/nym-credential-proxy/nym-credential-proxy/Cargo.toml +++ b/nym-credential-proxy/nym-credential-proxy/Cargo.toml @@ -8,6 +8,7 @@ documentation.workspace = true edition.workspace = true license.workspace = true rust-version.workspace = true +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -45,35 +46,35 @@ utoipa = { workspace = true, features = ["axum_extras", "time"] } utoipa-swagger-ui = { workspace = true, features = ["axum"] } zeroize.workspace = true -nym-bin-common = { path = "../../common/bin-common", features = [ +nym-bin-common = { workspace = true, features = [ "basic_tracing", ] } -nym-compact-ecash = { path = "../../common/nym_offline_compact_ecash" } -nym-config = { path = "../../common/config" } -nym-crypto = { path = "../../common/crypto", features = [ +nym-compact-ecash = { workspace = true } +nym-config = { workspace = true } +nym-crypto = { workspace = true, features = [ "asymmetric", "rand", "serde", ] } -nym-credentials = { path = "../../common/credentials" } -nym-credentials-interface = { path = "../../common/credentials-interface" } -nym-ecash-contract-common = { path = "../../common/cosmwasm-smart-contracts/ecash-contract" } -nym-http-api-common = { path = "../../common/http-api-common", features = [ +nym-credentials = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-ecash-contract-common = { workspace = true } +nym-http-api-common = { workspace = true, features = [ "utoipa", "middleware", ] } -nym-http-api-client = { path = "../../common/http-api-client", default-features = false } -nym-validator-client = { path = "../../common/client-libs/validator-client" } -nym-network-defaults = { path = "../../common/network-defaults" } +nym-http-api-client = { workspace = true } +nym-validator-client = { workspace = true } +nym-network-defaults = { workspace = true } -nym-credential-proxy-requests = { path = "../nym-credential-proxy-requests", features = [ +nym-credential-proxy-requests = { workspace = true, features = [ "openapi", ] } -nym-upgrade-mode-check = { path = "../../common/upgrade-mode-check" } -nym-ecash-signer-check = { path = "../../common/ecash-signer-check" } -nym-pemstore = { path = "../../common/pemstore" } +nym-upgrade-mode-check = { workspace = true } +nym-ecash-signer-check = { workspace = true } +nym-pemstore = { workspace = true } -nym-credential-proxy-lib = { path = "../../common/credential-proxy" } +nym-credential-proxy-lib = { workspace = true } [dev-dependencies] tempfile = { workspace = true } diff --git a/nym-credential-proxy/vpn-api-lib-wasm/Cargo.toml b/nym-credential-proxy/vpn-api-lib-wasm/Cargo.toml index 8dc406eaf56..52baabd2cb8 100644 --- a/nym-credential-proxy/vpn-api-lib-wasm/Cargo.toml +++ b/nym-credential-proxy/vpn-api-lib-wasm/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-vpn-api-lib-wasm" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +publish = false [lib] crate-type = ["cdylib", "rlib"] @@ -27,12 +28,11 @@ tsify = { workspace = true, features = ["js"] } serde-wasm-bindgen = { workspace = true } # NYM: -nym-bin-common = { path = "../../common/bin-common" } -nym-crypto = { path = "../../common/crypto", features = ["asymmetric"] } -nym-compact-ecash = { path = "../../common/nym_offline_compact_ecash" } -nym-credentials = { path = "../../common/credentials" } -nym-credentials-interface = { path = "../../common/credentials-interface" } -nym-ecash-time = { path = "../../common/ecash-time", features = ["expiration"] } -nym-credential-proxy-requests = { path = "../nym-credential-proxy-requests", default-features = false, features = ["tsify"] } -wasm-utils = { path = "../../common/wasm/utils" } - +nym-bin-common = { workspace = true } +nym-crypto = { workspace = true, features = ["asymmetric"] } +nym-compact-ecash = { workspace = true } +nym-credentials = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-ecash-time = { workspace = true, features = ["expiration"] } +nym-credential-proxy-requests = { workspace = true, features = ["tsify"] } +nym-wasm-utils = { workspace = true } diff --git a/nym-credential-proxy/vpn-api-lib-wasm/src/error.rs b/nym-credential-proxy/vpn-api-lib-wasm/src/error.rs index 73222540645..5e1255bdbc8 100644 --- a/nym-credential-proxy/vpn-api-lib-wasm/src/error.rs +++ b/nym-credential-proxy/vpn-api-lib-wasm/src/error.rs @@ -1,9 +1,9 @@ // Copyright 2024 Nym Technologies SA // SPDX-License-Identifier: GPL-3.0-only +use nym_wasm_utils::wasm_error; use serde_wasm_bindgen::Error; use thiserror::Error; -use wasm_utils::wasm_error; #[derive(Debug, Error)] pub enum VpnApiLibError { diff --git a/nym-credential-proxy/vpn-api-lib-wasm/src/lib.rs b/nym-credential-proxy/vpn-api-lib-wasm/src/lib.rs index abdff1bfe84..00ca53805a7 100644 --- a/nym-credential-proxy/vpn-api-lib-wasm/src/lib.rs +++ b/nym-credential-proxy/vpn-api-lib-wasm/src/lib.rs @@ -19,12 +19,12 @@ use nym_credentials::{ use nym_credentials_interface::TicketType; use nym_crypto::asymmetric::ed25519; use nym_ecash_time::{EcashTime, ecash_default_expiration_date}; +use nym_wasm_utils::console_error; use serde::{Deserialize, Serialize}; use std::collections::HashMap; use time::Date; use tsify::Tsify; use wasm_bindgen::prelude::*; -use wasm_utils::console_error; use zeroize::Zeroizing; pub mod error; @@ -267,11 +267,11 @@ pub struct FullSerialisedNymIssuedTicketbook { #[wasm_bindgen(start)] pub fn main() { - wasm_utils::console_log!("[rust main]: rust module loaded"); - wasm_utils::console_log!( + nym_wasm_utils::console_log!("[rust main]: rust module loaded"); + nym_wasm_utils::console_log!( "vpn-api-lib version used:\n{}", nym_bin_common::bin_info!().pretty_print() ); - wasm_utils::console_log!("[rust main]: setting panic hook"); - wasm_utils::set_panic_hook(); + nym_wasm_utils::console_log!("[rust main]: setting panic hook"); + nym_wasm_utils::set_panic_hook(); } diff --git a/nym-data-observatory/Cargo.toml b/nym-data-observatory/Cargo.toml index d23b40f20de..2eefa881ef4 100644 --- a/nym-data-observatory/Cargo.toml +++ b/nym-data-observatory/Cargo.toml @@ -11,6 +11,7 @@ documentation.workspace = true edition.workspace = true license.workspace = true rust-version.workspace = true +publish = false [dependencies] anyhow = { workspace = true } @@ -19,13 +20,13 @@ axum = { workspace = true, features = ["tokio"] } chrono = { workspace = true } clap = { workspace = true, features = ["cargo", "derive", "env"] } cosmrs = { workspace = true } -nym-config = { path = "../common/config" } -nym-bin-common = { path = "../common/bin-common", features = ["output_format"] } -nym-network-defaults = { path = "../common/network-defaults" } -nym-task = { path = "../common/task" } -nym-validator-client = { path = "../common/client-libs/validator-client" } +nym-config = { workspace = true } +nym-bin-common = { workspace = true, features = ["output_format"] } +nym-network-defaults = { workspace = true } +nym-task = { workspace = true } +nym-validator-client = { workspace = true } nyxd-scraper-psql = { path = "../common/nyxd-scraper-psql" } -nyxd-scraper-shared = { path = "../common/nyxd-scraper-shared" } +nyxd-scraper-shared = { workspace = true } reqwest = { workspace = true, features = ["rustls-tls"] } schemars = { workspace = true } serde = { workspace = true, features = ["derive"] } @@ -49,4 +50,4 @@ anyhow = { workspace = true } blake3 = { workspace = true } glob = { workspace = true } tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } -sqlx = { workspace = true, features = ["runtime-tokio-rustls", "postgres"] } \ No newline at end of file +sqlx = { workspace = true, features = ["runtime-tokio-rustls", "postgres"] } diff --git a/nym-gateway-probe/Cargo.toml b/nym-gateway-probe/Cargo.toml index 5c91e350782..cf6781b4909 100644 --- a/nym-gateway-probe/Cargo.toml +++ b/nym-gateway-probe/Cargo.toml @@ -7,6 +7,7 @@ homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +publish = false [lints] workspace = true @@ -41,27 +42,27 @@ x25519-dalek = { workspace = true, features = [ "static_secrets", ] } -nym-authenticator-requests = { path = "../common/authenticator-requests" } -nym-bandwidth-controller = { path = "../common/bandwidth-controller" } -nym-bin-common = { path = "../common/bin-common" } -nym-client-core = { path = "../common/client-core" } -nym-crypto = { path = "../common/crypto" } -nym-config = { path = "../common/config" } +nym-authenticator-requests = { workspace = true } +nym-bandwidth-controller = { workspace = true } +nym-bin-common = { workspace = true } +nym-client-core = { workspace = true } +nym-crypto = { workspace = true } +nym-config = { workspace = true } nym-connection-monitor = { path = "../common/nym-connection-monitor" } -nym-credentials-interface = { path = "../common/credentials-interface" } -nym-credential-utils = { path = "../common/credential-utils" } -nym-ip-packet-client = { path = "../nym-ip-packet-client" } -nym-authenticator-client = { path = "../nym-authenticator-client" } -nym-ip-packet-requests = { path = "../common/ip-packet-requests" } -nym-sdk = { path = "../sdk/rust/nym-sdk" } -nym-validator-client = { path = "../common/client-libs/validator-client" } -nym-credentials = { path = "../common/credentials" } +nym-credentials-interface = { workspace = true } +nym-credential-utils = { workspace = true } +nym-ip-packet-client = { workspace = true } +nym-authenticator-client = { workspace = true } +nym-ip-packet-requests = { workspace = true } +nym-sdk = { workspace = true } +nym-validator-client = { workspace = true } +nym-credentials = { workspace = true } nym-http-api-client-macro = { path = "../common/http-api-client-macro" } nym-http-api-client = { path = "../common/http-api-client" } nym-node-status-client = { path = "../nym-node-status-api/nym-node-status-client" } # TEMP: REMOVE BEFORE PR -nym-topology = { path = "../common/topology" } +nym-topology = { workspace = true } [build-dependencies] anyhow = { workspace = true } diff --git a/nym-ip-packet-client/Cargo.toml b/nym-ip-packet-client/Cargo.toml index 86b0e218302..e631a759ca5 100644 --- a/nym-ip-packet-client/Cargo.toml +++ b/nym-ip-packet-client/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-ip-packet-client" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Nym's implementation of a client that sends and receives IP packets" [lints] workspace = true @@ -20,5 +21,5 @@ tokio-util.workspace = true tokio.workspace = true tracing.workspace = true -nym-sdk = { path = "../sdk/rust/nym-sdk" } -nym-ip-packet-requests = { path = "../common/ip-packet-requests" } +nym-sdk = { workspace = true } +nym-ip-packet-requests = { workspace = true } diff --git a/nym-network-monitor/Cargo.toml b/nym-network-monitor/Cargo.toml index a84a5f3c022..5f68dec06ea 100644 --- a/nym-network-monitor/Cargo.toml +++ b/nym-network-monitor/Cargo.toml @@ -7,6 +7,7 @@ homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -30,15 +31,15 @@ utoipa-swagger-ui = { workspace = true, features = ["axum"] } tokio-postgres = { workspace = true } # internal -nym-bin-common = { path = "../common/bin-common", features = ["basic_tracing"] } -nym-client-core = { path = "../common/client-core" } -nym-crypto = { path = "../common/crypto" } -nym-network-defaults = { path = "../common/network-defaults" } -nym-gateway-requests = { path = "../common/gateway-requests" } -nym-sdk = { path = "../sdk/rust/nym-sdk" } -nym-sphinx = { path = "../common/nymsphinx" } -nym-topology = { path = "../common/topology" } -nym-types = { path = "../common/types" } -nym-validator-client = { path = "../common/client-libs/validator-client" } -nym-http-api-client = { path = "../common/http-api-client" } -nym-mixnet-contract-common = { path = "../common/cosmwasm-smart-contracts/mixnet-contract" } +nym-bin-common = { workspace = true, features = ["basic_tracing"] } +nym-client-core = { workspace = true } +nym-crypto = { workspace = true } +nym-network-defaults = { workspace = true } +nym-gateway-requests = { workspace = true } +nym-sdk = { workspace = true } +nym-sphinx = { workspace = true } +nym-topology = { workspace = true } +nym-types = { workspace = true } +nym-validator-client = { workspace = true } +nym-http-api-client = { workspace = true } +nym-mixnet-contract-common = { workspace = true } diff --git a/nym-node-status-api/nym-node-status-agent/Cargo.toml b/nym-node-status-api/nym-node-status-agent/Cargo.toml index b7840cd9a6c..f866a4aacba 100644 --- a/nym-node-status-api/nym-node-status-agent/Cargo.toml +++ b/nym-node-status-api/nym-node-status-agent/Cargo.toml @@ -12,13 +12,14 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +publish = false [dependencies] anyhow = { workspace = true } clap = { workspace = true, features = ["derive", "env"] } futures = { workspace = true } -nym-bin-common = { path = "../../common/bin-common", features = ["models"] } -nym-crypto = { path = "../../common/crypto", features = ["asymmetric", "rand"] } +nym-bin-common = { workspace = true, features = ["models"] } +nym-crypto = { workspace = true, features = ["asymmetric", "rand"] } nym-node-status-client = { path = "../nym-node-status-client" } rand = { workspace = true } diff --git a/nym-node-status-api/nym-node-status-api/Cargo.toml b/nym-node-status-api/nym-node-status-api/Cargo.toml index df6d5c12cfe..28eb90c2c73 100644 --- a/nym-node-status-api/nym-node-status-api/Cargo.toml +++ b/nym-node-status-api/nym-node-status-api/Cargo.toml @@ -11,6 +11,7 @@ documentation.workspace = true edition.workspace = true license.workspace = true rust-version.workspace = true +publish = false [dependencies] ammonia = { workspace = true } @@ -26,22 +27,22 @@ humantime = { workspace = true } itertools = { workspace = true } moka = { workspace = true, features = ["future"] } -nym-credentials = { path = "../../common/credentials" } -nym-credential-proxy-lib = { path = "../../common/credential-proxy" } -nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common" } -nym-mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract", features = ["utoipa"] } -nym-bin-common = { path = "../../common/bin-common", features = ["models"] } +nym-credentials = { workspace = true } +nym-credential-proxy-lib = { workspace = true } +nym-contracts-common = { workspace = true } +nym-mixnet-contract-common = { workspace = true, features = ["utoipa"] } +nym-bin-common = { workspace = true, features = ["models"] } nym-node-status-client = { path = "../nym-node-status-client" } -nym-crypto = { path = "../../common/crypto", features = ["asymmetric", "serde"] } -nym-http-api-client = { path = "../../common/http-api-client" } -nym-http-api-common = { path = "../../common/http-api-common", features = ["middleware"] } -nym-network-defaults = { path = "../../common/network-defaults" } -nym-serde-helpers = { path = "../../common/serde-helpers" } -nym-statistics-common = { path = "../../common/statistics" } -nym-validator-client = { path = "../../common/client-libs/validator-client" } -nym-task = { path = "../../common/task" } -nym-node-requests = { path = "../../nym-node/nym-node-requests", features = ["openapi"] } -nym-ecash-time = { path = "../../common/ecash-time", features = ["expiration"] } +nym-crypto = { workspace = true, features = ["asymmetric", "serde"] } +nym-http-api-client = { workspace = true } +nym-http-api-common = { workspace = true, features = ["middleware"] } +nym-network-defaults = { workspace = true } +nym-serde-helpers = { workspace = true } +nym-statistics-common = { workspace = true } +nym-validator-client = { workspace = true } +nym-task = { workspace = true } +nym-node-requests = { workspace = true, features = ["openapi", "client"] } +nym-ecash-time = { workspace = true, features = ["expiration"] } rand = { workspace = true } rand_chacha = { workspace = true } @@ -68,7 +69,7 @@ utoipa-swagger-ui = { workspace = true, features = ["axum"] } utoipauto = { workspace = true } zeroize = { workspace = true } -nym-node-metrics = { path = "../../nym-node/nym-node-metrics" } +nym-node-metrics = { workspace = true } [build-dependencies] anyhow = { workspace = true } diff --git a/nym-node-status-api/nym-node-status-client/Cargo.toml b/nym-node-status-api/nym-node-status-client/Cargo.toml index 881cfa159e0..194ac613571 100644 --- a/nym-node-status-api/nym-node-status-client/Cargo.toml +++ b/nym-node-status-api/nym-node-status-client/Cargo.toml @@ -12,13 +12,14 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +publish = false [dependencies] anyhow = { workspace = true } bs58 = { workspace = true } bincode = { workspace = true } -nym-crypto = { path = "../../common/crypto", features = ["asymmetric", "serde", ] } -nym-credentials = { path = "../../common/credentials" } +nym-crypto = { workspace = true, features = ["asymmetric", "serde", ] } +nym-credentials = { workspace = true } reqwest = { workspace = true, features = ["json"] } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } diff --git a/nym-node/Cargo.toml b/nym-node/Cargo.toml index 3e56e037d3d..b86190aae20 100644 --- a/nym-node/Cargo.toml +++ b/nym-node/Cargo.toml @@ -10,6 +10,7 @@ homepage.workspace = true documentation.workspace = true edition.workspace = true license = "GPL-3.0" +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -49,39 +50,39 @@ zeroize = { workspace = true, features = ["zeroize_derive"] } cupid = { workspace = true } sysinfo = { workspace = true } -nym-bin-common = { path = "../common/bin-common", features = [ +nym-bin-common = { workspace = true, features = [ "basic_tracing", "output_format", ] } -nym-client-core-config-types = { path = "../common/client-core/config-types", features = [ +nym-client-core-config-types = { workspace = true, features = [ "disk-persistence", ] } -nym-config = { path = "../common/config" } -nym-credential-verification = { path = "../common/credential-verification" } -nym-crypto = { path = "../common/crypto", features = ["asymmetric", "rand"] } -nym-nonexhaustive-delayqueue = { path = "../common/nonexhaustive-delayqueue" } -nym-mixnet-client = { path = "../common/client-libs/mixnet-client" } -nym-noise = { path = "../common/nymnoise" } -nym-noise-keys = { path = "../common/nymnoise/keys" } -nym-pemstore = { path = "../common/pemstore" } -nym-sphinx-acknowledgements = { path = "../common/nymsphinx/acknowledgements" } -nym-sphinx-addressing = { path = "../common/nymsphinx/addressing" } -nym-sphinx-framing = { path = "../common/nymsphinx/framing" } -nym-sphinx-types = { path = "../common/nymsphinx/types" } -nym-sphinx-forwarding = { path = "../common/nymsphinx/forwarding" } -nym-sphinx-routing = { path = "../common/nymsphinx/routing" } -nym-sphinx-params = { path = "../common/nymsphinx/params" } -nym-statistics-common = { path = "../common/statistics" } -nym-task = { path = "../common/task" } -nym-types = { path = "../common/types" } -nym-validator-client = { path = "../common/client-libs/validator-client" } -nym-wireguard = { path = "../common/wireguard" } -nym-wireguard-types = { path = "../common/wireguard-types", default-features = false } -nym-verloc = { path = "../common/verloc" } -nym-metrics = { path = "../common/nym-metrics" } -nym-gateway-stats-storage = { path = "../common/gateway-stats-storage" } -nym-topology = { path = "../common/topology" } -nym-http-api-client = { path = "../common/http-api-client" } +nym-config = { workspace = true } +nym-credential-verification = { workspace = true } +nym-crypto = { workspace = true, features = ["asymmetric", "rand"] } +nym-nonexhaustive-delayqueue = { workspace = true } +nym-mixnet-client = { workspace = true } +nym-noise = { workspace = true } +nym-noise-keys = { workspace = true } +nym-pemstore = { workspace = true } +nym-sphinx-acknowledgements = { workspace = true } +nym-sphinx-addressing = { workspace = true } +nym-sphinx-framing = { workspace = true } +nym-sphinx-types = { workspace = true } +nym-sphinx-forwarding = { workspace = true } +nym-sphinx-routing = { workspace = true } +nym-sphinx-params = { workspace = true } +nym-statistics-common = { workspace = true } +nym-task = { workspace = true } +nym-types = { workspace = true } +nym-validator-client = { workspace = true } +nym-wireguard = { workspace = true } +nym-wireguard-types = { workspace = true } +nym-verloc = { workspace = true } +nym-metrics = { workspace = true} +nym-gateway-stats-storage = { workspace = true } +nym-topology = { workspace = true } +nym-http-api-client = { workspace = true } # http server # useful for `#[axum_macros::debug_handler]` @@ -92,15 +93,15 @@ tower-http = { workspace = true, features = ["fs"] } utoipa = { workspace = true, features = ["axum_extras", "time"] } utoipa-swagger-ui = { workspace = true, features = ["axum"] } -nym-http-api-common = { path = "../common/http-api-common", features = [ +nym-http-api-common = { workspace = true, features = [ "utoipa", "output", "middleware", ] } -nym-node-requests = { path = "nym-node-requests", default-features = false, features = [ +nym-node-requests = { workspace = true, default-features = false, features = [ "openapi", ] } -nym-node-metrics = { path = "nym-node-metrics" } +nym-node-metrics = { workspace = true } # nodes: nym-gateway = { path = "../gateway" } diff --git a/nym-node/nym-node-metrics/Cargo.toml b/nym-node/nym-node-metrics/Cargo.toml index 77970401149..28b32ac5e81 100644 --- a/nym-node/nym-node-metrics/Cargo.toml +++ b/nym-node/nym-node-metrics/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-node-metrics" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Crate defining various metrics for Nym Nodes (Mix Nodes and Gateways) such as ongoing connections, packets mixed, and packets dropped" [dependencies] dashmap = { workspace = true } @@ -16,5 +17,5 @@ time = { workspace = true } strum = { workspace = true } tracing = { workspace = true } -nym-metrics = { path = "../../common/nym-metrics" } -nym-statistics-common = { path = "../../common/statistics" } \ No newline at end of file +nym-metrics = { workspace = true } +nym-statistics-common = { workspace = true } diff --git a/nym-node/nym-node-requests/Cargo.toml b/nym-node/nym-node-requests/Cargo.toml index ad1ed3013a9..14a84033796 100644 --- a/nym-node/nym-node-requests/Cargo.toml +++ b/nym-node/nym-node-requests/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-node-requests" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Nym Node API endpoint definitions and functions" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -22,31 +23,31 @@ time = { workspace = true, features = ["serde", "formatting", "parsing"] } thiserror = { workspace = true } url = { workspace = true, features = ["serde"] } -nym-crypto = { path = "../../common/crypto", features = [ +nym-crypto = { workspace = true, features = [ "asymmetric", "serde", ] } -nym-exit-policy = { path = "../../common/exit-policy" } -nym-noise-keys = { path = "../../common/nymnoise/keys" } -nym-wireguard-types = { path = "../../common/wireguard-types", default-features = false } -nym-upgrade-mode-check = { path = "../../common/upgrade-mode-check", features = ["openapi"] } +nym-exit-policy = { workspace = true } +nym-noise-keys = { workspace = true } +nym-wireguard-types = { workspace = true } +nym-upgrade-mode-check = { workspace = true, features = ["openapi"] } # feature-specific dependencies: ## client: async-trait = { workspace = true, optional = true } -nym-http-api-client = { path = "../../common/http-api-client", optional = true } +nym-http-api-client = { workspace = true, optional = true } ## openapi: utoipa = { workspace = true, features = ["time"], optional = true } -nym-bin-common = { path = "../../common/bin-common", features = [ +nym-bin-common = { workspace = true, features = [ "bin_info_schema", ] } [dev-dependencies] tokio = { workspace = true, features = ["full"] } rand_chacha = { workspace = true } -nym-crypto = { path = "../../common/crypto", features = ["rand"] } +nym-crypto = { workspace = true, features = ["rand"] } [features] diff --git a/nym-outfox/Cargo.toml b/nym-outfox/Cargo.toml index 0c3c3e87635..8d7855bc48f 100644 --- a/nym-outfox/Cargo.toml +++ b/nym-outfox/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-outfox" -version = "0.1.0" +version.workspace = true description = "Outfox package format" edition = { workspace = true } authors = { workspace = true } diff --git a/nym-registration-client/Cargo.toml b/nym-registration-client/Cargo.toml index e0e07ff9c7c..fed6e5f1295 100644 --- a/nym-registration-client/Cargo.toml +++ b/nym-registration-client/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-registration-client" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +description = "Crate for dealing with Mixnet and Wireguard registration between Nym clients and Gateways" [lints] workspace = true @@ -20,11 +21,11 @@ tracing.workspace = true typed-builder.workspace = true url.workspace = true -nym-authenticator-client = { path = "../nym-authenticator-client" } -nym-bandwidth-controller = { path = "../common/bandwidth-controller" } -nym-credential-storage = { path = "../common/credential-storage" } -nym-credentials-interface = { path = "../common/credentials-interface" } -nym-ip-packet-client = { path = "../nym-ip-packet-client" } -nym-registration-common = { path = "../common/registration" } -nym-sdk = { path = "../sdk/rust/nym-sdk" } -nym-validator-client = { path = "../common/client-libs/validator-client" } +nym-authenticator-client = { workspace = true } +nym-bandwidth-controller = { workspace = true } +nym-credential-storage = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-ip-packet-client = { workspace = true } +nym-registration-common = { workspace = true } +nym-sdk = { workspace = true } +nym-validator-client = { workspace = true } diff --git a/nym-signers-monitor/Cargo.toml b/nym-signers-monitor/Cargo.toml index d043aa28717..56adfc4ac55 100644 --- a/nym-signers-monitor/Cargo.toml +++ b/nym-signers-monitor/Cargo.toml @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +publish = false [dependencies] anyhow = { workspace = true } @@ -20,11 +21,11 @@ tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } tracing = { workspace = true } url = { workspace = true } -nym-bin-common = { path = "../common/bin-common", features = ["output_format", "basic_tracing"] } -nym-ecash-signer-check = { path = "../common/ecash-signer-check" } -nym-network-defaults = { path = "../common/network-defaults" } -nym-task = { path = "../common/task" } -nym-validator-client = { path = "../common/client-libs/validator-client" } +nym-bin-common = { workspace = true, features = ["output_format", "basic_tracing"] } +nym-ecash-signer-check = { workspace = true } +nym-network-defaults = { workspace = true } +nym-task = { workspace = true } +nym-validator-client = { workspace = true } zulip-client = { path = "../common/zulip-client" } [lints] diff --git a/sqlx-pool-guard/Cargo.toml b/nym-sqlx-pool-guard/Cargo.toml similarity index 80% rename from sqlx-pool-guard/Cargo.toml rename to nym-sqlx-pool-guard/Cargo.toml index cef202e4dfa..3eecfffb997 100644 --- a/sqlx-pool-guard/Cargo.toml +++ b/nym-sqlx-pool-guard/Cargo.toml @@ -1,8 +1,12 @@ [package] -name = "sqlx-pool-guard" -version = "0.1.0" +name = "nym-sqlx-pool-guard" +version.workspace = true edition = "2024" license.workspace = true +description = "Platform-specific functions for SQLX dbs" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true [lints] workspace = true diff --git a/sqlx-pool-guard/src/apple.rs b/nym-sqlx-pool-guard/src/apple.rs similarity index 100% rename from sqlx-pool-guard/src/apple.rs rename to nym-sqlx-pool-guard/src/apple.rs diff --git a/sqlx-pool-guard/src/lib.rs b/nym-sqlx-pool-guard/src/lib.rs similarity index 100% rename from sqlx-pool-guard/src/lib.rs rename to nym-sqlx-pool-guard/src/lib.rs diff --git a/sqlx-pool-guard/src/linux.rs b/nym-sqlx-pool-guard/src/linux.rs similarity index 100% rename from sqlx-pool-guard/src/linux.rs rename to nym-sqlx-pool-guard/src/linux.rs diff --git a/sqlx-pool-guard/src/windows.rs b/nym-sqlx-pool-guard/src/windows.rs similarity index 100% rename from sqlx-pool-guard/src/windows.rs rename to nym-sqlx-pool-guard/src/windows.rs diff --git a/nym-statistics-api/Cargo.toml b/nym-statistics-api/Cargo.toml index be52fc8b388..d6035035850 100644 --- a/nym-statistics-api/Cargo.toml +++ b/nym-statistics-api/Cargo.toml @@ -11,7 +11,7 @@ documentation.workspace = true edition.workspace = true license.workspace = true rust-version.workspace = true - +publish = false [dependencies] anyhow.workspace = true @@ -38,17 +38,17 @@ utoipa-swagger-ui = { workspace = true, features = ["axum"] } utoipauto.workspace = true #internal -nym-bin-common = { path = "../common/bin-common" } -nym-http-api-common = { path = "../common/http-api-common", features = [ +nym-bin-common = { workspace = true } +nym-http-api-common = { workspace = true, features = [ "middleware", ] } -nym-statistics-common = { path = "../common/statistics", features = [ +nym-statistics-common = { workspace = true, features = [ "openapi", ] } -nym-task = { path = "../common/task" } +nym-task = { workspace = true } -nym-http-api-client = { path = "../common/http-api-client" } -nym-validator-client = { path = "../common/client-libs/validator-client" } +nym-http-api-client = { workspace = true } +nym-validator-client = { workspace = true } [build-dependencies] anyhow = { workspace = true } diff --git a/nym-validator-rewarder/Cargo.toml b/nym-validator-rewarder/Cargo.toml index 0655bd21eff..bf2fc671f83 100644 --- a/nym-validator-rewarder/Cargo.toml +++ b/nym-validator-rewarder/Cargo.toml @@ -7,6 +7,7 @@ homepage.workspace = true documentation.workspace = true edition.workspace = true license = "GPL-3.0" +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -32,22 +33,22 @@ humantime = { workspace = true } humantime-serde.workspace = true # internal -nym-bin-common = { path = "../common/bin-common", features = ["output_format", "basic_tracing"] } -nym-config = { path = "../common/config" } -nym-ecash-time = { path = "../common/ecash-time" } -nym-contracts-common = { path = "../common/cosmwasm-smart-contracts/contracts-common" } -nym-compact-ecash = { path = "../common/nym_offline_compact_ecash" } -nym-crypto = { path = "../common/crypto", features = ["asymmetric", "rand"] } -nym-credentials = { path = "../common/credentials" } -nym-network-defaults = { path = "../common/network-defaults" } -nym-task = { path = "../common/task" } -nym-validator-client = { path = "../common/client-libs/validator-client" } -nym-http-api-client = { path = "../common/http-api-client" } -nym-coconut-dkg-common = { path = "../common/cosmwasm-smart-contracts/coconut-dkg" } +nym-bin-common = { workspace = true, features = ["output_format", "basic_tracing"] } +nym-config = { workspace = true } +nym-ecash-time = { workspace = true } +nym-contracts-common = { workspace = true } +nym-compact-ecash = { workspace = true } +nym-crypto = { workspace = true, features = ["asymmetric", "rand"] } +nym-credentials = { workspace = true } +nym-network-defaults = { workspace = true } +nym-task = { workspace = true } +nym-validator-client = { workspace = true } +nym-http-api-client = { workspace = true } +nym-coconut-dkg-common = { workspace = true } nyxd-scraper-sqlite = { path = "../common/nyxd-scraper-sqlite" } -nym-ticketbooks-merkle = { path = "../common/ticketbooks-merkle" } -nym-serde-helpers = { path = "../common/serde-helpers", features = ["base64"] } -nym-pemstore = { path = "../common/pemstore" } +nym-ticketbooks-merkle = { workspace = true } +nym-serde-helpers = { workspace = true, features = ["base64"] } +nym-pemstore = { workspace = true } [build-dependencies] anyhow = { workspace = true } @@ -56,7 +57,7 @@ tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } [dev-dependencies] rand_chacha = { workspace = true } -nym-credentials-interface = { path = "../common/credentials-interface" } +nym-credentials-interface = { workspace = true } [lints] workspace = true diff --git a/nyx-chain-watcher/Cargo.toml b/nyx-chain-watcher/Cargo.toml index 3a2f09149b5..479d24460ef 100644 --- a/nyx-chain-watcher/Cargo.toml +++ b/nyx-chain-watcher/Cargo.toml @@ -12,6 +12,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +publish = false [dependencies] anyhow = { workspace = true } @@ -19,11 +20,11 @@ async-trait.workspace = true axum = { workspace = true, features = ["tokio"] } chrono = { workspace = true } clap = { workspace = true, features = ["cargo", "derive", "env"] } -nym-config = { path = "../common/config" } -nym-bin-common = { path = "../common/bin-common", features = ["output_format"] } -nym-network-defaults = { path = "../common/network-defaults" } -nym-task = { path = "../common/task" } -nym-validator-client = { path = "../common/client-libs/validator-client" } +nym-config = { workspace = true } +nym-bin-common = { workspace = true, features = ["output_format"] } +nym-network-defaults = { workspace = true } +nym-task = { workspace = true } +nym-validator-client = { workspace = true } nyxd-scraper-sqlite = { path = "../common/nyxd-scraper-sqlite" } reqwest = { workspace = true, features = ["rustls-tls"] } schemars = { workspace = true } diff --git a/sdk/ffi/cpp/Cargo.toml b/sdk/ffi/cpp/Cargo.toml index 8ac5f608db2..307f669a155 100644 --- a/sdk/ffi/cpp/Cargo.toml +++ b/sdk/ffi/cpp/Cargo.toml @@ -1,8 +1,12 @@ [package] name = "nym-cpp-ffi" -version = "0.1.2" +version.workspace = true edition = "2021" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true license.workspace = true +description = "C++ FFI bindings for Nym Rust SDK" [lib] name = "nym_cpp_ffi" @@ -12,10 +16,10 @@ crate-type = ["cdylib"] # Async runtime tokio = { workspace = true, features = ["full"] } # Nym clients, addressing, packet format, common tools (logging), ffi shared -nym-sdk = { path = "../../rust/nym-sdk/" } -nym-bin-common = { path = "../../../common/bin-common", features = ["basic_tracing"] } -nym-sphinx-anonymous-replies = { path = "../../../common/nymsphinx/anonymous-replies" } -nym-ffi-shared = { path = "../shared" } +nym-sdk = { workspace = true } +nym-bin-common = { workspace = true, features = ["basic_tracing"] } +nym-sphinx-anonymous-replies = { workspace = true } +nym-ffi-shared = { workspace = true } lazy_static = { workspace = true } # error handling anyhow = { workspace = true } diff --git a/sdk/ffi/go/Cargo.toml b/sdk/ffi/go/Cargo.toml index 3366f424a5c..76b1e91a57d 100644 --- a/sdk/ffi/go/Cargo.toml +++ b/sdk/ffi/go/Cargo.toml @@ -1,8 +1,12 @@ [package] name = "nym-go-ffi" -version = "0.2.2" +version.workspace = true edition = "2021" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true license.workspace = true +description = "Go FFI bindings for Nym Rust SDK" [lib] crate-type = ["cdylib"] @@ -12,11 +16,11 @@ name = "nym_go_ffi" # Bindgen uniffi = { workspace = true, features = ["cli"] } # Nym clients, addressing, packet format, common tools (logging), ffi shared -nym-sdk = { path = "../../rust/nym-sdk/" } -nym-crypto = { path = "../../../common/crypto" } -nym-bin-common = { path = "../../../common/bin-common", features = ["basic_tracing"] } -nym-sphinx-anonymous-replies = { path = "../../../common/nymsphinx/anonymous-replies" } -nym-ffi-shared = { path = "../shared" } +nym-sdk = { workspace = true } +nym-crypto = { workspace = true } +nym-bin-common = { workspace = true, features = ["basic_tracing"] } +nym-sphinx-anonymous-replies = { workspace = true } +nym-ffi-shared = { workspace = true } # Async runtime tokio = { workspace = true, features = ["full"] } lazy_static = { workspace = true } diff --git a/sdk/ffi/shared/Cargo.toml b/sdk/ffi/shared/Cargo.toml index e409035681b..d5e3434892a 100644 --- a/sdk/ffi/shared/Cargo.toml +++ b/sdk/ffi/shared/Cargo.toml @@ -1,17 +1,21 @@ [package] name = "nym-ffi-shared" -version = "0.2.1" +version.workspace = true edition = "2021" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true license.workspace = true +description = "Common crate for use by Rust SDK FFI crates" [dependencies] # Async runtime tokio = { workspace = true, features = ["full"] } # Nym clients, addressing, packet format, common tools (logging) -nym-sdk = { path = "../../rust/nym-sdk/" } -nym-bin-common = { path = "../../../common/bin-common" } -nym-crypto = { path = "../../../common/crypto" } -nym-sphinx-anonymous-replies = { path = "../../../common/nymsphinx/anonymous-replies" } +nym-sdk = { workspace = true } +nym-bin-common = { workspace = true } +nym-crypto = { workspace = true } +nym-sphinx-anonymous-replies = { workspace = true } # static var macro lazy_static = { workspace = true } # error handling diff --git a/sdk/rust/nym-sdk/Cargo.toml b/sdk/rust/nym-sdk/Cargo.toml index 523e5801c52..70e1441e8aa 100644 --- a/sdk/rust/nym-sdk/Cargo.toml +++ b/sdk/rust/nym-sdk/Cargo.toml @@ -1,8 +1,11 @@ [package] name = "nym-sdk" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true +description = "Nym's Rust SDK" +repository = "https://github.com/nymtech/nym/sdk/rust/nym-sdk/" +# documentation = "https://docs.rs/nym-sdk" Max: once we upload to crates.io and this is generated, this can be uncommented. # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -17,33 +20,33 @@ path = "src/tcp_proxy/bin/proxy_client.rs" [dependencies] async-trait = { workspace = true } bip39 = { workspace = true } -nym-client-core = { path = "../../../common/client-core", features = [ +nym-client-core = { workspace = true, features = [ "fs-credentials-storage", "fs-surb-storage", "fs-gateways-storage", ] } -nym-crypto = { path = "../../../common/crypto" } -nym-gateway-requests = { path = "../../../common/gateway-requests" } -nym-bandwidth-controller = { path = "../../../common/bandwidth-controller" } -nym-credentials = { path = "../../../common/credentials" } -nym-credentials-interface = { path = "../../../common/credentials-interface" } -nym-credential-storage = { path = "../../../common/credential-storage" } -nym-credential-utils = { path = "../../../common/credential-utils" } -nym-network-defaults = { path = "../../../common/network-defaults" } -nym-sphinx = { path = "../../../common/nymsphinx" } -nym-statistics-common = { path = "../../../common/statistics" } -nym-task = { path = "../../../common/task" } -nym-topology = { path = "../../../common/topology" } -nym-socks5-client-core = { path = "../../../common/socks5-client-core" } -nym-validator-client = { path = "../../../common/client-libs/validator-client", features = [ +nym-crypto = { workspace = true } +nym-gateway-requests = { workspace = true } +nym-bandwidth-controller = { workspace = true } +nym-credentials = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-credential-storage = { workspace = true } +nym-credential-utils = { workspace = true } +nym-network-defaults = { workspace = true } +nym-sphinx = { workspace = true } +nym-statistics-common = { workspace = true } +nym-task = { workspace = true } +nym-topology = { workspace = true } +nym-socks5-client-core = { workspace = true } +nym-validator-client = { workspace = true , features = [ "http-client", ] } -nym-http-api-client = { path = "../../../common/http-api-client" } -nym-socks5-requests = { path = "../../../common/socks5/requests" } -nym-ordered-buffer = { path = "../../../common/socks5/ordered-buffer" } -nym-service-providers-common = { path = "../../../service-providers/common" } -nym-sphinx-addressing = { path = "../../../common/nymsphinx/addressing" } -nym-bin-common = { path = "../../../common/bin-common", features = [ +nym-http-api-client = { workspace = true } +nym-socks5-requests = { workspace = true } +nym-ordered-buffer = { workspace = true } +nym-service-providers-common = { workspace = true } +nym-sphinx-addressing = { workspace = true } +nym-bin-common = { workspace = true, features = [ "basic_tracing", ] } bytecodec = { workspace = true } @@ -82,7 +85,7 @@ reqwest = { workspace = true, features = ["json", "socks"] } thiserror = { workspace = true } tokio = { workspace = true, features = ["full"] } time = { workspace = true } -nym-bin-common = { path = "../../../common/bin-common", features = ["basic_tracing"] } +nym-bin-common = {workspace = true, features = ["basic_tracing"] } # extra dependencies for libp2p examples #libp2p = { git = "https://github.com/ChainSafe/rust-libp2p.git", rev = "e3440d25681df380c9f0f8cfdcfd5ecc0a4f2fb6", features = [ "identify", "macros", "ping", "tokio", "tcp", "dns", "websocket", "noise", "mplex", "yamux", "gossipsub" ]} diff --git a/sdk/rust/nym-sdk/publishing.md b/sdk/rust/nym-sdk/publishing.md new file mode 100644 index 00000000000..546cf3aba84 --- /dev/null +++ b/sdk/rust/nym-sdk/publishing.md @@ -0,0 +1,13 @@ +# Publishing the SDK +## Setup / rationale wrt versioning +The Rust SDK has a relatively long (60+) workspace dependencies that have to be published alongside it. In order to make this easy to maintain, the versions of these workspace dependencies and the `nym-sdk` crate (as well as the version of basically all the crates in the monorepo workspace, excluding binaries, contracts, and tools / monitoring clients) are kept in sync. + +This version is defined in the `[workspace.package]` section of the root monorepo `Cargo.toml` file. Each of the workspace dependencies have their paths and versions (this has to be individually defined at the moment per-dependency, **this version needs to stay the same as the `workspace.package` version**) defined in the `[workspace.dependencies]` section of the root monorepo `Cargo.toml` file. + +We have attempted to automate this as much as possible, but due to limitations in tools like `cargo-smart-release` and publishing a subset of a workspace, this is the initial version of publication logic. + +## When Developing +If you add a workspace dependency to the SDK when developing, make sure to add this to the workspace dependencies in the root monorepo `Cargo.toml`. + +## Publishing +TODO diff --git a/sdk/rust/nym-sdk/src/client_pool.rs b/sdk/rust/nym-sdk/src/client_pool.rs index 0a2471275b3..ae3d1a200d5 100644 --- a/sdk/rust/nym-sdk/src/client_pool.rs +++ b/sdk/rust/nym-sdk/src/client_pool.rs @@ -1,3 +1,6 @@ +//! A variable-size pool of ephemeral Nym Clients to quickly grab and use. +//! +//! //! use crate::mixnet::{MixnetClient, MixnetClientBuilder, NymNetworkDetails}; //! use anyhow::Result; //! use std::fmt; diff --git a/service-providers/common/Cargo.toml b/service-providers/common/Cargo.toml index f8fb5b201bc..ad8b2b7574b 100644 --- a/service-providers/common/Cargo.toml +++ b/service-providers/common/Cargo.toml @@ -1,14 +1,18 @@ [package] name = "nym-service-providers-common" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true +description = "Common crate for Nym Service Providers" +repository.workspace = true +homepage.workspace = true +documentation.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -nym-bin-common = { path = "../../common/bin-common" } -nym-sphinx-anonymous-replies = { path = "../../common/nymsphinx/anonymous-replies" } +nym-bin-common = { workspace = true } +nym-sphinx-anonymous-replies = { workspace = true } async-trait = { workspace = true } log = { workspace = true } @@ -21,6 +25,5 @@ serde_json = { workspace = true } anyhow = { workspace = true } tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } -nym-sdk = { path = "../../sdk/rust/nym-sdk" } -nym-socks5-requests = { path = "../../common/socks5/requests" } - +nym-sdk = { workspace = true } +nym-socks5-requests = { workspace = true } diff --git a/service-providers/ip-packet-router/Cargo.toml b/service-providers/ip-packet-router/Cargo.toml index c69d1caa200..149453da68d 100644 --- a/service-providers/ip-packet-router/Cargo.toml +++ b/service-providers/ip-packet-router/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-ip-packet-router" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license = "GPL-3.0" +publish = false [dependencies] anyhow.workspace = true @@ -17,24 +18,24 @@ clap.workspace = true etherparse = { workspace = true } futures = { workspace = true } log = { workspace = true } -nym-bin-common = { path = "../../common/bin-common", features = ["clap", "basic_tracing"] } -nym-client-core = { path = "../../common/client-core" } -nym-config = { path = "../../common/config" } -nym-crypto = { path = "../../common/crypto" } -nym-exit-policy = { path = "../../common/exit-policy" } -nym-id = { path = "../../common/nym-id" } -nym-ip-packet-requests = { path = "../../common/ip-packet-requests" } -nym-network-defaults = { path = "../../common/network-defaults" } +nym-bin-common = { workspace = true, features = ["clap", "basic_tracing"] } +nym-client-core = { workspace = true } +nym-config = { workspace = true } +nym-crypto = { workspace = true } +nym-exit-policy = { workspace = true } +nym-id = { workspace = true } +nym-ip-packet-requests = { workspace = true } +nym-network-defaults = { workspace = true } nym-network-requester = { path = "../network-requester" } -nym-sdk = { path = "../../sdk/rust/nym-sdk" } -nym-service-provider-requests-common = { path = "../../common/service-provider-requests-common" } -nym-service-providers-common = { path = "../common" } -nym-sphinx = { path = "../../common/nymsphinx" } -nym-task = { path = "../../common/task" } -nym-tun = { path = "../../common/tun" } -nym-types = { path = "../../common/types" } -nym-wireguard = { path = "../../common/wireguard" } -nym-wireguard-types = { path = "../../common/wireguard-types" } +nym-sdk = { workspace = true } +nym-service-provider-requests-common = { workspace = true } +nym-service-providers-common = { workspace = true } +nym-sphinx = { workspace = true } +nym-task = { workspace = true } +nym-tun = { workspace = true } +nym-types = { workspace = true } +nym-wireguard = { workspace = true } +nym-wireguard-types = { workspace = true } rand = { workspace = true } reqwest.workspace = true serde = { workspace = true, features = ["derive"] } diff --git a/service-providers/network-requester/Cargo.toml b/service-providers/network-requester/Cargo.toml index 1731d38bef2..ebad9272c88 100644 --- a/service-providers/network-requester/Cargo.toml +++ b/service-providers/network-requester/Cargo.toml @@ -8,6 +8,7 @@ version = "1.1.68" authors.workspace = true edition.workspace = true rust-version = "1.85" +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -42,25 +43,25 @@ time = { workspace = true } zeroize = { workspace = true } # internal -nym-async-file-watcher = { path = "../../common/async-file-watcher" } -nym-bin-common = { path = "../../common/bin-common", features = ["output_format", "clap", "basic_tracing"] } -nym-client-core = { path = "../../common/client-core", features = ["cli", "fs-gateways-storage", "fs-surb-storage"] } -nym-client-websocket-requests = { path = "../../clients/native/websocket-requests" } -nym-config = { path = "../../common/config" } -nym-credentials = { path = "../../common/credentials" } -nym-credential-storage = { path = "../../common/credential-storage" } -nym-crypto = { path = "../../common/crypto" } -nym-network-defaults = { path = "../../common/network-defaults" } -nym-ordered-buffer = { path = "../../common/socks5/ordered-buffer" } -nym-sdk = { path = "../../sdk/rust/nym-sdk" } -nym-service-providers-common = { path = "../common" } -nym-socks5-proxy-helpers = { path = "../../common/socks5/proxy-helpers" } -nym-socks5-requests = { path = "../../common/socks5/requests" } -nym-sphinx = { path = "../../common/nymsphinx" } -nym-task = { path = "../../common/task" } -nym-types = { path = "../../common/types" } -nym-exit-policy = { path = "../../common/exit-policy", features = ["client"] } -nym-id = { path = "../../common/nym-id" } +nym-async-file-watcher = { workspace = true } +nym-bin-common = { workspace = true, features = ["output_format", "clap", "basic_tracing"] } +nym-client-core = { workspace = true, features = ["cli", "fs-gateways-storage", "fs-surb-storage"] } +nym-client-websocket-requests = { workspace = true } +nym-config = { workspace = true } +nym-credentials = { workspace = true } +nym-credential-storage = { workspace = true } +nym-crypto = { workspace = true } +nym-network-defaults = { workspace = true } +nym-ordered-buffer = { workspace = true } +nym-sdk = { workspace = true } +nym-service-providers-common = { workspace = true } +nym-socks5-proxy-helpers = { workspace = true } +nym-socks5-requests = { workspace = true } +nym-sphinx = { workspace = true } +nym-task = { workspace = true } +nym-types = { workspace = true } +nym-exit-policy = { workspace = true, features = ["client"] } +nym-id = { workspace = true } [dev-dependencies] tempfile = { workspace = true } diff --git a/tools/echo-server/Cargo.toml b/tools/echo-server/Cargo.toml index f58a0e46b3b..4f9ec4de027 100644 --- a/tools/echo-server/Cargo.toml +++ b/tools/echo-server/Cargo.toml @@ -8,7 +8,7 @@ documentation.workspace = true edition.workspace = true license.workspace = true rust-version.workspace = true - +publish = false [[bin]] name = "echo-server" @@ -26,14 +26,14 @@ serde = { workspace = true, features = ["derive"] } tracing.workspace = true tracing-subscriber = { workspace = true } bytecodec = { workspace = true } -nym-sdk = { path = "../../sdk/rust/nym-sdk" } +nym-sdk = { workspace = true } bytes.workspace = true dirs.workspace = true clap.workspace = true -nym-bin-common = { path = "../../common/bin-common", features = [ +nym-bin-common = { workspace = true, features = [ "basic_tracing", "output_format", ] } -nym-crypto = { path = "../../common/crypto", features = ["asymmetric"] } +nym-crypto = { workspace = true, features = ["asymmetric"] } futures = { workspace = true } tempfile.workspace = true diff --git a/tools/internal/contract-state-importer/importer-cli/Cargo.toml b/tools/internal/contract-state-importer/importer-cli/Cargo.toml index db708db2e8b..143b18ffbb1 100644 --- a/tools/internal/contract-state-importer/importer-cli/Cargo.toml +++ b/tools/internal/contract-state-importer/importer-cli/Cargo.toml @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +publish = false [dependencies] anyhow = { workspace = true } @@ -21,9 +22,9 @@ tokio = { workspace = true, features = ["rt-multi-thread", "net", "signal"] } tracing = { workspace = true } importer-contract = { path = "../importer-contract" } -nym-validator-client = { path = "../../../../common/client-libs/validator-client" } -nym-bin-common = { path = "../../../../common/bin-common", features = ["basic_tracing"] } -nym-network-defaults = { path = "../../../../common/network-defaults" } +nym-validator-client = { workspace = true } +nym-bin-common = { workspace = true, features = ["basic_tracing"] } +nym-network-defaults = { workspace = true } -nym-mixnet-contract-common = { path = "../../../../common/cosmwasm-smart-contracts/mixnet-contract" } -nym-vesting-contract-common = { path = "../../../../common/cosmwasm-smart-contracts/vesting-contract" } \ No newline at end of file +nym-mixnet-contract-common = { workspace = true } +nym-vesting-contract-common = { workspace = true } diff --git a/tools/internal/contract-state-importer/importer-contract/Cargo.toml b/tools/internal/contract-state-importer/importer-contract/Cargo.toml index 2c09e7071e5..72f04762063 100644 --- a/tools/internal/contract-state-importer/importer-contract/Cargo.toml +++ b/tools/internal/contract-state-importer/importer-contract/Cargo.toml @@ -8,7 +8,7 @@ documentation.workspace = true edition.workspace = true license.workspace = true readme.workspace = true - +publish = false [lib] crate-type = ["cdylib", "rlib"] @@ -21,4 +21,4 @@ cosmwasm-schema = { workspace = true } [features] default = ["library"] -library = [] \ No newline at end of file +library = [] diff --git a/tools/internal/mixnet-connectivity-check/Cargo.toml b/tools/internal/mixnet-connectivity-check/Cargo.toml index af55790aa49..9d2d36c9d8b 100644 --- a/tools/internal/mixnet-connectivity-check/Cargo.toml +++ b/tools/internal/mixnet-connectivity-check/Cargo.toml @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +publish = false [dependencies] anyhow = { workspace = true } @@ -17,7 +18,7 @@ futures = { workspace = true } tracing = { workspace = true } tokio = { workspace = true, features = ["rt-multi-thread", "signal", "macros"] } -nym-network-defaults = { path = "../../../common/network-defaults" } -nym-bin-common = { path = "../../../common/bin-common", features = ["basic_tracing", "output_format"] } -nym-crypto = { path = "../../../common/crypto", features = ["asymmetric"] } -nym-sdk = { path = "../../../sdk/rust/nym-sdk" } +nym-network-defaults = { workspace = true } +nym-bin-common = { workspace = true, features = ["basic_tracing", "output_format"] } +nym-crypto = { workspace = true, features = ["asymmetric"] } +nym-sdk = { workspace = true } diff --git a/tools/internal/ssl-inject/Cargo.toml b/tools/internal/ssl-inject/Cargo.toml index 86220b49193..d87167628eb 100644 --- a/tools/internal/ssl-inject/Cargo.toml +++ b/tools/internal/ssl-inject/Cargo.toml @@ -3,6 +3,7 @@ name = "ssl-inject" version = "0.1.0" edition = "2021" license.workspace = true +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tools/internal/testnet-manager/Cargo.toml b/tools/internal/testnet-manager/Cargo.toml index 6f799d84a43..2ca0b01eced 100644 --- a/tools/internal/testnet-manager/Cargo.toml +++ b/tools/internal/testnet-manager/Cargo.toml @@ -8,6 +8,8 @@ documentation.workspace = true edition.workspace = true license.workspace = true rust-version.workspace = true +publish = false + [dependencies] anyhow.workspace = true @@ -32,24 +34,24 @@ url.workspace = true zeroize = { workspace = true, features = ["zeroize_derive"] } -nym-bin-common = { path = "../../../common/bin-common", features = ["output_format", "basic_tracing"] } -nym-crypto = { path = "../../../common/crypto", features = ["asymmetric", "rand", "serde"] } -nym-config = { path = "../../../common/config" } -nym-validator-client = { path = "../../../common/client-libs/validator-client" } -nym-compact-ecash = { path = "../../../common/nym_offline_compact_ecash" } -nym-http-api-client = { path = "../../../common/http-api-client" } +nym-bin-common = { workspace = true, features = ["output_format", "basic_tracing"] } +nym-crypto = { workspace = true, features = ["asymmetric", "rand", "serde"] } +nym-config = { workspace = true } +nym-validator-client = { workspace = true } +nym-compact-ecash = { workspace = true } +nym-http-api-client = { workspace = true } dkg-bypass-contract = { path = "dkg-bypass-contract", default-features = false } # contracts: -nym-mixnet-contract-common = { path = "../../../common/cosmwasm-smart-contracts/mixnet-contract" } -nym-contracts-common = { path = "../../../common/cosmwasm-smart-contracts/contracts-common" } -nym-vesting-contract-common = { path = "../../../common/cosmwasm-smart-contracts/vesting-contract" } -nym-group-contract-common = { path = "../../../common/cosmwasm-smart-contracts/group-contract" } -nym-ecash-contract-common = { path = "../../../common/cosmwasm-smart-contracts/ecash-contract" } -nym-coconut-dkg-common = { path = "../../../common/cosmwasm-smart-contracts/coconut-dkg" } -nym-multisig-contract-common = { path = "../../../common/cosmwasm-smart-contracts/multisig-contract" } -nym-performance-contract-common = { path = "../../../common/cosmwasm-smart-contracts/nym-performance-contract" } -nym-pemstore = { path = "../../../common/pemstore" } +nym-mixnet-contract-common = { workspace = true } +nym-contracts-common = { workspace = true } +nym-vesting-contract-common = { workspace = true } +nym-group-contract-common = { workspace = true } +nym-ecash-contract-common = { workspace = true } +nym-coconut-dkg-common = { workspace = true } +nym-multisig-contract-common = { workspace = true } +nym-performance-contract-common = { workspace = true } +nym-pemstore = { workspace = true } [build-dependencies] diff --git a/tools/internal/testnet-manager/dkg-bypass-contract/Cargo.toml b/tools/internal/testnet-manager/dkg-bypass-contract/Cargo.toml index fa45302f005..5074d8d91f8 100644 --- a/tools/internal/testnet-manager/dkg-bypass-contract/Cargo.toml +++ b/tools/internal/testnet-manager/dkg-bypass-contract/Cargo.toml @@ -5,6 +5,7 @@ edition = { workspace = true } authors = { workspace = true } license = { workspace = true } repository = { workspace = true } +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -17,9 +18,9 @@ cosmwasm-std = { workspace = true } cosmwasm-schema = { workspace = true } cw-storage-plus = { workspace = true } -nym-coconut-dkg-common = { path = "../../../../common/cosmwasm-smart-contracts/coconut-dkg" } -nym-contracts-common = { path = "../../../../common/cosmwasm-smart-contracts/contracts-common" } +nym-coconut-dkg-common = { workspace = true } +nym-contracts-common = { workspace = true } [features] default = ["library"] -library = [] \ No newline at end of file +library = [] diff --git a/tools/internal/validator-status-check/Cargo.toml b/tools/internal/validator-status-check/Cargo.toml index a0d09e336f9..7b335095b7a 100644 --- a/tools/internal/validator-status-check/Cargo.toml +++ b/tools/internal/validator-status-check/Cargo.toml @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true rust-version.workspace = true readme.workspace = true +publish = false [dependencies] anyhow = { workspace = true } @@ -22,10 +23,10 @@ tracing = { workspace = true } time = { workspace = true } -nym-validator-client = { path = "../../../common/client-libs/validator-client" } -nym-bin-common = { path = "../../../common/bin-common", features = ["output_format", "basic_tracing"] } -nym-network-defaults = { path = "../../../common/network-defaults" } -nym-http-api-client = { path = "../../../common/http-api-client" } +nym-validator-client = { workspace = true } +nym-bin-common = { workspace = true, features = ["output_format", "basic_tracing"] } +nym-network-defaults = { workspace = true } +nym-http-api-client = { workspace = true } [lints] workspace = true diff --git a/tools/nym-cli/Cargo.toml b/tools/nym-cli/Cargo.toml index 79edd2de27d..1567c17743a 100644 --- a/tools/nym-cli/Cargo.toml +++ b/tools/nym-cli/Cargo.toml @@ -4,6 +4,7 @@ version = "1.1.67" authors.workspace = true edition = "2021" license.workspace = true +publish = false [dependencies] base64 = { workspace = true } @@ -22,9 +23,9 @@ anyhow = { workspace = true } tap = { workspace = true } nym-cli-commands = { path = "../../common/commands" } -nym-bin-common = { path = "../../common/bin-common", features = ["basic_tracing"] } -nym-validator-client = { path = "../../common/client-libs/validator-client", features = ["http-client"] } -nym-network-defaults = { path = "../../common/network-defaults" } +nym-bin-common = { workspace = true, features = ["basic_tracing"] } +nym-validator-client = { workspace = true, features = ["http-client"] } +nym-network-defaults = { workspace = true } [package.metadata.deb] name = "nym-cli" diff --git a/tools/nym-id-cli/Cargo.toml b/tools/nym-id-cli/Cargo.toml index bada736bfde..7d264bb2e81 100644 --- a/tools/nym-id-cli/Cargo.toml +++ b/tools/nym-id-cli/Cargo.toml @@ -7,6 +7,7 @@ homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -17,6 +18,6 @@ clap = { workspace = true, features = ["derive"] } tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } tracing.workspace = true -nym-bin-common = { path = "../../common/bin-common", features = ["output_format", "basic_tracing"] } -nym-credential-storage = { path = "../../common/credential-storage" } -nym-id = { path = "../../common/nym-id" } +nym-bin-common = { workspace = true, features = ["output_format", "basic_tracing"] } +nym-credential-storage = { workspace = true } +nym-id = { workspace = true } diff --git a/tools/nym-nr-query/Cargo.toml b/tools/nym-nr-query/Cargo.toml index f5ec6f6475c..da2d03e5445 100644 --- a/tools/nym-nr-query/Cargo.toml +++ b/tools/nym-nr-query/Cargo.toml @@ -3,6 +3,7 @@ name = "nym-nr-query" version = "0.1.0" edition = "2021" license.workspace = true +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -10,10 +11,10 @@ license.workspace = true anyhow = { workspace = true } clap = { workspace = true, features = ["cargo", "derive"]} log = { workspace = true } -nym-bin-common = { path = "../../common/bin-common", features = ["output_format", "basic_tracing"] } -nym-network-defaults = { path = "../../common/network-defaults" } -nym-sdk = { path = "../../sdk/rust/nym-sdk" } -nym-service-providers-common = { path = "../../service-providers/common" } -nym-socks5-requests = { path = "../../common/socks5/requests" } +nym-bin-common = { workspace = true, features = ["output_format", "basic_tracing"] } +nym-network-defaults = { workspace = true } +nym-sdk = { workspace = true } +nym-service-providers-common = { workspace = true } +nym-socks5-requests = { workspace = true } serde = { workspace = true } tokio = { workspace = true, features = [ "net", "rt-multi-thread", "macros" ] } diff --git a/tools/nymvisor/Cargo.toml b/tools/nymvisor/Cargo.toml index 738a50a88ec..b336604d4ff 100644 --- a/tools/nymvisor/Cargo.toml +++ b/tools/nymvisor/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nymvisor" -version = "0.1.32" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -32,10 +33,10 @@ thiserror = { workspace = true } tracing = { workspace = true } url = { workspace = true, features = ["serde"] } -nym-async-file-watcher = { path = "../../common/async-file-watcher" } -nym-bin-common = { path = "../../common/bin-common", features = ["output_format", "basic_tracing"] } -nym-config = { path = "../../common/config" } -nym-task = { path = "../../common/task"} +nym-async-file-watcher = { workspace = true } +nym-bin-common = { workspace = true, features = ["output_format", "basic_tracing"] } +nym-config = { workspace = true } +nym-task = { workspace = true} [dev-dependencies] tokio = { workspace = true, features = ["full"] } diff --git a/tools/ts-rs-cli/Cargo.toml b/tools/ts-rs-cli/Cargo.toml index 6c75876550c..e2230dae3fc 100644 --- a/tools/ts-rs-cli/Cargo.toml +++ b/tools/ts-rs-cli/Cargo.toml @@ -3,6 +3,7 @@ name = "ts-rs-cli" version = "0.1.0" edition = "2021" license.workspace = true +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -11,11 +12,11 @@ anyhow = { workspace = true } ts-rs = { workspace = true } walkdir = { workspace = true } -nym-validator-client = { path = "../../common/client-libs/validator-client", features = [ +nym-validator-client = { workspace = true, features = [ "generate-ts" ] } -nym-api-requests = { path = "../../nym-api/nym-api-requests", features = ["generate-ts"] } -nym-mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract", features = ["generate-ts"] } -nym-vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract", features = ["generate-ts"] } -nym-types = { path = "../../common/types", features = ["generate-ts"] } +nym-api-requests = { workspace = true, features = ["generate-ts"] } +nym-mixnet-contract-common = { workspace = true, features = ["generate-ts"] } +nym-vesting-contract-common = { workspace = true, features = ["generate-ts"] } +nym-types = { workspace = true, features = ["generate-ts"] } nym-wallet-types = { path = "../../nym-wallet/nym-wallet-types", features = ["generate-ts"] } diff --git a/wasm/client/Cargo.toml b/wasm/client/Cargo.toml index 4b5d7d19e90..3bc15e7adef 100644 --- a/wasm/client/Cargo.toml +++ b/wasm/client/Cargo.toml @@ -11,6 +11,7 @@ license = "Apache-2.0" repository = "https://github.com/nymtech/nym" description = "A webassembly client which can be used to interact with the the Nym privacy platform. Wasm is used for Sphinx packet generation." rust-version = "1.85" +publish = false [lib] crate-type = ["cdylib", "rlib"] @@ -32,12 +33,13 @@ thiserror = { workspace = true } tsify = { workspace = true, features = ["js"] } web-sys = { workspace = true } -nym-bin-common = { path = "../../common/bin-common" } -wasm-client-core = { path = "../../common/wasm/client-core" } -wasm-utils = { path = "../../common/wasm/utils" } -nym-gateway-requests = { path = "../../common/gateway-requests" } +nym-bin-common = { workspace = true } +nym-wasm-client-core = { workspace = true } +nym-wasm-utils = { workspace = true } +nym-gateway-requests = { workspace = true } + +nym-node-tester-utils = { workspace = true, optional = true } -nym-node-tester-utils = { path = "../../common/node-tester-utils", optional = true } nym-node-tester-wasm = { path = "../node-tester", optional = true } tokio_with_wasm = { workspace = true, features = ["full"] } diff --git a/wasm/client/src/client.rs b/wasm/client/src/client.rs index 8c006b7f09f..7d6df14b353 100644 --- a/wasm/client/src/client.rs +++ b/wasm/client/src/client.rs @@ -14,30 +14,30 @@ use crate::response_pusher::ResponsePusher; use js_sys::Promise; use nym_bin_common::bin_info; use nym_gateway_requests::ClientRequest; +use nym_wasm_client_core::client::base_client::storage::GatewaysDetailsStore; +use nym_wasm_client_core::client::{ + base_client::{BaseClientBuilder, ClientInput, ClientOutput, ClientState}, + inbound_messages::InputMessage, +}; +use nym_wasm_client_core::config::r#override::DebugWasmOverride; +use nym_wasm_client_core::helpers::{ + add_gateway, generate_new_client_keys, parse_recipient, parse_sender_tag, +}; +use nym_wasm_client_core::nym_task::connections::TransmissionLane; +use nym_wasm_client_core::nym_task::ShutdownTracker; +use nym_wasm_client_core::storage::core_client_traits::FullWasmClientStorage; +use nym_wasm_client_core::storage::wasm_client_traits::WasmClientStorage; +use nym_wasm_client_core::storage::ClientStorage; +use nym_wasm_client_core::topology::{SerializableTopologyExt, WasmFriendlyNymTopology}; +use nym_wasm_client_core::{IdentityKey, NymTopology, PacketType, QueryReqwestRpcNyxdClient}; +use nym_wasm_utils::error::PromisableResult; +use nym_wasm_utils::{check_promise_result, console_error, console_log}; use serde::{Deserialize, Serialize}; use std::sync::Arc; use tokio_with_wasm::sync::mpsc; use tsify::Tsify; use wasm_bindgen::prelude::*; use wasm_bindgen_futures::future_to_promise; -use wasm_client_core::client::base_client::storage::GatewaysDetailsStore; -use wasm_client_core::client::{ - base_client::{BaseClientBuilder, ClientInput, ClientOutput, ClientState}, - inbound_messages::InputMessage, -}; -use wasm_client_core::config::r#override::DebugWasmOverride; -use wasm_client_core::helpers::{ - add_gateway, generate_new_client_keys, parse_recipient, parse_sender_tag, -}; -use wasm_client_core::nym_task::connections::TransmissionLane; -use wasm_client_core::nym_task::ShutdownTracker; -use wasm_client_core::storage::core_client_traits::FullWasmClientStorage; -use wasm_client_core::storage::wasm_client_traits::WasmClientStorage; -use wasm_client_core::storage::ClientStorage; -use wasm_client_core::topology::{SerializableTopologyExt, WasmFriendlyNymTopology}; -use wasm_client_core::{IdentityKey, NymTopology, PacketType, QueryReqwestRpcNyxdClient}; -use wasm_utils::error::PromisableResult; -use wasm_utils::{check_promise_result, console_error, console_log}; #[cfg(feature = "node-tester")] use crate::helpers::{NymClientTestRequest, WasmTopologyTestExt}; diff --git a/wasm/client/src/config.rs b/wasm/client/src/config.rs index 9bb19ad8c1f..06249c6bd48 100644 --- a/wasm/client/src/config.rs +++ b/wasm/client/src/config.rs @@ -8,10 +8,12 @@ #![allow(clippy::empty_docs)] use crate::error::WasmClientError; +use nym_wasm_client_core::config::{ + new_base_client_config, BaseClientConfig, ConfigDebug, DebugWasm, +}; use serde::{Deserialize, Serialize}; use tsify::Tsify; use wasm_bindgen::prelude::*; -use wasm_client_core::config::{new_base_client_config, BaseClientConfig, ConfigDebug, DebugWasm}; pub const DEFAULT_CLIENT_ID: &str = "nym-mixnet-client"; diff --git a/wasm/client/src/encoded_payload_helper.rs b/wasm/client/src/encoded_payload_helper.rs index 77294f624ce..7b2080a2cd2 100644 --- a/wasm/client/src/encoded_payload_helper.rs +++ b/wasm/client/src/encoded_payload_helper.rs @@ -325,10 +325,10 @@ mod tests { message.extend_from_slice(serialized_metadata.as_bytes()); message.extend_from_slice(&payload_data); - wasm_utils::console_log!("message length: {}", message.len()); - wasm_utils::console_log!("metadata length: {}", metadata_length); - wasm_utils::console_log!("payload length: {}", payload_data.len()); - wasm_utils::console_log!( + nym_wasm_utils::console_log!("message length: {}", message.len()); + nym_wasm_utils::console_log!("metadata length: {}", metadata_length); + nym_wasm_utils::console_log!("payload length: {}", payload_data.len()); + nym_wasm_utils::console_log!( "8 + metadata_length + payload_length = {}", payload_data.len() + metadata_length as usize + 8 ); diff --git a/wasm/client/src/error.rs b/wasm/client/src/error.rs index a8d7c2190b2..48598833b2d 100644 --- a/wasm/client/src/error.rs +++ b/wasm/client/src/error.rs @@ -1,11 +1,11 @@ // Copyright 2023 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 +use nym_wasm_client_core::error::WasmCoreError; +use nym_wasm_client_core::topology::WasmTopologyError; +use nym_wasm_client_core::ClientCoreError; +use nym_wasm_utils::wasm_error; use thiserror::Error; -use wasm_client_core::error::WasmCoreError; -use wasm_client_core::topology::WasmTopologyError; -use wasm_client_core::ClientCoreError; -use wasm_utils::wasm_error; #[cfg(feature = "node-tester")] use nym_node_tester_utils::error::NetworkTestingError; diff --git a/wasm/client/src/helpers.rs b/wasm/client/src/helpers.rs index b6cdba3d33c..d568d762500 100644 --- a/wasm/client/src/helpers.rs +++ b/wasm/client/src/helpers.rs @@ -2,16 +2,16 @@ // SPDX-License-Identifier: Apache-2.0 use js_sys::Promise; +use nym_wasm_client_core::client::base_client::{ClientInput, ClientState}; +use nym_wasm_client_core::client::inbound_messages::InputMessage; +use nym_wasm_client_core::error::WasmCoreError; +use nym_wasm_client_core::topology::{Role, WasmFriendlyNymTopology}; +use nym_wasm_client_core::NymTopology; +use nym_wasm_utils::error::simple_js_error; +use nym_wasm_utils::{check_promise_result, console_log}; use std::sync::Arc; use wasm_bindgen::JsValue; use wasm_bindgen_futures::future_to_promise; -use wasm_client_core::client::base_client::{ClientInput, ClientState}; -use wasm_client_core::client::inbound_messages::InputMessage; -use wasm_client_core::error::WasmCoreError; -use wasm_client_core::topology::{Role, WasmFriendlyNymTopology}; -use wasm_client_core::NymTopology; -use wasm_utils::error::simple_js_error; -use wasm_utils::{check_promise_result, console_log}; #[cfg(feature = "node-tester")] use nym_node_tester_wasm::types::{NodeTestMessage, WasmTestMessageExt}; diff --git a/wasm/client/src/lib.rs b/wasm/client/src/lib.rs index ee5ff5a1bae..3fe894a8653 100644 --- a/wasm/client/src/lib.rs +++ b/wasm/client/src/lib.rs @@ -14,17 +14,17 @@ mod helpers; #[cfg(target_arch = "wasm32")] mod response_pusher; #[cfg(target_arch = "wasm32")] -use wasm_bindgen::prelude::*; +use nym_wasm_utils::set_panic_hook; #[cfg(target_arch = "wasm32")] -use wasm_utils::set_panic_hook; +use wasm_bindgen::prelude::*; #[wasm_bindgen(start)] #[cfg(target_arch = "wasm32")] pub fn main_js() { - wasm_utils::console_log!("[rust main]: setting panic hook"); + nym_wasm_utils::console_log!("[rust main]: setting panic hook"); set_panic_hook(); - wasm_utils::console_log!("[rust main]: rust module loaded"); - wasm_utils::console_log!( + nym_wasm_utils::console_log!("[rust main]: rust module loaded"); + nym_wasm_utils::console_log!( "wasm client version used: {}", nym_bin_common::bin_info_owned!() ); diff --git a/wasm/client/src/response_pusher.rs b/wasm/client/src/response_pusher.rs index e0a795a79b7..be2ba383126 100644 --- a/wasm/client/src/response_pusher.rs +++ b/wasm/client/src/response_pusher.rs @@ -4,13 +4,13 @@ use futures::channel::mpsc; use futures::StreamExt; use js_sys::Uint8Array; -use wasm_bindgen::JsValue; -use wasm_bindgen_futures::spawn_local; -use wasm_client_core::client::base_client::ClientOutput; -use wasm_client_core::client::received_buffer::{ +use nym_wasm_client_core::client::base_client::ClientOutput; +use nym_wasm_client_core::client::received_buffer::{ ReceivedBufferMessage, ReceivedBufferRequestSender, ReconstructedMessagesReceiver, }; -use wasm_utils::console_error; +use nym_wasm_utils::console_error; +use wasm_bindgen::JsValue; +use wasm_bindgen_futures::spawn_local; pub(crate) struct ResponsePusher { reconstructed_receiver: ReconstructedMessagesReceiver, diff --git a/wasm/full-nym-wasm/Cargo.toml b/wasm/full-nym-wasm/Cargo.toml index 3e98e42d24c..f3a7357e6c0 100644 --- a/wasm/full-nym-wasm/Cargo.toml +++ b/wasm/full-nym-wasm/Cargo.toml @@ -7,6 +7,7 @@ keywords = ["nym", "sphinx", "wasm", "webassembly", "privacy"] license = "Apache-2.0" repository = "https://github.com/nymtech/nym" rust-version = "1.85" +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -14,9 +15,10 @@ rust-version = "1.85" crate-type = ["cdylib", "rlib"] [dependencies] -nym-client-wasm = { path = "../client", optional = true } +nym-client-wasm = { workspace = true, optional = true } + nym-node-tester-wasm = { path = "../node-tester", optional = true } -mix-fetch-wasm = { path = "../mix-fetch", optional = true } +mix-fetch-wasm = { workspace = true, optional = true } [features] default = ["client", "node-tester"] @@ -26,4 +28,3 @@ mix-fetch = ["mix-fetch-wasm"] [package.metadata.wasm-pack.profile.release] wasm-opt = false - diff --git a/wasm/mix-fetch/Cargo.toml b/wasm/mix-fetch/Cargo.toml index 00d91b2e255..f1d81694ada 100644 --- a/wasm/mix-fetch/Cargo.toml +++ b/wasm/mix-fetch/Cargo.toml @@ -7,6 +7,7 @@ keywords = ["nym", "fetch", "wasm", "webassembly", "privacy"] license = "Apache-2.0" repository = "https://github.com/nymtech/nym" rust-version = "1.85" +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -27,14 +28,14 @@ wasm-bindgen-futures = { workspace = true } thiserror = { workspace = true } tsify = { workspace = true, features = ["js"] } -nym-bin-common = { path = "../../common/bin-common" } -nym-http-api-client = { path = "../../common/http-api-client" } -nym-socks5-requests = { path = "../../common/socks5/requests" } -nym-ordered-buffer = { path = "../../common/socks5/ordered-buffer" } -nym-service-providers-common = { path = "../../service-providers/common" } -nym-validator-client = { path = "../../common/client-libs/validator-client", default-features = false } -wasm-client-core = { path = "../../common/wasm/client-core" } -wasm-utils = { path = "../../common/wasm/utils" } +nym-bin-common = { workspace = true } +nym-http-api-client = { workspace = true } +nym-socks5-requests = { workspace = true } +nym-ordered-buffer = { workspace = true } +nym-service-providers-common = { workspace = true } +nym-validator-client = { workspace = true, default-features = false } +nym-wasm-client-core = { workspace = true } +nym-wasm-utils = { workspace = true } [package.metadata.wasm-pack.profile.release] wasm-opt = false diff --git a/wasm/mix-fetch/src/active_requests.rs b/wasm/mix-fetch/src/active_requests.rs index 3d4e8a5f31d..72fe6ac9d91 100644 --- a/wasm/mix-fetch/src/active_requests.rs +++ b/wasm/mix-fetch/src/active_requests.rs @@ -6,11 +6,11 @@ use crate::go_bridge::{goWasmCloseRemoteSocket, goWasmInjectConnError, goWasmInj use crate::RequestId; use nym_ordered_buffer::OrderedMessageBuffer; use nym_socks5_requests::SocketData; +use nym_wasm_utils::{console_error, console_log}; use rand::{thread_rng, RngCore}; use std::collections::HashMap; use std::sync::Arc; use tokio::sync::Mutex; -use wasm_utils::{console_error, console_log}; #[derive(Clone, Default)] pub struct ActiveRequests { diff --git a/wasm/mix-fetch/src/client.rs b/wasm/mix-fetch/src/client.rs index 736c82c4139..6fd5d642ac0 100644 --- a/wasm/mix-fetch/src/client.rs +++ b/wasm/mix-fetch/src/client.rs @@ -11,22 +11,22 @@ use crate::{config, RequestId}; use js_sys::Promise; use nym_bin_common::bin_info; use nym_socks5_requests::RemoteAddress; +use nym_wasm_client_core::client::base_client::storage::GatewaysDetailsStore; +use nym_wasm_client_core::client::base_client::{BaseClientBuilder, ClientInput, ClientOutput}; +use nym_wasm_client_core::client::inbound_messages::InputMessage; +use nym_wasm_client_core::helpers::{add_gateway, generate_new_client_keys}; +use nym_wasm_client_core::nym_task::connections::TransmissionLane; +use nym_wasm_client_core::nym_task::ShutdownTracker; +use nym_wasm_client_core::storage::core_client_traits::FullWasmClientStorage; +use nym_wasm_client_core::storage::wasm_client_traits::WasmClientStorage; +use nym_wasm_client_core::storage::ClientStorage; +use nym_wasm_client_core::{IdentityKey, QueryReqwestRpcNyxdClient, Recipient}; +use nym_wasm_utils::console_log; +use nym_wasm_utils::error::PromisableResult; use std::sync::atomic::{AtomicBool, Ordering}; use tokio::sync::Mutex; use wasm_bindgen::prelude::*; use wasm_bindgen_futures::future_to_promise; -use wasm_client_core::client::base_client::storage::GatewaysDetailsStore; -use wasm_client_core::client::base_client::{BaseClientBuilder, ClientInput, ClientOutput}; -use wasm_client_core::client::inbound_messages::InputMessage; -use wasm_client_core::helpers::{add_gateway, generate_new_client_keys}; -use wasm_client_core::nym_task::connections::TransmissionLane; -use wasm_client_core::nym_task::ShutdownTracker; -use wasm_client_core::storage::core_client_traits::FullWasmClientStorage; -use wasm_client_core::storage::wasm_client_traits::WasmClientStorage; -use wasm_client_core::storage::ClientStorage; -use wasm_client_core::{IdentityKey, QueryReqwestRpcNyxdClient, Recipient}; -use wasm_utils::console_log; -use wasm_utils::error::PromisableResult; #[wasm_bindgen] pub struct MixFetchClient { diff --git a/wasm/mix-fetch/src/config.rs b/wasm/mix-fetch/src/config.rs index 621e041913a..9d312ac280a 100644 --- a/wasm/mix-fetch/src/config.rs +++ b/wasm/mix-fetch/src/config.rs @@ -10,13 +10,15 @@ #![allow(clippy::empty_docs)] use crate::error::MixFetchError; +use nym_wasm_client_core::config::{ + new_base_client_config, BaseClientConfig, ConfigDebug, DebugWasm, +}; +use nym_wasm_client_core::helpers::parse_recipient; +use nym_wasm_client_core::Recipient; use serde::{Deserialize, Serialize}; use std::time::Duration; use tsify::Tsify; use wasm_bindgen::prelude::*; -use wasm_client_core::config::{new_base_client_config, BaseClientConfig, ConfigDebug, DebugWasm}; -use wasm_client_core::helpers::parse_recipient; -use wasm_client_core::Recipient; const DEFAULT_MIX_FETCH_TIMEOUT: Duration = Duration::from_secs(5); const DEFAULT_MIX_FETCH_ID: &str = "_default-nym-mix-fetch"; diff --git a/wasm/mix-fetch/src/error.rs b/wasm/mix-fetch/src/error.rs index c3347acddfb..ceb449df040 100644 --- a/wasm/mix-fetch/src/error.rs +++ b/wasm/mix-fetch/src/error.rs @@ -5,10 +5,10 @@ use crate::RequestId; use nym_ordered_buffer::OrderedMessageError; use nym_socks5_requests::ConnectionError; use nym_validator_client::nym_api::error::NymAPIError; +use nym_wasm_client_core::error::WasmCoreError; +use nym_wasm_client_core::ClientCoreError; +use nym_wasm_utils::wasm_error; use thiserror::Error; -use wasm_client_core::error::WasmCoreError; -use wasm_client_core::ClientCoreError; -use wasm_utils::wasm_error; #[derive(Debug, Error)] pub enum MixFetchError { diff --git a/wasm/mix-fetch/src/fetch.rs b/wasm/mix-fetch/src/fetch.rs index 83d7caaff14..a03e8f70fb7 100644 --- a/wasm/mix-fetch/src/fetch.rs +++ b/wasm/mix-fetch/src/fetch.rs @@ -12,15 +12,15 @@ use crate::config::{MixFetchConfig, MixFetchConfigOpts, MixFetchDebugOverride}; use crate::error::MixFetchError; use crate::helpers::get_network_requester; use js_sys::Promise; +use nym_wasm_client_core::config::r#override::DebugWasmOverride; +use nym_wasm_utils::console_log; +use nym_wasm_utils::error::PromisableResultError; use serde::{Deserialize, Serialize}; use std::sync::OnceLock; use tsify::Tsify; use wasm_bindgen::prelude::wasm_bindgen; use wasm_bindgen::JsValue; use wasm_bindgen_futures::future_to_promise; -use wasm_client_core::config::r#override::DebugWasmOverride; -use wasm_utils::console_log; -use wasm_utils::error::PromisableResultError; pub type RequestId = u64; diff --git a/wasm/mix-fetch/src/go_bridge.rs b/wasm/mix-fetch/src/go_bridge.rs index 6ea8f0704d2..086001c0a50 100644 --- a/wasm/mix-fetch/src/go_bridge.rs +++ b/wasm/mix-fetch/src/go_bridge.rs @@ -4,9 +4,9 @@ use crate::error::MixFetchError; use crate::mix_fetch_client; use js_sys::Promise; +use nym_wasm_utils::error::{simple_rejected_promise, PromisableResult}; use wasm_bindgen::prelude::*; use wasm_bindgen_futures::future_to_promise; -use wasm_utils::error::{simple_rejected_promise, PromisableResult}; /// Called by go runtime whenever local connection produces any data that has to be sent to the remote. // diff --git a/wasm/mix-fetch/src/helpers.rs b/wasm/mix-fetch/src/helpers.rs index 4f6daf85b19..9476d61715f 100644 --- a/wasm/mix-fetch/src/helpers.rs +++ b/wasm/mix-fetch/src/helpers.rs @@ -5,9 +5,9 @@ use crate::error::MixFetchError; use crate::error::MixFetchError::NoNetworkRequesters; use nym_http_api_client::Client; use nym_validator_client::nym_api::NymApiClientExt; +use nym_wasm_utils::console_log; use rand::seq::SliceRandom; use rand::thread_rng; -use wasm_utils::console_log; // since this client is temporary (and will be properly integrated into nym-api eventually), // we're using hardcoded URL for mainnet diff --git a/wasm/mix-fetch/src/lib.rs b/wasm/mix-fetch/src/lib.rs index cbb9d151d49..00187480275 100644 --- a/wasm/mix-fetch/src/lib.rs +++ b/wasm/mix-fetch/src/lib.rs @@ -28,11 +28,11 @@ use wasm_bindgen::prelude::*; #[wasm_bindgen(start)] #[cfg(target_arch = "wasm32")] pub fn main() { - wasm_utils::console_log!("[rust main]: rust module loaded"); - wasm_utils::console_log!( + nym_wasm_utils::console_log!("[rust main]: rust module loaded"); + nym_wasm_utils::console_log!( "mix fetch version used: {}", nym_bin_common::bin_info_owned!() ); - wasm_utils::console_log!("[rust main]: setting panic hook"); - wasm_utils::set_panic_hook(); + nym_wasm_utils::console_log!("[rust main]: setting panic hook"); + nym_wasm_utils::set_panic_hook(); } diff --git a/wasm/mix-fetch/src/request_writer.rs b/wasm/mix-fetch/src/request_writer.rs index fa55b746d21..12138bb0053 100644 --- a/wasm/mix-fetch/src/request_writer.rs +++ b/wasm/mix-fetch/src/request_writer.rs @@ -6,13 +6,13 @@ use futures::channel::mpsc; use futures::StreamExt; use nym_service_providers_common::interface::ResponseContent; use nym_socks5_requests::{Socks5ProviderResponse, Socks5ResponseContent}; -use wasm_bindgen_futures::spawn_local; -use wasm_client_core::client::base_client::ClientOutput; -use wasm_client_core::client::received_buffer::{ +use nym_wasm_client_core::client::base_client::ClientOutput; +use nym_wasm_client_core::client::received_buffer::{ ReceivedBufferMessage, ReceivedBufferRequestSender, ReconstructedMessagesReceiver, }; -use wasm_client_core::ReconstructedMessage; -use wasm_utils::console_error; +use nym_wasm_client_core::ReconstructedMessage; +use nym_wasm_utils::console_error; +use wasm_bindgen_futures::spawn_local; pub(crate) struct RequestWriter { reconstructed_receiver: ReconstructedMessagesReceiver, diff --git a/wasm/mix-fetch/src/socks_helpers.rs b/wasm/mix-fetch/src/socks_helpers.rs index 827e8ac1206..8dffb0ad2e5 100644 --- a/wasm/mix-fetch/src/socks_helpers.rs +++ b/wasm/mix-fetch/src/socks_helpers.rs @@ -5,7 +5,7 @@ use nym_service_providers_common::interface::ProviderInterfaceVersion; use nym_socks5_requests::{ ConnectionId, RemoteAddress, SocketData, Socks5ProtocolVersion, Socks5ProviderRequest, }; -use wasm_client_core::Recipient; +use nym_wasm_client_core::Recipient; pub(crate) const PROVIDER_INTERFACE_VERSION: ProviderInterfaceVersion = ProviderInterfaceVersion::new_current(); diff --git a/wasm/node-tester/Cargo.toml b/wasm/node-tester/Cargo.toml index dd1fb9fded3..8a61eb06ab0 100644 --- a/wasm/node-tester/Cargo.toml +++ b/wasm/node-tester/Cargo.toml @@ -7,6 +7,7 @@ keywords = ["nym", "sphinx", "webassembly", "privacy", "tester"] license = "Apache-2.0" repository = "https://github.com/nymtech/nym" rust-version = "1.85" +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -27,9 +28,9 @@ tsify = { workspace = true, features = ["js"] } wasmtimer = { workspace = true } -nym-node-tester-utils = { path = "../../common/node-tester-utils" } -wasm-client-core = { path = "../../common/wasm/client-core" } -wasm-utils = { path = "../../common/wasm/utils" } +nym-node-tester-utils = { workspace = true } +nym-wasm-client-core = { workspace = true } +nym-wasm-utils = { workspace = true } [package.metadata.wasm-pack.profile.release] wasm-opt = false diff --git a/wasm/node-tester/src/ephemeral_receiver.rs b/wasm/node-tester/src/ephemeral_receiver.rs index a7a9545de64..4ad0f9d041d 100644 --- a/wasm/node-tester/src/ephemeral_receiver.rs +++ b/wasm/node-tester/src/ephemeral_receiver.rs @@ -6,10 +6,10 @@ use futures::StreamExt; use nym_node_tester_utils::processor::Received; use nym_node_tester_utils::receiver::ReceivedReceiver; use nym_node_tester_utils::FragmentIdentifier; +use nym_wasm_utils::{console_error, console_log, console_warn}; use std::collections::HashSet; use std::time::Duration; use tokio::sync::MutexGuard as AsyncMutexGuard; -use wasm_utils::{console_error, console_log, console_warn}; use wasmtimer::tokio::sleep; pub(crate) struct EphemeralTestReceiver<'a> { diff --git a/wasm/node-tester/src/error.rs b/wasm/node-tester/src/error.rs index f5679833d8e..65bf60ecbb0 100644 --- a/wasm/node-tester/src/error.rs +++ b/wasm/node-tester/src/error.rs @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 use nym_node_tester_utils::error::NetworkTestingError; +use nym_wasm_client_core::error::WasmCoreError; +use nym_wasm_client_core::topology::WasmTopologyError; +use nym_wasm_client_core::{ClientCoreError, GatewayClientError}; +use nym_wasm_utils::wasm_error; use thiserror::Error; -use wasm_client_core::error::WasmCoreError; -use wasm_client_core::topology::WasmTopologyError; -use wasm_client_core::{ClientCoreError, GatewayClientError}; -use wasm_utils::wasm_error; #[derive(Debug, Error)] pub enum NodeTesterError { diff --git a/wasm/node-tester/src/helpers.rs b/wasm/node-tester/src/helpers.rs index fa7790e2f64..6562ae65ec1 100644 --- a/wasm/node-tester/src/helpers.rs +++ b/wasm/node-tester/src/helpers.rs @@ -10,12 +10,12 @@ use crate::types::WasmTestMessageExt; use js_sys::Promise; use nym_node_tester_utils::processor::Received; use nym_node_tester_utils::receiver::ReceivedReceiver; +use nym_wasm_utils::console_warn; use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::Arc; use tokio::sync::{Mutex as AsyncMutex, MutexGuard as AsyncMutexGuard}; use wasm_bindgen::prelude::*; use wasm_bindgen_futures::future_to_promise; -use wasm_utils::console_warn; #[derive(Clone)] pub(super) struct ReceivedReceiverWrapper(Arc>>); diff --git a/wasm/node-tester/src/lib.rs b/wasm/node-tester/src/lib.rs index f2cdee034de..0828ecbc438 100644 --- a/wasm/node-tester/src/lib.rs +++ b/wasm/node-tester/src/lib.rs @@ -13,4 +13,4 @@ pub mod tester; pub mod types; #[cfg(target_arch = "wasm32")] -pub use wasm_client_core::set_panic_hook; +pub use nym_wasm_client_core::set_panic_hook; diff --git a/wasm/node-tester/src/tester.rs b/wasm/node-tester/src/tester.rs index 599e9ce3f99..f525ad1c77a 100644 --- a/wasm/node-tester/src/tester.rs +++ b/wasm/node-tester/src/tester.rs @@ -15,6 +15,21 @@ use js_sys::Promise; use nym_node_tester_utils::receiver::SimpleMessageReceiver; use nym_node_tester_utils::tester::LegacyMixLayer; use nym_node_tester_utils::{NodeTester, PacketSize, PreparedFragment}; +use nym_wasm_client_core::client::base_client::storage::gateways_storage::GatewayDetails; +use nym_wasm_client_core::client::mix_traffic::transceiver::PacketRouter; +use nym_wasm_client_core::helpers::{ + current_network_topology_async, setup_from_topology, EphemeralCredentialStorage, +}; +use nym_wasm_client_core::nym_task::ShutdownManager; +use nym_wasm_client_core::storage::ClientStorage; +use nym_wasm_client_core::topology::WasmFriendlyNymTopology; +use nym_wasm_client_core::{ + nym_task, BandwidthController, ClientKeys, ClientStatsSender, GatewayClient, + GatewayClientConfig, GatewayConfig, IdentityKey, InitialisationResult, NodeIdentity, + NymTopology, QueryReqwestRpcNyxdClient, Recipient, +}; +use nym_wasm_utils::check_promise_result; +use nym_wasm_utils::error::PromisableResult; use rand::rngs::OsRng; use serde::{Deserialize, Serialize}; use std::collections::HashSet; @@ -25,21 +40,6 @@ use tokio::sync::Mutex as AsyncMutex; use tsify::Tsify; use wasm_bindgen::prelude::*; use wasm_bindgen_futures::future_to_promise; -use wasm_client_core::client::base_client::storage::gateways_storage::GatewayDetails; -use wasm_client_core::client::mix_traffic::transceiver::PacketRouter; -use wasm_client_core::helpers::{ - current_network_topology_async, setup_from_topology, EphemeralCredentialStorage, -}; -use wasm_client_core::nym_task::ShutdownManager; -use wasm_client_core::storage::ClientStorage; -use wasm_client_core::topology::WasmFriendlyNymTopology; -use wasm_client_core::{ - nym_task, BandwidthController, ClientKeys, ClientStatsSender, GatewayClient, - GatewayClientConfig, GatewayConfig, IdentityKey, InitialisationResult, NodeIdentity, - NymTopology, QueryReqwestRpcNyxdClient, Recipient, -}; -use wasm_utils::check_promise_result; -use wasm_utils::error::PromisableResult; pub const NODE_TESTER_ID: &str = "_nym-node-tester"; diff --git a/wasm/node-tester/src/types.rs b/wasm/node-tester/src/types.rs index e1a5dcf7669..2bcbe843957 100644 --- a/wasm/node-tester/src/types.rs +++ b/wasm/node-tester/src/types.rs @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 use nym_node_tester_utils::TestMessage; +use nym_wasm_utils::console_log; use serde::{Deserialize, Serialize}; use std::fmt::{Display, Formatter}; use wasm_bindgen::prelude::wasm_bindgen; -use wasm_utils::console_log; pub type NodeTestMessage = TestMessage; diff --git a/wasm/zknym-lib/Cargo.toml b/wasm/zknym-lib/Cargo.toml index 572e26c6bd0..b9d086535ee 100644 --- a/wasm/zknym-lib/Cargo.toml +++ b/wasm/zknym-lib/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "zknym-lib" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true documentation.workspace = true edition.workspace = true license.workspace = true +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -30,12 +31,12 @@ zeroize.workspace = true rand = { workspace = true } -nym-bin-common = { path = "../../common/bin-common" } -nym-compact-ecash = { path = "../../common/nym_offline_compact_ecash" } -nym-credentials = { path = "../../common/credentials" } -nym-crypto = { path = "../../common/crypto", features = ["asymmetric", "rand"] } -nym-http-api-client = { path = "../../common/http-api-client" } -wasm-utils = { path = "../../common/wasm/utils" } +nym-bin-common = { workspace = true } +nym-compact-ecash = { workspace = true } +nym-credentials = { workspace = true } +nym-crypto = { workspace = true, features = ["asymmetric", "rand"] } +nym-http-api-client = { workspace = true } +nym-wasm-utils = { workspace = true } [dev-dependencies] anyhow = { workspace = true } @@ -43,4 +44,4 @@ tokio = { workspace = true, features = ["full"] } [package.metadata.wasm-pack.profile.release] -wasm-opt = false \ No newline at end of file +wasm-opt = false diff --git a/wasm/zknym-lib/src/bandwidth_voucher.rs b/wasm/zknym-lib/src/bandwidth_voucher.rs index d64fdd58f37..7c5307ad7fd 100644 --- a/wasm/zknym-lib/src/bandwidth_voucher.rs +++ b/wasm/zknym-lib/src/bandwidth_voucher.rs @@ -19,7 +19,7 @@ // use std::collections::HashMap; // use tsify::Tsify; // use wasm_bindgen::prelude::wasm_bindgen; -// use wasm_utils::console_error; +// use nym_wasm_utils::console_error; // use zeroize::{Zeroize, ZeroizeOnDrop, Zeroizing}; // // // tiny 'hacks' to just allow passing responses from vpn-api queries diff --git a/wasm/zknym-lib/src/error.rs b/wasm/zknym-lib/src/error.rs index b06ca52ef28..31b80919272 100644 --- a/wasm/zknym-lib/src/error.rs +++ b/wasm/zknym-lib/src/error.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use nym_http_api_client::HttpClientError; +use nym_wasm_utils::wasm_error; use thiserror::Error; -use wasm_utils::wasm_error; #[derive(Debug, Error)] pub enum ZkNymError { diff --git a/wasm/zknym-lib/src/lib.rs b/wasm/zknym-lib/src/lib.rs index 4d0b3422328..7bff719be45 100644 --- a/wasm/zknym-lib/src/lib.rs +++ b/wasm/zknym-lib/src/lib.rs @@ -23,8 +23,8 @@ pub(crate) mod vpn_api_client; #[wasm_bindgen(start)] // #[cfg(target_arch = "wasm32")] pub fn main() { - wasm_utils::console_log!("[rust main]: rust module loaded"); - wasm_utils::console_log!( + nym_wasm_utils::console_log!("[rust main]: rust module loaded"); + nym_wasm_utils::console_log!( "wasm zk-nym version used: {}", nym_bin_common::bin_info_owned!() );