diff --git a/.circleci/config.yml b/.circleci/config.yml index 2aef0a5b0..c18c26dfe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -53,7 +53,7 @@ workflows: name: Run cargo tests (<< matrix.rust_channel >> rust on << matrix.platform >>) matrix: parameters: - platform: [amd_centos, arm_ubuntu, amd_macos, arm_macos, amd_windows] + platform: [amd_centos, arm_ubuntu, amd_linux, amd_macos, arm_macos, amd_windows] rust_channel: [stable] command: [test] @@ -63,7 +63,7 @@ workflows: name: Run cargo tests (<< matrix.rust_channel >> rust on << matrix.platform >>) matrix: parameters: - platform: [amd_centos, arm_ubuntu, amd_macos, arm_macos, amd_windows] + platform: [amd_centos, arm_ubuntu, amd_linux, amd_macos, arm_macos, amd_windows] rust_channel: [stable] command: [test] <<: *any_release @@ -215,7 +215,12 @@ executors: resource_class: xlarge environment: XTASK_TARGET: "x86_64-unknown-linux-gnu" - + amd_linux: &amd_linux_build_executor + docker: + - image: cimg/base:stable + resource_class: xlarge + environment: + XTASK_TARGET: "x86_64-unknown-linux-gnu" arm_ubuntu: &arm_ubuntu_executor machine: image: ubuntu-2004:2022.04.1 diff --git a/federation-2/Cargo.lock b/federation-2/Cargo.lock index 805ce0563..c3181a5c2 100644 --- a/federation-2/Cargo.lock +++ b/federation-2/Cargo.lock @@ -24,14 +24,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c192eb8f11fc081b0fe4259ba5af04217d4e0faddd02417310a927911abd7c8" dependencies = [ "crypto-common", - "generic-array", + "generic-array 0.14.6", ] [[package]] name = "aes" -version = "0.8.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" dependencies = [ "cfg-if", "cipher", @@ -119,13 +119,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 1.0.107", ] [[package]] @@ -162,24 +162,15 @@ dependencies = [ [[package]] name = "base16ct" -version = "0.2.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" [[package]] name = "base64" -version = "0.21.7" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64-simd" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5" -dependencies = [ - "simd-abstraction", -] +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64-simd" @@ -187,7 +178,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" dependencies = [ - "outref 0.5.1", + "outref", "vsimd", ] @@ -197,30 +188,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - [[package]] name = "bitflags" version = "1.3.2" @@ -233,25 +200,13 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - [[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.6", ] [[package]] @@ -260,7 +215,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a90ec2df9600c28a01c56c4784c9207a96d2451833aeceb8cc97e4c9548bb78" dependencies = [ - "generic-array", + "generic-array 0.14.6", ] [[package]] @@ -277,9 +232,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.6.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "camino" @@ -307,9 +262,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.97" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-if" @@ -390,6 +345,15 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + [[package]] name = "concurrent-queue" version = "2.1.0" @@ -423,17 +387,11 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" -[[package]] -name = "cooked-waker" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147be55d677052dabc6b22252d5dd0fd4c29c8c27aa4f2fbef0f94aa003b406f" - [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" dependencies = [ "libc", ] @@ -515,7 +473,7 @@ dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.7.1", + "memoffset", "scopeguard", ] @@ -530,12 +488,12 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.5.5" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ - "generic-array", - "rand_core", + "generic-array 0.14.6", + "rand_core 0.6.4", "subtle", "zeroize", ] @@ -546,8 +504,8 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array", - "rand_core", + "generic-array 0.14.6", + "rand_core 0.6.4", "typenum", ] @@ -562,29 +520,28 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +checksum = "4a9b85542f99a2dfa2a1b8e192662741c9859a846b296bef1c92ef9b58b5a216" dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "fiat-crypto", - "platforms", - "rustc_version 0.4.0", + "byteorder", + "digest 0.8.1", + "rand_core 0.5.1", "subtle", "zeroize", ] [[package]] -name = "curve25519-dalek-derive" -version = "0.1.1" +name = "curve25519-dalek" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", + "byteorder", + "digest 0.9.0", + "rand_core 0.5.1", + "subtle", + "zeroize", ] [[package]] @@ -623,48 +580,51 @@ dependencies = [ ] [[package]] -name = "data-encoding" -version = "2.6.0" +name = "deno-proc-macro-rules" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" +checksum = "3c65c2ffdafc1564565200967edc4851c7b55422d3913466688907efd05ea26f" +dependencies = [ + "deno-proc-macro-rules-macros", + "proc-macro2", + "syn 2.0.48", +] [[package]] -name = "debugid" -version = "0.8.0" +name = "deno-proc-macro-rules-macros" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +checksum = "3047b312b7451e3190865713a4dd6e1f821aed614ada219766ebc3024a690435" dependencies = [ - "serde", - "uuid", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.48", ] [[package]] name = "deno_console" -version = "0.151.0" +version = "0.115.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1657ea36f527a5fa3b3d9c1ad9b9f0c9c0b263f966079f5aa0c7c09ff6f4e2e" +checksum = "19ab05b798826985966deb29fc6773ed29570de2f2147a30c4289c7cdf635214" dependencies = [ "deno_core", ] [[package]] name = "deno_core" -version = "0.280.0" +version = "0.200.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12d26f2d3e243bbbdd0851ab542b20ec48ac1fcf6c64ab06e81133da3113ebdd" +checksum = "a8ba264b90ceb6e95b39d82e674d8ecae86ca012f900338ea50d1a077d9d75fd" dependencies = [ "anyhow", - "bincode", - "bit-set", - "bit-vec", "bytes", - "cooked-waker", - "deno_core_icudata", "deno_ops", - "deno_unsync", "futures", + "indexmap 1.9.2", "libc", - "memoffset 0.9.1", + "log", + "once_cell", "parking_lot", "pin-project", "serde", @@ -672,23 +632,16 @@ dependencies = [ "serde_v8", "smallvec", "sourcemap", - "static_assertions", "tokio", "url", "v8", ] -[[package]] -name = "deno_core_icudata" -version = "0.0.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1" - [[package]] name = "deno_crypto" -version = "0.165.0" +version = "0.129.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f399d4bd84b014f5dcf9f0ceda39d7fc5624c732fb2c71f93dea4af2b5daa706" +checksum = "7247d39660238354f71103f0db7a944c3ac3fb6759ab5410d708f7496eaa89a5" dependencies = [ "aes", "aes-gcm", @@ -697,7 +650,7 @@ dependencies = [ "cbc", "const-oid", "ctr", - "curve25519-dalek", + "curve25519-dalek 2.1.3", "deno_core", "deno_web", "elliptic-curve", @@ -705,10 +658,10 @@ dependencies = [ "once_cell", "p256", "p384", - "p521", "rand", "ring", "rsa", + "sec1", "serde", "serde_bytes", "sha1", @@ -722,33 +675,30 @@ dependencies = [ [[package]] name = "deno_ops" -version = "0.156.0" +version = "0.78.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8237b272db1a6cb941b8a5a63ba63539004a8263e8b0230a11136d76eea273f9" +checksum = "ffd1c83b1fd465ee0156f2917c9af9ca09fe2bf54052a2cae1a8dcbc7b89aefc" dependencies = [ - "proc-macro-rules", + "deno-proc-macro-rules", + "lazy-regex", + "once_cell", + "pmutil", + "proc-macro-crate", "proc-macro2", "quote", + "regex", "strum", "strum_macros", + "syn 1.0.107", "syn 2.0.48", "thiserror", ] -[[package]] -name = "deno_unsync" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d79c7af81e0a5ac75cff7b2fff4d1896e2bff694c688258edf21ef8a519736" -dependencies = [ - "tokio", -] - [[package]] name = "deno_url" -version = "0.151.0" +version = "0.115.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6babc9a52e441a08f9c4f03309fe80f1f7294a4c227bbddf064b3e1c62abbf0" +checksum = "20490fff3b0f8c176a815e26371ff23313ea7f39cd51057701524c5b6fc36f6c" dependencies = [ "deno_core", "serde", @@ -757,17 +707,15 @@ dependencies = [ [[package]] name = "deno_web" -version = "0.182.0" +version = "0.146.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ce3a0a97a69379188214d92e03c22437f96f068d37686d1cd1eff34e4517a8" +checksum = "1dc8dda6e1337d4739ae9e94d75521689824d82a7deb154a2972b6eedac64507" dependencies = [ "async-trait", - "base64-simd 0.8.0", - "bytes", + "base64-simd", "deno_core", "encoding_rs", "flate2", - "futures", "serde", "tokio", "uuid", @@ -776,18 +724,18 @@ dependencies = [ [[package]] name = "deno_webidl" -version = "0.151.0" +version = "0.115.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ffa30c6acba42d8a4d952514bbb7b5d247b9c900fa1fd82ce9084c32f640827" +checksum = "73159d81053ead02e938b46d4bb7224c8e7cf25273ac16a250fb45bb09af7635" dependencies = [ "deno_core", ] [[package]] name = "der" -version = "0.7.9" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ "const-oid", "pem-rfc7468", @@ -815,9 +763,27 @@ checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" [[package]] name = "digest" -version = "0.10.7" +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.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array 0.14.6", +] + +[[package]] +name = "digest" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer", "const-oid", @@ -827,16 +793,14 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.16.9" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ "der", - "digest", "elliptic-curve", "rfc6979", "signature", - "spki", ] [[package]] @@ -847,20 +811,21 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" [[package]] name = "elliptic-curve" -version = "0.13.8" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ "base16ct", "crypto-bigint", - "digest", + "der", + "digest 0.10.6", "ff", - "generic-array", + "generic-array 0.14.6", "group", "hkdf", "pem-rfc7468", "pkcs8", - "rand_core", + "rand_core 0.6.4", "sec1", "subtle", "zeroize", @@ -874,9 +839,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" dependencies = [ "cfg-if", ] @@ -905,20 +870,14 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "ff" -version = "0.13.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" dependencies = [ - "rand_core", + "rand_core 0.6.4", "subtle", ] -[[package]] -name = "fiat-crypto" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" - [[package]] name = "flate2" version = "1.0.27" @@ -926,6 +885,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", + "libz-ng-sys", "miniz_oxide", ] @@ -946,20 +906,14 @@ dependencies = [ [[package]] name = "fslock" -version = "0.2.1" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" +checksum = "57eafdd0c16f57161105ae1b98a1238f97645f2f588438b2949c99a2af9616bf" dependencies = [ "libc", "winapi", ] -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - [[package]] name = "futures" version = "0.3.29" @@ -1049,6 +1003,15 @@ dependencies = [ "slab", ] +[[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.6" @@ -1057,18 +1020,28 @@ checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", "version_check", - "zeroize", ] [[package]] name = "getrandom" -version = "0.2.14" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] @@ -1089,24 +1062,15 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "group" -version = "0.13.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ "ff", - "rand_core", + "rand_core 0.6.4", "subtle", ] -[[package]] -name = "gzip-header" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95cc527b92e6029a62960ad99aa8a6660faa4555fe5f731aab13aa6a921795a2" -dependencies = [ - "crc32fast", -] - [[package]] name = "half" version = "1.8.2" @@ -1124,7 +1088,7 @@ dependencies = [ "serde", "serde_json", "toml_edit", - "which 4.4.2", + "which", ] [[package]] @@ -1197,7 +1161,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest", + "digest 0.10.6", ] [[package]] @@ -1258,7 +1222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ "block-padding", - "generic-array", + "generic-array 0.14.6", ] [[package]] @@ -1299,13 +1263,36 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "lazy-regex" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff63c423c68ea6814b7da9e88ce585f793c87ddd9e78f646970891769c8235d4" +dependencies = [ + "lazy-regex-proc_macros", + "once_cell", + "regex", +] + +[[package]] +name = "lazy-regex-proc_macros" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8edfc11b8f56ce85e207e62ea21557cfa09bb24a8f6b04ae181b086ff8611c22" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "syn 1.0.107", +] + [[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" dependencies = [ - "spin 0.5.2", + "spin", ] [[package]] @@ -1320,6 +1307,16 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +[[package]] +name = "libz-ng-sys" +version = "1.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dd9f43e75536a46ee0f92b758f6b63846e594e86638c61a9251338a65baea63" +dependencies = [ + "cmake", + "libc", +] + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -1375,20 +1372,11 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] @@ -1400,7 +1388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.48.0", ] @@ -1495,9 +1483,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "oorandom" @@ -1517,12 +1505,6 @@ version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" -[[package]] -name = "outref" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4" - [[package]] name = "outref" version = "0.5.1" @@ -1537,39 +1519,23 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "p256" -version = "0.13.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa", "elliptic-curve", - "primeorder", "sha2", ] [[package]] name = "p384" -version = "0.13.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" dependencies = [ "ecdsa", "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "p521" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2" -dependencies = [ - "base16ct", - "ecdsa", - "elliptic-curve", - "primeorder", - "rand_core", "sha2", ] @@ -1598,9 +1564,9 @@ dependencies = [ [[package]] name = "pem-rfc7468" -version = "0.7.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" dependencies = [ "base64ct", ] @@ -1645,31 +1611,26 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkcs1" -version = "0.7.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +checksum = "eff33bdbdfc54cc98a2eca766ebdec3e1b8fb7387523d5c9c9a2891da856f719" dependencies = [ "der", "pkcs8", "spki", + "zeroize", ] [[package]] name = "pkcs8" -version = "0.10.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" dependencies = [ "der", "spki", ] -[[package]] -name = "platforms" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" - [[package]] name = "plotters" version = "0.3.4" @@ -1698,6 +1659,17 @@ dependencies = [ "plotters-backend", ] +[[package]] +name = "pmutil" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "polyval" version = "0.6.0" @@ -1727,12 +1699,14 @@ dependencies = [ ] [[package]] -name = "primeorder" -version = "0.13.6" +name = "proc-macro-crate" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" dependencies = [ - "elliptic-curve", + "once_cell", + "thiserror", + "toml", ] [[package]] @@ -1759,29 +1733,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-rules" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f" -dependencies = [ - "proc-macro-rules-macros", - "proc-macro2", - "syn 2.0.48", -] - -[[package]] -name = "proc-macro-rules-macros" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "207fffb0fe655d1d47f6af98cc2793405e85929bdbc420d685554ff07be27ac7" -dependencies = [ - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "proc-macro2" version = "1.0.76" @@ -1800,12 +1751,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - [[package]] name = "rand" version = "0.8.5" @@ -1814,7 +1759,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha", - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -1824,7 +1769,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", ] [[package]] @@ -1833,7 +1787,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.8", ] [[package]] @@ -1901,27 +1855,28 @@ checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" [[package]] name = "rfc6979" -version = "0.4.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ + "crypto-bigint", "hmac", - "subtle", + "zeroize", ] [[package]] name = "ring" -version = "0.17.8" +version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" dependencies = [ "cc", - "cfg-if", - "getrandom", "libc", - "spin 0.9.8", + "once_cell", + "spin", "untrusted", - "windows-sys 0.52.0", + "web-sys", + "winapi", ] [[package]] @@ -1949,25 +1904,26 @@ dependencies = [ "tower-service", "tracing", "tracing-test", - "which 4.4.2", + "which", ] [[package]] name = "rsa" -version = "0.9.6" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +checksum = "094052d5470cbcef561cb848a7209968c9f12dfa6d668f4bca048ac5de51099c" dependencies = [ - "const-oid", - "digest", + "byteorder", + "digest 0.10.6", "num-bigint-dig", "num-integer", + "num-iter", "num-traits", "pkcs1", "pkcs8", - "rand_core", + "rand_core 0.6.4", "signature", - "spki", + "smallvec", "subtle", "zeroize", ] @@ -1978,12 +1934,6 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc_version" version = "0.2.3" @@ -2044,13 +1994,13 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "sec1" -version = "0.7.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ "base16ct", "der", - "generic-array", + "generic-array 0.14.6", "pkcs8", "subtle", "zeroize", @@ -2123,12 +2073,15 @@ dependencies = [ [[package]] name = "serde_v8" -version = "0.189.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "893c995255d6fbf55c33166b651fd037c4e3cc7864bf82213ea18d0ec94ed165" +checksum = "309b3060a9627882514f3a3ce3cc08ceb347a76aeeadc58f138c3f189cf88b71" dependencies = [ + "bytes", + "derive_more", "num-bigint", "serde", + "serde_bytes", "smallvec", "thiserror", "v8", @@ -2170,24 +2123,24 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.6" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", - "digest", + "digest 0.10.6", ] [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest", + "digest 0.10.6", ] [[package]] @@ -2210,21 +2163,12 @@ dependencies = [ [[package]] name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core", -] - -[[package]] -name = "simd-abstraction" -version = "0.7.1" +version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "outref 0.1.0", + "digest 0.10.6", + "rand_core 0.6.4", ] [[package]] @@ -2260,20 +2204,16 @@ dependencies = [ [[package]] name = "sourcemap" -version = "8.0.1" +version = "6.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "208d40b9e8cad9f93613778ea295ed8f3c2b1824217c6cfc7219d3f6f45b96d4" +checksum = "aebe057d110ddba043708da3fb010bf562ff6e9d4d60c9ee92860527bcbeccd6" dependencies = [ - "base64-simd 0.7.0", - "bitvec", - "data-encoding", - "debugid", + "base64", "if_chain", - "rustc-hash", "rustc_version 0.2.3", "serde", "serde_json", - "unicode-id-start", + "unicode-id", "url", ] @@ -2283,28 +2223,16 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - [[package]] name = "spki" -version = "0.7.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" dependencies = [ "base64ct", "der", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strsim" version = "0.8.0" @@ -2415,12 +2343,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "textwrap" version = "0.11.0" @@ -2492,9 +2414,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.37.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", @@ -2533,6 +2455,15 @@ dependencies = [ "tokio", ] +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + [[package]] name = "toml_datetime" version = "0.6.2" @@ -2723,10 +2654,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" [[package]] -name = "unicode-id-start" -version = "1.1.2" +name = "unicode-id" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f73150333cb58412db36f2aca8f2875b013049705cc77b94ded70a1ab1f5da" +checksum = "d70b6494226b36008c8366c288d77190b3fad2eb4c10533139c1c1f461127f1a" [[package]] name = "unicode-ident" @@ -2773,9 +2704,9 @@ dependencies = [ [[package]] name = "untrusted" -version = "0.9.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" @@ -2808,23 +2739,20 @@ version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" dependencies = [ - "getrandom", + "getrandom 0.2.8", "serde", ] [[package]] name = "v8" -version = "0.91.1" +version = "0.74.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69026e2e8af55a4d2f20c0c17f690e8b31472bf76ab75b1205d3a0fab60c8f84" +checksum = "2eedac634b8dd39b889c5b62349cbc55913780226239166435c5cf66771792ea" dependencies = [ - "bitflags 2.4.1", + "bitflags 1.3.2", "fslock", - "gzip-header", - "home", - "miniz_oxide", "once_cell", - "which 5.0.0", + "which", ] [[package]] @@ -2862,6 +2790,12 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2944,19 +2878,6 @@ dependencies = [ "rustix", ] -[[package]] -name = "which" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", - "windows-sys 0.48.0", -] - [[package]] name = "winapi" version = "0.3.9" @@ -3186,24 +3107,14 @@ dependencies = [ "memchr", ] -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - [[package]] name = "x25519-dalek" -version = "2.0.1" +version = "2.0.0-pre.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" +checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" dependencies = [ - "curve25519-dalek", - "rand_core", - "serde", + "curve25519-dalek 3.2.0", + "rand_core 0.6.4", "zeroize", ] @@ -3224,9 +3135,9 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zeroize" -version = "1.7.0" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" dependencies = [ "zeroize_derive", ] diff --git a/federation-2/harmonizer/Cargo.toml b/federation-2/harmonizer/Cargo.toml index a567ddb4a..89d6545d2 100644 --- a/federation-2/harmonizer/Cargo.toml +++ b/federation-2/harmonizer/Cargo.toml @@ -22,7 +22,7 @@ include = [ apollo-federation-types = { version = "0.11.0", path = "../../apollo-federation-types", default-features = false, features = [ "build", ] } -deno_core = "0.280.0" +deno_core = "0.200.0" serde = { version = "1", features = ["derive"] } serde_json = "1" @@ -30,7 +30,7 @@ serde_json = "1" insta = "1.34.0" [build-dependencies] -deno_core = "0.280.0" +deno_core = "0.200.0" semver = "1" serde_json = "1" toml_edit = "0.19" diff --git a/federation-2/harmonizer/build.rs b/federation-2/harmonizer/build.rs index 20f3e1630..c120073df 100644 --- a/federation-2/harmonizer/build.rs +++ b/federation-2/harmonizer/build.rs @@ -209,13 +209,16 @@ fn create_snapshot(out_dir: &Path) -> Result<(), Box> { // functions for interacting with it. let runtime_str = read_to_string("bundled/runtime.js").unwrap(); runtime - .execute_script("", runtime_str) + .execute_script("", deno_core::FastString::Owned(runtime_str.into())) .expect("unable to initialize router bridge runtime environment"); // Load the composition library. let bridge_str = read_to_string("bundled/composition_bridge.js").unwrap(); runtime - .execute_script("composition_bridge.js", bridge_str) + .execute_script( + "composition_bridge.js", + deno_core::FastString::Owned(bridge_str.into()), + ) .expect("unable to evaluate bridge module"); // Create our base query snapshot which will be included in diff --git a/federation-2/harmonizer/src/lib.rs b/federation-2/harmonizer/src/lib.rs index 28e0048e7..61abee2d1 100644 --- a/federation-2/harmonizer/src/lib.rs +++ b/federation-2/harmonizer/src/lib.rs @@ -29,7 +29,7 @@ composition implementation while we work toward something else. #![forbid(unsafe_code)] #![deny(missing_debug_implementations, nonstandard_style)] #![warn(missing_docs, future_incompatible, unreachable_pub, rust_2018_idioms)] -use deno_core::{JsRuntime, RuntimeOptions}; +use deno_core::{JsRuntime, RuntimeOptions, Snapshot}; mod js_types; @@ -57,7 +57,7 @@ pub fn harmonize_limit( // Use our snapshot to provision our new runtime let options = RuntimeOptions { - startup_snapshot: Some(buffer), + startup_snapshot: Some(Snapshot::Static(buffer)), ..Default::default() }; let mut runtime = JsRuntime::new(options); @@ -71,24 +71,33 @@ pub fn harmonize_limit( // store the subgraph definition JSON in the `serviceList` variable runtime - .execute_script("", service_list_javascript) + .execute_script( + "", + deno_core::FastString::Owned(service_list_javascript.into()), + ) .expect("unable to evaluate service list in JavaScript runtime"); // store the nodes_limit variable in the nodesLimit variable runtime .execute_script( "", - format!( - "nodesLimit = {}", - nodes_limit - .map(|n| n.to_string()) - .unwrap_or("null".to_string()) + deno_core::FastString::Owned( + format!( + "nodesLimit = {}", + nodes_limit + .map(|n| n.to_string()) + .unwrap_or("null".to_string()) + ) + .into(), ), ) .expect("unable to evaluate nodes limit in JavaScript runtime"); // run the unmodified do_compose.js file, which expects `serviceList` to be set - match runtime.execute_script("do_compose", include_str!("../bundled/do_compose.js")) { + match runtime.execute_script( + "do_compose", + deno_core::FastString::Static(include_str!("../bundled/do_compose.js")), + ) { Ok(execute_result) => { let scope = &mut runtime.handle_scope(); let local = deno_core::v8::Local::new(scope, execute_result); diff --git a/federation-2/router-bridge/Cargo.toml b/federation-2/router-bridge/Cargo.toml index d738f6620..41858b321 100644 --- a/federation-2/router-bridge/Cargo.toml +++ b/federation-2/router-bridge/Cargo.toml @@ -23,12 +23,12 @@ include = [ [dependencies] anyhow = "1.0.79" async-channel = "1.9.0" -deno_console = "0.151.0" -deno_core = "0.280.0" -deno_crypto = "0.165.0" -deno_url = "0.151.0" -deno_web = "0.182.0" -deno_webidl = "0.151.0" +deno_console = "0.115.0" +deno_core = "0.200.0" +deno_crypto = "0.129.0" +deno_url = "0.115.0" +deno_web = "0.146.0" +deno_webidl = "0.115.0" rand = "0.8.5" serde = { version = "1.0.195", features = ["derive"] } serde_json = { version = "1.0.111", features = ["preserve_order"] } @@ -46,12 +46,12 @@ tracing-test = "0.2.1" criterion = { version = "0.4", features = ["async_tokio", "async_futures"] } [build-dependencies] -deno_console = "0.151.0" -deno_core = "0.280.0" -deno_crypto = "0.165.0" -deno_url = "0.151.0" -deno_web = "0.182.0" -deno_webidl = "0.151.0" +deno_console = "0.115.0" +deno_core = "0.200.0" +deno_crypto = "0.129.0" +deno_url = "0.115.0" +deno_web = "0.146.0" +deno_webidl = "0.115.0" which = "4.4.2" [features] diff --git a/federation-2/router-bridge/build.rs b/federation-2/router-bridge/build.rs index 438fa5fc7..7d11e90ca 100644 --- a/federation-2/router-bridge/build.rs +++ b/federation-2/router-bridge/build.rs @@ -96,13 +96,13 @@ fn create_snapshot(out_dir: &Path) { // functions for interacting with it. let runtime_str = read_to_string("bundled/runtime.js").unwrap(); runtime - .execute_script("", runtime_str) + .execute_script("", deno_core::FastString::Owned(runtime_str.into())) .expect("unable to initialize router bridge runtime environment"); // Load the composition library. let bridge_str = read_to_string("bundled/bridge.js").unwrap(); runtime - .execute_script("bridge.js", bridge_str) + .execute_script("bridge.js", deno_core::FastString::Owned(bridge_str.into())) .expect("unable to evaluate bridge module"); // Create our base query snapshot which will be included in @@ -118,4 +118,8 @@ impl deno_web::TimersPermission for Permissions { fn allow_hrtime(&mut self) -> bool { unreachable!("snapshotting!") } + + fn check_unstable(&self, _state: &deno_core::OpState, _api_name: &'static str) { + unreachable!("snapshotting!") + } } diff --git a/federation-2/router-bridge/js-src/test_logger_worker.ts b/federation-2/router-bridge/js-src/test_logger_worker.ts index 87d3717bc..5fb61072e 100644 --- a/federation-2/router-bridge/js-src/test_logger_worker.ts +++ b/federation-2/router-bridge/js-src/test_logger_worker.ts @@ -38,10 +38,11 @@ type CommandResult = { payload: boolean; }; -const send = async (result: CommandResult): Promise => - await Deno.core.ops.send(result); - -const receive = async (): Promise => await Deno.core.ops.receive(); +const send = async (result: CommandResult): Promise => { + await Deno.core.opAsync("send", result); +}; +const receive = async (): Promise => + await Deno.core.opAsync("receive"); async function run() { while (true) { diff --git a/federation-2/router-bridge/src/js.rs b/federation-2/router-bridge/src/js.rs index cf48ac86d..582e46915 100644 --- a/federation-2/router-bridge/src/js.rs +++ b/federation-2/router-bridge/src/js.rs @@ -1,6 +1,6 @@ use crate::error::Error; /// Wraps creating the Deno Js runtime collecting parameters and executing a script. -use deno_core::{Extension, JsRuntime, RuntimeOptions}; +use deno_core::{Extension, JsRuntime, RuntimeOptions, Snapshot}; use serde::de::DeserializeOwned; use serde::Serialize; @@ -51,11 +51,14 @@ impl Js { for parameter in self.parameters.iter() { runtime - .execute_script(parameter.0, parameter.1.clone()) + .execute_script( + parameter.0, + deno_core::FastString::Owned(parameter.1.clone().into()), + ) .expect("unable to evaluate service list in JavaScript runtime"); } - match runtime.execute_script(name, source) { + match runtime.execute_script(name, deno_core::FastString::Static(source)) { Ok(execute_result) => { let scope = &mut runtime.handle_scope(); let local = deno_core::v8::Local::new(scope, execute_result); @@ -111,6 +114,10 @@ impl Js { // not needed in the planner false } + + fn check_unstable(&self, _state: &deno_core::OpState, _api_name: &'static str) { + unreachable!("not needed in the planner") + } } #[cfg(not(all(target_os = "macos", target_arch = "x86_64")))] @@ -123,7 +130,7 @@ impl Js { deno_crypto::deno_crypto::init_ops(None), my_ext, ], - startup_snapshot: Some(buffer), + startup_snapshot: Some(Snapshot::Static(buffer)), ..Default::default() }); @@ -148,13 +155,13 @@ impl Js { // functions for interacting with it. let runtime_str = include_str!("../bundled/runtime.js"); js_runtime - .execute_script("", runtime_str) + .execute_script("", deno_core::FastString::Owned(runtime_str.into())) .expect("unable to initialize router bridge runtime environment"); // Load the composition library. let bridge_str = include_str!("../bundled/bridge.js"); js_runtime - .execute_script("bridge.js", bridge_str) + .execute_script("bridge.js", deno_core::FastString::Owned(bridge_str.into())) .expect("unable to evaluate bridge module"); js_runtime }; diff --git a/federation-2/router-bridge/src/worker.rs b/federation-2/router-bridge/src/worker.rs index c06f96f30..d6aafe031 100644 --- a/federation-2/router-bridge/src/worker.rs +++ b/federation-2/router-bridge/src/worker.rs @@ -1,6 +1,7 @@ use crate::error::Error; use async_channel::{bounded, Receiver, Sender}; -use deno_core::{op2, Extension, OpState}; +use deno_core::Op; +use deno_core::{op, Extension, OpState}; use serde::de::DeserializeOwned; use serde::Deserialize; use serde::Serialize; @@ -8,6 +9,7 @@ use std::borrow::Cow; use std::cell::RefCell; use std::collections::hash_map::DefaultHasher; use std::collections::HashMap; +use std::convert::TryFrom; use std::fmt::Debug; use std::hash::Hasher; use std::rc::Rc; @@ -66,14 +68,14 @@ impl JsWorker { let handle = std::thread::spawn(move || { let my_ext = Extension { name: concat!(env!("CARGO_PKG_NAME"), "_worker"), - ops: Cow::Owned(vec![ - send(), - receive(), - log_trace(), - log_debug(), - log_info(), - log_warn(), - log_error(), + ops: Cow::Borrowed(&[ + send::DECL, + receive::DECL, + log_trace::DECL, + log_debug::DECL, + log_info::DECL, + log_warn::DECL, + log_error::DECL, ]), op_state_fn: Some(Box::new(move |state| { state.put(response_sender.clone()); @@ -92,9 +94,9 @@ impl JsWorker { let future = async move { js_runtime - .execute_script("worker.js", worker_source_code) + .execute_script_static("worker.js", worker_source_code) .unwrap(); - js_runtime.run_event_loop(Default::default()).await + js_runtime.run_event_loop(false).await }; runtime.block_on(future).unwrap(); }); @@ -219,41 +221,38 @@ impl Drop for JsWorker { } // Logging capabilities -#[op2(fast)] -fn log_trace(_: &mut OpState, #[string] message: String) -> Result<(), anyhow::Error> { +#[op] +fn log_trace(_: &mut OpState, message: String) -> Result<(), anyhow::Error> { tracing::trace!("{message}"); Ok(()) } -#[op2(fast)] -fn log_debug(_: &mut OpState, #[string] message: String) -> Result<(), anyhow::Error> { +#[op] +fn log_debug(_: &mut OpState, message: String) -> Result<(), anyhow::Error> { tracing::debug!("{message}"); Ok(()) } -#[op2(fast)] -fn log_info(_: &mut OpState, #[string] message: String) -> Result<(), anyhow::Error> { +#[op] +fn log_info(_: &mut OpState, message: String) -> Result<(), anyhow::Error> { tracing::info!("{message}"); Ok(()) } -#[op2(fast)] -fn log_warn(_: &mut OpState, #[string] message: String) -> Result<(), anyhow::Error> { +#[op] +fn log_warn(_: &mut OpState, message: String) -> Result<(), anyhow::Error> { tracing::warn!("{message}"); Ok(()) } -#[op2(fast)] -fn log_error(_: &mut OpState, #[string] message: String) -> Result<(), anyhow::Error> { +#[op] +fn log_error(_: &mut OpState, message: String) -> Result<(), anyhow::Error> { tracing::error!("{message}"); Ok(()) } -#[op2(async)] -async fn send( - state: Rc>, - #[serde] payload: JsonPayload, -) -> Result<(), anyhow::Error> { +#[op] +async fn send(state: Rc>, payload: JsonPayload) -> Result<(), anyhow::Error> { let sender = { let state = state.borrow(); // we're cloning here because we don't wanna keep the borrow across an await point @@ -266,8 +265,7 @@ async fn send( .map_err(|e| anyhow::anyhow!("couldn't send response {e}")) } -#[op2(async)] -#[serde] +#[op] async fn receive(state: Rc>) -> Result { let receiver = { let state = state.borrow();