From c308cd68f10bafcbb237cb526d96a7c9b722cbc9 Mon Sep 17 00:00:00 2001 From: ThetaSinner Date: Mon, 6 May 2024 11:59:03 +0100 Subject: [PATCH] Update to weekly 0.3-48 (#32) --- .github/workflows/test.yaml | 2 +- Cargo.lock | 1439 ++++++++------------ Cargo.toml | 16 +- bindings/client/src/admin_websocket.rs | 20 +- bindings/client/src/app_agent_websocket.rs | 104 -- bindings/client/src/app_websocket.rs | 62 +- bindings/client/src/lib.rs | 2 - bindings/runner/src/common.rs | 46 +- bindings/runner/src/context.rs | 12 +- flake.lock | 64 +- flake.nix | 2 +- 11 files changed, 673 insertions(+), 1096 deletions(-) delete mode 100644 bindings/client/src/app_agent_websocket.rs diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index f6bc320b..ab8fb4ce 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -25,7 +25,7 @@ jobs: remove-docker-images: 'true' - name: Install nix - uses: cachix/install-nix-action@v25 + uses: cachix/install-nix-action@v26 with: install_url: https://releases.nixos.org/nix/nix-2.20.4/install extra_nix_config: | diff --git a/Cargo.lock b/Cargo.lock index 378a3a5d..b883ce3a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -51,7 +51,7 @@ version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "getrandom 0.2.14", "once_cell", "version_check", @@ -99,47 +99,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -161,16 +162,19 @@ dependencies = [ ] [[package]] -name = "arrayref" -version = "0.3.7" +name = "arbitrary" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] [[package]] -name = "arrayvec" -version = "0.5.2" +name = "arrayref" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -186,7 +190,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -200,15 +204,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "autocfg" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" -dependencies = [ - "autocfg 1.2.0", -] - [[package]] name = "autocfg" version = "1.2.0" @@ -221,7 +216,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b99d887f4066f8a1b4a713a8121fab07ff543863ac86177ebdee6b5cb18acf12" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "derive_more", "serde", "shrinkwraprs", @@ -235,7 +230,7 @@ checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object", @@ -255,16 +250,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] -name = "base64ct" -version = "1.6.0" +name = "base64" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] -name = "bimap" -version = "0.6.3" +name = "base64ct" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bincode" @@ -316,12 +311,12 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "0.5.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec", "constant_time_eq", ] @@ -364,9 +359,9 @@ dependencies = [ [[package]] name = "bytecount" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" +checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" [[package]] name = "bytemuck" @@ -420,15 +415,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.94" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" [[package]] name = "cfg-if" @@ -436,16 +425,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "chashmap" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e651a8c1eb0cbbaa730f705e2531e75276c6f2bbe2eb12662cfd305213dff8" -dependencies = [ - "owning_ref", - "parking_lot 0.3.8", -] - [[package]] name = "chrono" version = "0.4.38" @@ -507,7 +486,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -516,20 +495,11 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "colored" @@ -562,9 +532,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convert_case" @@ -603,8 +573,8 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e" dependencies = [ - "autocfg 1.2.0", - "cfg-if 1.0.0", + "autocfg", + "cfg-if", "libc", "scopeguard", "windows-sys 0.33.0", @@ -634,7 +604,7 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98b022ed2a5913a38839dfbafe6cf135342661293b08049843362df4301261dc" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", @@ -645,7 +615,7 @@ dependencies = [ "gimli 0.26.2", "log", "regalloc2", - "smallvec 1.13.2", + "smallvec", "target-lexicon", ] @@ -675,7 +645,7 @@ dependencies = [ "hashbrown 0.12.3", "indexmap 1.9.3", "log", - "smallvec 1.13.2", + "smallvec", ] [[package]] @@ -692,7 +662,7 @@ checksum = "0d70abacb8cfef3dc8ff7e8836e9c1d70f7967dfdac824a4cd5e30223415aca6" dependencies = [ "cranelift-codegen", "log", - "smallvec 1.13.2", + "smallvec", "target-lexicon", ] @@ -708,7 +678,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -787,7 +757,7 @@ version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest", @@ -806,27 +776,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", -] - -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core 0.10.2", - "darling_macro 0.10.2", -] - -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core 0.13.4", - "darling_macro 0.13.4", + "syn 2.0.60", ] [[package]] @@ -849,34 +799,6 @@ dependencies = [ "darling_macro 0.20.8", ] -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.9.3", - "syn 1.0.109", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - [[package]] name = "darling_core" version = "0.14.4" @@ -901,29 +823,8 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.59", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core 0.10.2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core 0.13.4", - "quote", - "syn 1.0.109", + "strsim 0.10.0", + "syn 2.0.60", ] [[package]] @@ -945,7 +846,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core 0.20.8", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -960,18 +861,18 @@ version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "cfg-if 1.0.0", - "hashbrown 0.14.3", - "lock_api 0.4.11", + "cfg-if", + "hashbrown 0.14.5", + "lock_api", "once_cell", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "der" @@ -995,28 +896,45 @@ dependencies = [ ] [[package]] -name = "derive_builder" -version = "0.9.0" +name = "derive_arbitrary" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ - "darling 0.10.2", - "derive_builder_core", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.60", +] + +[[package]] +name = "derive_builder" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +dependencies = [ + "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.9.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ - "darling 0.10.2", + "darling 0.20.8", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.60", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +dependencies = [ + "derive_builder_core", + "syn 2.0.60", ] [[package]] @@ -1049,12 +967,6 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - [[package]] name = "digest" version = "0.10.7" @@ -1065,33 +977,6 @@ dependencies = [ "crypto-common", ] -[[package]] -name = "directories" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c" -dependencies = [ - "cfg-if 0.1.10", - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "downcast" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" - [[package]] name = "dunce" version = "1.0.4" @@ -1141,7 +1026,7 @@ version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1182,7 +1067,7 @@ dependencies = [ "darling 0.20.8", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1259,15 +1144,15 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fiat-crypto" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" +checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e" [[package]] name = "filetime" @@ -1275,7 +1160,7 @@ version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall 0.4.1", "windows-sys 0.52.0", @@ -1283,13 +1168,13 @@ dependencies = [ [[package]] name = "fixt" -version = "0.3.0-beta-dev.3" +version = "0.3.0-beta-dev.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cedb5dcb3ce958d303400f6995d37d70c1af68892562844046ebd4e68a472f22" +checksum = "15a42490604e53370cd0f680d9eb53bf3dcf5ac95ca8b17fec4b3fef446d5a93" dependencies = [ "holochain_serialized_bytes", "lazy_static", - "parking_lot 0.10.2", + "parking_lot 0.12.2", "paste", "rand 0.8.5", "rand_core 0.6.4", @@ -1300,23 +1185,14 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", ] -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - [[package]] name = "fnv" version = "1.0.7" @@ -1347,18 +1223,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fragile" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - [[package]] name = "funty" version = "2.0.0" @@ -1421,7 +1285,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1491,7 +1355,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] @@ -1502,7 +1366,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi 0.11.0+wasi-snapshot-preview1", ] @@ -1558,6 +1422,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.1.0", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "happ_builder" version = "0.1.0" @@ -1589,9 +1472,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", "allocator-api2", @@ -1603,7 +1486,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -1623,9 +1506,9 @@ dependencies = [ [[package]] name = "hdi" -version = "0.4.0-beta-dev.35" +version = "0.4.0-beta-dev.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573077dc8ba0c02ec52b63505ffd09af58a4c724c3ee98a04375125109839c27" +checksum = "f825dde020258d4af03ea8c0d899d8000ccac86da32f2233ce7abf4629639378" dependencies = [ "getrandom 0.2.14", "hdk_derive", @@ -1641,9 +1524,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.3.0-beta-dev.39" +version = "0.3.0-beta-dev.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc83515fde323014ef26be88b617c0b5150426db0efac5471c9526147f5d235" +checksum = "bd3d886617f1d75d33ca49fbabf297b2829d1c7c9339564b82e4a1f4fa3d24f8" dependencies = [ "getrandom 0.2.14", "hdi", @@ -1661,12 +1544,12 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.3.0-beta-dev.33" +version = "0.3.0-beta-dev.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "902a95cf3524162f82f20e9d45a06814a2ad4811646b9bf523d865554b0db737" +checksum = "3eef3b13c4bda147be17280e1d6e0cd7838f58775dddd85268386b3ac83b5501" dependencies = [ "darling 0.14.4", - "heck 0.4.1", + "heck 0.5.0", "holochain_integrity_types", "paste", "proc-macro-error", @@ -1719,11 +1602,11 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.3.0-beta-dev.27" +version = "0.3.0-beta-dev.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6fb4f3280dab253ae029f1988e3cb118581a32a0ced1a42979847af69736e82" +checksum = "af6e4370993eb87c131fea8637c29a976942172cc62476537f3a6d91e78c57ee" dependencies = [ - "base64 0.13.1", + "base64 0.22.1", "blake2b_simd", "derive_more", "fixt", @@ -1742,9 +1625,9 @@ dependencies = [ [[package]] name = "holochain_client" -version = "0.5.0-dev.31" +version = "0.5.0-dev.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6148359fe400c1d99ae0c8448ae5166e1a3449d6d742bbd70934e26b514e483b" +checksum = "dc9d4415d789f6485a54d400745573cd879a85f37600b03ecb018a53124c03bc" dependencies = [ "again", "anyhow", @@ -1759,7 +1642,7 @@ dependencies = [ "holochain_websocket", "holochain_zome_types", "lair_keystore_api", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rand 0.8.5", "serde", "tokio", @@ -1782,12 +1665,11 @@ dependencies = [ [[package]] name = "holochain_conductor_api" -version = "0.3.0-beta-dev.45" +version = "0.3.0-beta-dev.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae4b9be652c5f449044a86d40309dc351f206cc91396f04d10947ddf509621c" +checksum = "6bd6433dc1b96c9441b9ff3dfd4a3579bda128f0702e9409f13b34d56ea4133d" dependencies = [ "derive_more", - "directories", "holo_hash", "holochain_keystore", "holochain_serialized_bytes", @@ -1797,10 +1679,8 @@ dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_types", "serde", - "serde_derive", "serde_yaml", "shrinkwraprs", - "structopt", "thiserror", "tracing", "url2", @@ -1808,9 +1688,9 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.3.0-beta-dev.32" +version = "0.3.0-beta-dev.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a302edef8a1e90a0e4842d767feb18815521e585bc1da6c9e64b1ef9c233ad7b" +checksum = "001d7a2fa9e6928f15f0b927de47f004a822e2d16f83c5851dc40fdb45b8f337" dependencies = [ "derive_builder", "holo_hash", @@ -1818,7 +1698,6 @@ dependencies = [ "holochain_serialized_bytes", "holochain_util", "kitsune_p2p_timestamp", - "paste", "serde", "serde_bytes", "subtle", @@ -1828,11 +1707,11 @@ dependencies = [ [[package]] name = "holochain_keystore" -version = "0.3.0-beta-dev.35" +version = "0.3.0-beta-dev.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1906732f0771cc7639e777df24046d85c6af8862d8fe2d009a8b14e166684891" +checksum = "b44fce278a61a90563ec2df630e91523f577e8f63f5a80558e35f18e3df78278" dependencies = [ - "base64 0.13.1", + "base64 0.22.1", "derive_more", "futures", "holo_hash", @@ -1843,9 +1722,9 @@ dependencies = [ "kitsune_p2p_types", "lair_keystore", "must_future", - "nanoid 0.4.0", + "nanoid", "one_err", - "parking_lot 0.11.2", + "parking_lot 0.12.2", "serde", "serde_bytes", "shrinkwraprs", @@ -1857,9 +1736,9 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.3.0-beta-dev.26" +version = "0.3.0-beta-dev.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdee2f3cb5c43078153ffb6482ed86ba288567eb12febf2688a649882e2c753" +checksum = "ca6f4c40ab91b6e5ac3b006a3c542888f37ae7527e55e8e22608b3acfe607b0f" dependencies = [ "getrandom 0.2.14", "holochain_secure_primitive", @@ -1868,9 +1747,9 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.3.0-beta-dev.23" +version = "0.3.0-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7701cf72c29cc7ccd0ef02e00e5091ad120d24619e948af1277011583eb566a" +checksum = "c040651a49f5f91c6ca0b1ea80f9a7c5cc6e4516f73ccd1d1e67141b9ddb030d" dependencies = [ "paste", "serde", @@ -1904,13 +1783,12 @@ dependencies = [ [[package]] name = "holochain_sqlite" -version = "0.3.0-beta-dev.41" +version = "0.3.0-beta-dev.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3844b97ff6b65a61c4b5fed9d1679557a0bb9c84c773e49b12f5e49e482fbcc" +checksum = "cfa94cebe05a50534d2b3533b3b242c49979cdf915f5815b0e86ab8fda562f49" dependencies = [ "anyhow", "async-trait", - "chashmap", "derive_more", "fallible-iterator", "futures", @@ -1925,11 +1803,11 @@ dependencies = [ "kitsune_p2p_dht_arc", "kitsune_p2p_timestamp", "kitsune_p2p_types", - "nanoid 0.4.0", + "nanoid", "num_cpus", "once_cell", "opentelemetry_api", - "parking_lot 0.10.2", + "parking_lot 0.12.2", "pretty_assertions", "r2d2", "r2d2_sqlite_neonphog", @@ -1937,10 +1815,9 @@ dependencies = [ "rusqlite", "scheduled-thread-pool", "serde", - "serde_derive", "serde_json", "shrinkwraprs", - "sqlformat 0.1.8", + "sqlformat", "tempfile", "thiserror", "tokio", @@ -1949,9 +1826,9 @@ dependencies = [ [[package]] name = "holochain_state_types" -version = "0.3.0-beta-dev.39" +version = "0.3.0-beta-dev.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e24b4938fe07d2916c5f427369c7050b1dd33026e7ca0c08929eecdbd87aac43" +checksum = "d55fd41e5ece70fac48198757d0b31f2514d97fcf60cb6788c3f9d74e1879212" dependencies = [ "holo_hash", "holochain_integrity_types", @@ -1960,9 +1837,9 @@ dependencies = [ [[package]] name = "holochain_trace" -version = "0.3.0-beta-dev.10" +version = "0.3.0-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40d847f36583355f3bc90cdad17fd951078325bccd93c68107cd61beeef3713c" +checksum = "fd5faad02260867ed629d632f976ac07bbbfcd69a135acedc601c241110bc2e0" dependencies = [ "chrono", "derive_more", @@ -1978,20 +1855,16 @@ dependencies = [ [[package]] name = "holochain_types" -version = "0.3.0-beta-dev.41" +version = "0.3.0-beta-dev.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68538bb1f2579107b1a878da198259065e5a88ac0d81ddb1cbfa5b7d53bc518b" +checksum = "acecd0d5e050f704bbbfc4f78dd2d19b73ac1fc777ddf288c7231988afcae172" dependencies = [ "anyhow", "async-trait", "automap", "backtrace", - "base64 0.13.1", - "cfg-if 0.1.10", - "chrono", "derive_builder", "derive_more", - "either", "fixt", "flate2", "futures", @@ -2003,17 +1876,14 @@ dependencies = [ "holochain_sqlite", "holochain_trace", "holochain_util", - "holochain_wasmer_host", "holochain_zome_types", - "itertools 0.10.5", + "itertools 0.12.1", "kitsune_p2p_dht", - "lazy_static", - "mockall", "mr_bundle", "must_future", - "nanoid 0.3.0", + "nanoid", "one_err", - "parking_lot 0.10.2", + "parking_lot 0.12.2", "rand 0.8.5", "regex", "rusqlite", @@ -2034,18 +1904,15 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.3.0-beta-dev.7" +version = "0.3.0-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1b4134b28045c8da6a82a0a28b29d07d5995c547fa4afb8bb7e479c9c948ae9" +checksum = "cf57140a57e9ee1278000c272080a67d971ea610081f3a7d5e960d747a6b00c5" dependencies = [ "backtrace", - "cfg-if 0.1.10", + "cfg-if", "colored", - "derive_more", "dunce", "futures", - "getrandom 0.2.14", - "num_cpus", "once_cell", "rpassword", "sodoken", @@ -2075,37 +1942,19 @@ checksum = "8c429e84a19ee446f47541a6fed10e1a4376a8a8ba6d3dbff7d07e4a7bb4c85f" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "paste", "serde", "tracing", ] -[[package]] -name = "holochain_wasmer_host" -version = "0.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4951f6e1ac6d294631b3d38b8584c84ff510057ac6adca04d1e244b30c2e0b6b" -dependencies = [ - "bimap", - "bytes", - "hex", - "holochain_serialized_bytes", - "holochain_wasmer_common", - "parking_lot 0.12.1", - "rand 0.8.5", - "serde", - "tracing", - "wasmer", - "wasmer-middlewares", -] - [[package]] name = "holochain_websocket" -version = "0.3.0-beta-dev.19" +version = "0.3.0-beta-dev.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1453e4f7ba7d91373bc609c2542c050df47d9aaa756b5415eb178e73d43b1e84" +checksum = "862c6c5af982f907a692542866798c34b8c0a54d0ab23f82259d7c08157adb16" dependencies = [ + "async-trait", "futures", "holochain_serialized_bytes", "holochain_types", @@ -2132,25 +1981,22 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.3.0-beta-dev.34" +version = "0.3.0-beta-dev.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c8532243ff4a7ba8d31279b0484d80075850f314813d7f5128141a3cb83fc5" +checksum = "116df2a3484fa77f251ca381f36cb6eba6403df577cad84aa0ed75f564e0fe88" dependencies = [ "derive_builder", "derive_more", "holo_hash", "holochain_integrity_types", "holochain_nonce", - "holochain_secure_primitive", "holochain_serialized_bytes", "holochain_wasmer_common", - "kitsune_p2p_bin_data", "kitsune_p2p_block", "kitsune_p2p_dht", "kitsune_p2p_timestamp", - "nanoid 0.3.0", + "nanoid", "num_enum", - "paste", "rusqlite", "serde", "serde_bytes", @@ -2204,6 +2050,29 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.1.0", + "http-body 1.0.0", + "pin-project-lite", +] + [[package]] name = "httparse" version = "1.8.0" @@ -2232,9 +2101,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -2246,6 +2115,26 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.4", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-tls" version = "0.5.0" @@ -2253,10 +2142,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.28", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.3.1", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.3.1", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2310,8 +2235,9 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.2.0", + "autocfg", "hashbrown 0.12.3", + "serde", ] [[package]] @@ -2321,7 +2247,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", + "serde", ] [[package]] @@ -2372,7 +2299,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -2406,19 +2333,16 @@ dependencies = [ ] [[package]] -name = "itertools" -version = "0.8.2" +name = "is_terminal_polyfill" +version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" -dependencies = [ - "either", -] +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "itertools" -version = "0.10.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" dependencies = [ "either", ] @@ -2449,11 +2373,11 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.3.0-beta-dev.20" +version = "0.3.0-beta-dev.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ffc4e64ce96e950d9d4f3b51cbdd1eac36f286cb9859b8a735af93d4b85dbb4" +checksum = "96c26a2c48ad26f4be9c941b5e25a2a644b18fc9dcfca5e2ee3927610e8a5451" dependencies = [ - "base64 0.13.1", + "base64 0.22.1", "derive_more", "holochain_util", "kitsune_p2p_dht_arc", @@ -2464,9 +2388,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.3.0-beta-dev.22" +version = "0.3.0-beta-dev.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6527e2c45f6ba049439f37448e016b2042a6bd733454a06dc874275b8826dfc1" +checksum = "b49e275b16bae4db37bb5ef83f32d8426d04c387bcac3937841d4676436a80a5" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -2475,9 +2399,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht" -version = "0.3.0-beta-dev.22" +version = "0.3.0-beta-dev.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b3d7e0ebc81f78885f2d92310c143681c1cd00d9496a36335040a41e459c19" +checksum = "14648a1f17b6b0a27ad4f6d83e4ed877874203e387414e1cfa9806fe6f686a0f" dependencies = [ "derivative", "derive_more", @@ -2486,7 +2410,6 @@ dependencies = [ "kitsune_p2p_timestamp", "must_future", "num-traits", - "once_cell", "rand 0.8.5", "serde", "statrs", @@ -2496,9 +2419,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.3.0-beta-dev.19" +version = "0.3.0-beta-dev.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cb39e76f04817b574487993b6bb36fae71836748b02d6c055eea314a477748" +checksum = "071b2a8e6d47ef82fdab408083dd609d938c2944fb824412ec5d48f8795d31dd" dependencies = [ "derive_more", "gcollections", @@ -2511,9 +2434,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.3.0-beta-dev.9" +version = "0.3.0-beta-dev.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2079319784e851cdcceb11463db7672fec543d73fd045a437737caf70fe5386b" +checksum = "1a046548b0a5922f552352206dd33072f080907bd2939b0cce20178b464448c3" dependencies = [ "chrono", "rusqlite", @@ -2522,11 +2445,11 @@ dependencies = [ [[package]] name = "kitsune_p2p_types" -version = "0.3.0-beta-dev.26" +version = "0.3.0-beta-dev.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cfbdfce6803c1fe8165d432a170ca8228f9934e8e441551fe088b0974e3a2cd" +checksum = "782bf659ba16096c0ae136a421ec4669860e8ab601c69a11556775e68791fa25" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "derive_more", "futures", "ghost_actor", @@ -2537,14 +2460,14 @@ dependencies = [ "kitsune_p2p_timestamp", "lair_keystore_api", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "paste", "rmp-serde", - "rustls 0.20.9", + "rustls", "serde", "serde_bytes", "serde_json", - "sysinfo 0.29.11", + "sysinfo 0.30.11", "thiserror", "tokio", "url", @@ -2561,7 +2484,7 @@ dependencies = [ "pretty_assertions", "rpassword", "rusqlite", - "sqlformat 0.2.3", + "sqlformat", "structopt", "sysinfo 0.28.4", "tracing-subscriber", @@ -2577,9 +2500,9 @@ dependencies = [ "dunce", "hc_seed_bundle", "lru", - "nanoid 0.4.0", + "nanoid", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rcgen", "serde", "serde_json", @@ -2607,15 +2530,15 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libflate" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7d5654ae1795afc7ff76f4365c2c8791b0feb18e8996a96adad8ffd7c3b2bf" +checksum = "45d9dfdc14ea4ef0900c1cddbc8dcd553fbaacd8a4a282cf4018ae9dd04fb21e" dependencies = [ "adler32", "core2", @@ -2626,12 +2549,12 @@ dependencies = [ [[package]] name = "libflate_lz77" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5f52fb8c451576ec6b79d3f4deb327398bc05bbdbd99021a6e77a4c855d524" +checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d" dependencies = [ "core2", - "hashbrown 0.13.2", + "hashbrown 0.14.5", "rle-decode-fast", ] @@ -2641,26 +2564,17 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.5.0", - "libc", -] - [[package]] name = "libsodium-sys-stable" -version = "1.20.5" +version = "1.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ff84815195b3d40db429f6cb8c7b1c6548c618797b3b919e08fec250bcdd2" +checksum = "780c04d3b39043e609f0ad29bd7a8d7f8ef38deb8291534434633036f0d72ce3" dependencies = [ "cc", "libc", "libflate", "minisign-verify", + "native-tls", "pkg-config", "tar", "ureq", @@ -2687,20 +2601,11 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ - "autocfg 1.2.0", + "autocfg", "scopeguard", ] @@ -2752,16 +2657,10 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" dependencies = [ - "autocfg 1.2.0", + "autocfg", "rawpointer", ] -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "memchr" version = "2.7.2" @@ -2792,7 +2691,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ - "autocfg 1.2.0", + "autocfg", ] [[package]] @@ -2833,33 +2732,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "mockall" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" -dependencies = [ - "cfg-if 1.0.0", - "downcast", - "fragile", - "lazy_static", - "mockall_derive", - "predicates", - "predicates-tree", -] - -[[package]] -name = "mockall_derive" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" -dependencies = [ - "cfg-if 1.0.0", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "more-asserts" version = "0.2.2" @@ -2868,21 +2740,18 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "mr_bundle" -version = "0.3.0-beta-dev.9" +version = "0.3.0-beta-dev.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928f54d0e11419e74ee4a5573ef8c7c13047f7ef020170a606ea12493eef363a" +checksum = "9bc42dc4f0fa8d90f19a0a86448c28802633d2915dcd1438c973d239c6ee7f21" dependencies = [ - "bytes", "derive_more", - "either", "flate2", "futures", "holochain_util", - "reqwest", + "reqwest 0.12.4", "rmp-serde", "serde", "serde_bytes", - "serde_derive", "serde_yaml", "thiserror", ] @@ -2926,15 +2795,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "nanoid" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6226bc4e142124cb44e309a37a04cd9bb10e740d8642855441d3b14808f635e" -dependencies = [ - "rand 0.6.5", -] - [[package]] name = "nanoid" version = "0.4.0" @@ -2972,12 +2832,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - [[package]] name = "ntapi" version = "0.4.1" @@ -3012,7 +2866,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "itoa", ] @@ -3031,7 +2885,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ - "autocfg 1.2.0", + "autocfg", "num-integer", "num-traits", ] @@ -3042,7 +2896,7 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ - "autocfg 1.2.0", + "autocfg", "libm", ] @@ -3058,23 +2912,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.11" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.11" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.60", ] [[package]] @@ -3117,7 +2971,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ "bitflags 2.5.0", - "cfg-if 1.0.0", + "cfg-if", "foreign-types", "libc", "once_cell", @@ -3133,7 +2987,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3186,12 +3040,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" -[[package]] -name = "owning_ref" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d52571ddcb42e9c900c901a18d8d67e393df723fcd51dd59c5b1a85d0acb6cc" - [[package]] name = "papergrid" version = "0.11.0" @@ -3203,27 +3051,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "parking_lot" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa12d706797d42551663426a45e2db2e0364bd1dbf6aeada87e89c5f981f43e9" -dependencies = [ - "owning_ref", - "parking_lot_core 0.2.14", - "thread-id", -] - -[[package]] -name = "parking_lot" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.7.3", -] - [[package]] name = "parking_lot" version = "0.11.2" @@ -3231,44 +3058,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", - "lock_api 0.4.11", + "lock_api", "parking_lot_core 0.8.6", ] [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ - "lock_api 0.4.11", - "parking_lot_core 0.9.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa" -dependencies = [ - "libc", - "rand 0.4.6", - "smallvec 0.6.14", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93f386bb233083c799e6e642a9d73db98c24a5deeb95ffc85bf281255dffc98" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.57", - "smallvec 1.13.2", - "winapi", + "lock_api", + "parking_lot_core 0.9.10", ] [[package]] @@ -3277,25 +3078,25 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "instant", "libc", "redox_syscall 0.2.16", - "smallvec 1.13.2", + "smallvec", "winapi", ] [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "redox_syscall 0.4.1", - "smallvec 1.13.2", - "windows-targets 0.48.5", + "redox_syscall 0.5.1", + "smallvec", + "windows-targets 0.52.5", ] [[package]] @@ -3321,9 +3122,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.9" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -3347,7 +3148,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3396,36 +3197,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "predicates" -version = "2.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" -dependencies = [ - "difflib", - "float-cmp", - "itertools 0.10.5", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - [[package]] name = "pretty_assertions" version = "1.4.0" @@ -3438,12 +3209,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "once_cell", - "toml_edit 0.19.15", + "toml_edit 0.21.1", ] [[package]] @@ -3524,7 +3294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" dependencies = [ "log", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "scheduled-thread-pool", ] @@ -3533,48 +3303,16 @@ name = "r2d2_sqlite_neonphog" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d1e95b387a49ce52c5e4994fbe18af7b6cd52510f74c9a243b12abfc207f49c" -dependencies = [ - "r2d2", - "rusqlite", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", +dependencies = [ + "r2d2", + "rusqlite", ] [[package]] -name = "rand" -version = "0.6.5" +name = "radium" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -dependencies = [ - "autocfg 0.1.8", - "libc", - "rand_chacha 0.1.1", - "rand_core 0.4.2", - "rand_hc 0.1.0", - "rand_isaac", - "rand_jitter", - "rand_os", - "rand_pcg", - "rand_xorshift", - "winapi", -] +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" @@ -3586,7 +3324,7 @@ dependencies = [ "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", - "rand_hc 0.2.0", + "rand_hc", ] [[package]] @@ -3600,16 +3338,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.3.1", -] - [[package]] name = "rand_chacha" version = "0.2.2" @@ -3630,21 +3358,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - [[package]] name = "rand_core" version = "0.5.1" @@ -3673,15 +3386,6 @@ dependencies = [ "rand 0.8.5", ] -[[package]] -name = "rand_hc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "rand_hc" version = "0.2.0" @@ -3691,59 +3395,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "winapi", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.4.2", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "rawpointer" version = "0.2.1" @@ -3783,21 +3434,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - [[package]] name = "redox_syscall" version = "0.2.16" @@ -3817,14 +3453,12 @@ dependencies = [ ] [[package]] -name = "redox_users" -version = "0.4.5" +name = "redox_syscall" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "getrandom 0.2.14", - "libredox", - "thiserror", + "bitflags 2.5.0", ] [[package]] @@ -3836,7 +3470,7 @@ dependencies = [ "fxhash", "log", "slice-group-by", - "smallvec 1.13.2", + "smallvec", ] [[package]] @@ -3915,11 +3549,53 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", - "hyper", - "hyper-tls", + "http-body 0.4.6", + "hyper 0.14.28", + "hyper-tls 0.5.0", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile 1.0.4", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +dependencies = [ + "base64 0.22.1", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.4.4", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.3.1", + "hyper-tls 0.6.0", + "hyper-util", "ipnet", "js-sys", "log", @@ -3928,7 +3604,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls-pemfile", + "rustls-pemfile 2.1.2", "serde", "serde_json", "serde_urlencoded", @@ -3941,7 +3617,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "winreg 0.52.0", ] [[package]] @@ -3982,7 +3658,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "cfg-if 1.0.0", + "cfg-if", "getrandom 0.2.14", "libc", "spin 0.9.8", @@ -4028,9 +3704,9 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" [[package]] name = "rmp" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddb316f4b9cae1a3e89c02f1926d557d1142d0d2e684b038c11c1b77705229a" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -4092,7 +3768,7 @@ dependencies = [ "fallible-streaming-iterator", "hashlink", "libsqlite3-sys", - "smallvec 1.13.2", + "smallvec", ] [[package]] @@ -4112,9 +3788,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -4135,20 +3811,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "rustls" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" -dependencies = [ - "log", - "ring 0.17.8", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -4159,22 +3821,21 @@ dependencies = [ ] [[package]] -name = "rustls-pki-types" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" - -[[package]] -name = "rustls-webpki" -version = "0.102.2" +name = "rustls-pemfile" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "ring 0.17.8", + "base64 0.22.1", "rustls-pki-types", - "untrusted 0.9.0", ] +[[package]] +name = "rustls-pki-types" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" + [[package]] name = "rustversion" version = "1.0.15" @@ -4220,7 +3881,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" dependencies = [ - "parking_lot 0.12.1", + "parking_lot 0.12.2", ] [[package]] @@ -4303,9 +3964,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.198" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] @@ -4341,13 +4002,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -4385,24 +4046,32 @@ dependencies = [ [[package]] name = "serde_with" -version = "1.14.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.2.6", "serde", + "serde_derive", + "serde_json", "serde_with_macros", + "time", ] [[package]] name = "serde_with_macros" -version = "1.5.2" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" +checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" dependencies = [ - "darling 0.13.4", + "darling 0.20.8", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.60", ] [[package]] @@ -4424,7 +4093,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -4435,7 +4104,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -4446,7 +4115,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -4485,9 +4154,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -4536,7 +4205,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.2.0", + "autocfg", ] [[package]] @@ -4545,15 +4214,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" -[[package]] -name = "smallvec" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" -dependencies = [ - "maybe-uninit", -] - [[package]] name = "smallvec" version = "1.13.2" @@ -4562,9 +4222,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -4581,7 +4241,7 @@ dependencies = [ "num_cpus", "once_cell", "one_err", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "tokio", ] @@ -4607,17 +4267,6 @@ dependencies = [ "der", ] -[[package]] -name = "sqlformat" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4" -dependencies = [ - "itertools 0.10.5", - "nom", - "unicode_categories", -] - [[package]] name = "sqlformat" version = "0.2.3" @@ -4660,12 +4309,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - [[package]] name = "strsim" version = "0.10.0" @@ -4771,9 +4414,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.59" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -4792,22 +4435,7 @@ version = "0.28.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b" dependencies = [ - "cfg-if 1.0.0", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "rayon", - "winapi", -] - -[[package]] -name = "sysinfo" -version = "0.29.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" -dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "core-foundation-sys", "libc", "ntapi", @@ -4818,11 +4446,11 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.10" +version = "0.30.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d7c217777061d5a2d652aea771fb9ba98b6dade657204b08c4b9604d11555b" +checksum = "87341a165d73787554941cd5ef55ad728011566fe714e987d1b976c15dbc3a83" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "core-foundation-sys", "libc", "ntapi", @@ -4905,18 +4533,12 @@ version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", "rustix", "windows-sys 0.52.0", ] -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - [[package]] name = "test-fuzz" version = "3.0.4" @@ -4985,33 +4607,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", -] - -[[package]] -name = "thread-id" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" -dependencies = [ - "libc", - "redox_syscall 0.1.57", - "winapi", + "syn 2.0.60", ] [[package]] @@ -5020,7 +4631,7 @@ version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", ] @@ -5094,7 +4705,7 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "pin-project-lite", "signal-hook-registry", "socket2", @@ -5110,7 +4721,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -5170,7 +4781,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.9", + "toml_edit 0.22.12", ] [[package]] @@ -5197,15 +4808,26 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.6", + "winnow 0.6.7", ] [[package]] @@ -5221,6 +4843,28 @@ dependencies = [ "walkdir", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -5233,6 +4877,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -5246,7 +4891,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -5303,7 +4948,7 @@ dependencies = [ "serde", "serde_json", "sharded-slab", - "smallvec 1.13.2", + "smallvec", "thread_local", "time", "tracing", @@ -5335,7 +4980,7 @@ dependencies = [ "http 0.2.12", "lazy_static", "regex", - "reqwest", + "reqwest 0.11.27", "thiserror", ] @@ -5399,9 +5044,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unicode_categories" @@ -5440,18 +5085,15 @@ dependencies = [ [[package]] name = "ureq" -version = "2.9.6" +version = "2.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35" +checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "log", + "native-tls", "once_cell", - "rustls 0.22.3", - "rustls-pki-types", - "rustls-webpki", "url", - "webpki-roots", ] [[package]] @@ -5570,7 +5212,7 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -5585,7 +5227,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -5595,7 +5237,7 @@ version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -5619,7 +5261,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5661,7 +5303,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce45cc009177ca345a6d041f9062305ad467d15e7d41494f5b81ab46d62d7a58" dependencies = [ "bytes", - "cfg-if 1.0.0", + "cfg-if", "derivative", "indexmap 1.9.3", "js-sys", @@ -5690,7 +5332,7 @@ checksum = "e044f6140c844602b920deb4526aea3cc9c0d7cf23f00730bb9b2034669f522a" dependencies = [ "backtrace", "bytes", - "cfg-if 1.0.0", + "cfg-if", "enum-iterator", "enumset", "lazy_static", @@ -5701,7 +5343,7 @@ dependencies = [ "rkyv", "self_cell", "shared-buffer", - "smallvec 1.13.2", + "smallvec", "thiserror", "wasmer-types", "wasmer-vm", @@ -5721,7 +5363,7 @@ dependencies = [ "gimli 0.26.2", "more-asserts", "rayon", - "smallvec 1.13.2", + "smallvec", "target-lexicon", "tracing", "wasmer-compiler", @@ -5740,17 +5382,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "wasmer-middlewares" -version = "4.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d4f27f76b7b5325476c8851f34920ae562ef0de3c830fdbc4feafff6782187" -dependencies = [ - "wasmer", - "wasmer-types", - "wasmer-vm", -] - [[package]] name = "wasmer-types" version = "4.2.4" @@ -5775,7 +5406,7 @@ checksum = "bdcd8a4fd36414a7b6a003dbfbd32393bce3e155d715dd877c05c1b7a41d224d" dependencies = [ "backtrace", "cc", - "cfg-if 1.0.0", + "cfg-if", "corosensei", "crossbeam-queue", "dashmap", @@ -5846,20 +5477,11 @@ dependencies = [ "untrusted 0.9.0", ] -[[package]] -name = "webpki-roots" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "wide" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a1851a719f11d1d2fea40e15c72f6c00de8c142d7ac47c1441cc7e4d0d5bc6" +checksum = "0f0e39d2c603fdc0504b12b458cf1f34e0b937ed2f4f2dc20796e3e86f34e11f" dependencies = [ "bytemuck", "safe_arch", @@ -5883,11 +5505,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -5912,7 +5534,7 @@ dependencies = [ "influxive-core", "log", "opentelemetry_api", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "tabled", "tokio", "ts_influxdb", @@ -5924,7 +5546,7 @@ name = "wind_tunnel_instruments_derive" version = "0.2.0-alpha.1" dependencies = [ "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -5937,8 +5559,8 @@ dependencies = [ "env_logger 0.11.3", "indicatif", "log", - "parking_lot 0.12.1", - "sysinfo 0.30.10", + "parking_lot 0.12.2", + "sysinfo 0.30.11", "tokio", "wind_tunnel_core", "wind_tunnel_instruments", @@ -6156,9 +5778,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" +checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" dependencies = [ "memchr", ] @@ -6169,7 +5791,17 @@ version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", "windows-sys 0.48.0", ] @@ -6225,7 +5857,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -6236,10 +5868,11 @@ checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" [[package]] name = "zip" -version = "0.6.6" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "2e6cb8909b2e8e6733c9ef67d35be1a27105644d362aafb5f8b2ba395727adf6" dependencies = [ + "arbitrary", "byteorder", "crc32fast", "crossbeam-utils", diff --git a/Cargo.toml b/Cargo.toml index 032ec368..2bba2af1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,14 +60,14 @@ influxdb = { version = "0.7.3-beta.1", package = "ts_influxdb", default-features influxive-core = "0.0.2-alpha.1" # Deps for Holochain -holochain_client = { version = "=0.5.0-dev.31" } -holochain_zome_types = { version = "0.3.0-beta-dev.34" } -holo_hash = { version = "0.3.0-beta-dev.27" } -holochain_types = { version = "0.3.0-beta-dev.39" } -holochain_conductor_api = { version = "0.3.0-beta-dev.45" } -hdk = { version = "0.3.0-beta-dev.39", features = [] } -hdi = "0.4.0-beta-dev.35" -mr_bundle = "0.3.0-beta-dev.9" +holochain_client = { version = "=0.5.0-dev.32" } +holochain_zome_types = { version = "0.3.0-beta-dev.36" } +holo_hash = { version = "0.3.0-beta-dev.28" } +holochain_types = { version = "0.3.0-beta-dev.43" } +holochain_conductor_api = { version = "0.3.0-beta-dev.47" } +hdk = { version = "0.3.0-beta-dev.41", features = [] } +hdi = "0.4.0-beta-dev.36" +mr_bundle = "0.3.0-beta-dev.10" # Framework wind_tunnel_core = { path = "./framework/core", version = "0.2.0-alpha.1" } diff --git a/bindings/client/src/admin_websocket.rs b/bindings/client/src/admin_websocket.rs index 11aca565..b93c046f 100644 --- a/bindings/client/src/admin_websocket.rs +++ b/bindings/client/src/admin_websocket.rs @@ -9,7 +9,10 @@ use std::sync::Arc; use crate::ToSocketAddr; use anyhow::Result; -use holochain_conductor_api::StorageInfo; +use holochain_conductor_api::{ + AppAuthenticationTokenIssued, AppInterfaceInfo, IssueAppAuthenticationTokenPayload, StorageInfo, +}; +use holochain_types::app::InstalledAppId; use holochain_types::websocket::AllowedOrigins; use wind_tunnel_instruments::Reporter; use wind_tunnel_instruments_derive::wind_tunnel_instrument; @@ -34,7 +37,7 @@ impl AdminWebsocketInstrumented { } #[wind_tunnel_instrument(prefix = "admin_")] - pub async fn list_app_interfaces(&mut self) -> ConductorApiResult> { + pub async fn list_app_interfaces(&mut self) -> ConductorApiResult> { self.inner.list_app_interfaces().await } @@ -43,8 +46,11 @@ impl AdminWebsocketInstrumented { &mut self, port: u16, allowed_origins: AllowedOrigins, + installed_app_id: Option, ) -> ConductorApiResult { - self.inner.attach_app_interface(port, allowed_origins).await + self.inner + .attach_app_interface(port, allowed_origins, installed_app_id) + .await } #[wind_tunnel_instrument(prefix = "admin_")] @@ -129,6 +135,14 @@ impl AdminWebsocketInstrumented { ) -> Result { self.inner.authorize_signing_credentials(request).await } + + #[wind_tunnel_instrument(prefix = "admin_")] + pub async fn issue_app_auth_token( + &mut self, + payload: IssueAppAuthenticationTokenPayload, + ) -> ConductorApiResult { + self.inner.issue_app_auth_token(payload).await + } } impl std::fmt::Debug for AdminWebsocketInstrumented { diff --git a/bindings/client/src/app_agent_websocket.rs b/bindings/client/src/app_agent_websocket.rs deleted file mode 100644 index 1fd23994..00000000 --- a/bindings/client/src/app_agent_websocket.rs +++ /dev/null @@ -1,104 +0,0 @@ -use crate::app_websocket::AppWebsocketInstrumented; -use crate::ToSocketAddr; -use anyhow::Result; -use holochain_client::{ - AgentSigner, AppAgentWebsocket, AppWebsocket, ConductorApiResult, ZomeCallTarget, -}; -use holochain_types::app::InstalledAppId; -use holochain_types::prelude::{ExternIO, FunctionName, ZomeName}; -use std::fmt::{Debug, Formatter}; -use std::ops::{Deref, DerefMut}; -use std::sync::Arc; -use wind_tunnel_instruments::{OperationRecord, Reporter}; -use wind_tunnel_instruments_derive::wind_tunnel_instrument; - -#[derive(Clone)] -pub struct AppAgentWebsocketInstrumented { - /// A wrapper around the original [AppAgentWebsocket], which is NOT instrumented but we instrument it here. - inner: AppAgentWebsocket, - /// A wrapper around the original [AppWebsocket], which is instrumented. This is here so that we can Deref - /// the [AppAgentWebsocketInstrumented] type and still have an instrumented [AppWebsocket]. - inner_instrumented: AppWebsocketInstrumented, - reporter: Arc, -} - -impl AppAgentWebsocketInstrumented { - pub async fn connect( - url: impl ToSocketAddr, - app_id: InstalledAppId, - signer: Arc>, - reporter: Arc, - ) -> Result { - let app_ws = AppWebsocket::connect(url.to_socket_addr()?).await?; - let inner = - AppAgentWebsocket::from_existing(app_ws.clone(), app_id.clone(), signer.clone()) - .await?; - let inner_instrumented = - AppWebsocketInstrumented::from_existing(app_ws, reporter.clone()).await?; - - Ok(Self { - inner, - inner_instrumented, - reporter, - }) - } - - pub async fn from_existing( - app_ws: AppWebsocketInstrumented, - app_id: InstalledAppId, - signer: Arc>, - ) -> Result { - let inner_instrumented = app_ws.clone(); - AppAgentWebsocket::from_existing(app_ws.inner, app_id, signer) - .await - .map(|inner| Self { - inner, - inner_instrumented, - reporter: app_ws.reporter, - }) - } - - #[wind_tunnel_instrument(prefix = "app_agent_", pre_hook = pre_call_zome)] - pub async fn call_zome( - &mut self, - target: ZomeCallTarget, - zome_name: ZomeName, - fn_name: FunctionName, - payload: ExternIO, - ) -> ConductorApiResult { - self.inner - .call_zome(target, zome_name, fn_name, payload) - .await - } -} - -fn pre_call_zome( - operation_record: &mut OperationRecord, - _target: &ZomeCallTarget, - zome_name: &ZomeName, - fn_name: &FunctionName, - _payload: &ExternIO, -) { - operation_record.add_attr("zome_name", zome_name.to_string()); - operation_record.add_attr("fn_name", fn_name.to_string()); -} - -impl Deref for AppAgentWebsocketInstrumented { - type Target = AppWebsocketInstrumented; - - fn deref(&self) -> &Self::Target { - &self.inner_instrumented - } -} - -impl DerefMut for AppAgentWebsocketInstrumented { - fn deref_mut(&mut self) -> &mut Self::Target { - &mut self.inner_instrumented - } -} - -impl Debug for AppAgentWebsocketInstrumented { - fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { - f.debug_struct("AppAgentWebsocketInstrumented").finish() - } -} diff --git a/bindings/client/src/app_websocket.rs b/bindings/client/src/app_websocket.rs index a2b65bb6..e97b6455 100644 --- a/bindings/client/src/app_websocket.rs +++ b/bindings/client/src/app_websocket.rs @@ -1,12 +1,13 @@ use crate::ToSocketAddr; use anyhow::Result; -use holochain_client::{AppWebsocket, ConductorApiResult}; -use holochain_conductor_api::{AppInfo, NetworkInfo, ZomeCall}; +use holochain_client::{AgentSigner, AppWebsocket, ConductorApiResult, ZomeCallTarget}; +use holochain_conductor_api::{AppAuthenticationToken, AppInfo, NetworkInfo}; use holochain_types::app::{ DisableCloneCellPayload, EnableCloneCellPayload, NetworkInfoRequestPayload, }; -use holochain_types::prelude::{CreateCloneCellPayload, ExternIO, InstalledAppId}; +use holochain_types::prelude::{CreateCloneCellPayload, ExternIO, FunctionName, ZomeName}; use holochain_zome_types::clone::ClonedCell; +use std::fmt::{Debug, Formatter}; use std::sync::Arc; use wind_tunnel_instruments::{OperationRecord, Reporter}; use wind_tunnel_instruments_derive::wind_tunnel_instrument; @@ -18,30 +19,33 @@ pub struct AppWebsocketInstrumented { } impl AppWebsocketInstrumented { - pub async fn connect(app_url: impl ToSocketAddr, reporter: Arc) -> Result { - AppWebsocket::connect(app_url.to_socket_addr()?) + pub async fn connect( + app_url: impl ToSocketAddr, + token: AppAuthenticationToken, + signer: Arc, + reporter: Arc, + ) -> Result { + AppWebsocket::connect(app_url.to_socket_addr()?, token, signer.clone()) .await .map(|inner| Self { inner, reporter }) } - pub async fn from_existing(app_ws: AppWebsocket, reporter: Arc) -> Result { - Ok(Self { - inner: app_ws, - reporter, - }) - } - #[wind_tunnel_instrument(prefix = "app_")] - pub async fn app_info( - &mut self, - app_id: InstalledAppId, - ) -> ConductorApiResult> { - self.inner.app_info(app_id).await + pub async fn app_info(&mut self) -> ConductorApiResult> { + self.inner.app_info().await } #[wind_tunnel_instrument(prefix = "app_", pre_hook = pre_call_zome)] - pub async fn call_zome(&mut self, msg: ZomeCall) -> ConductorApiResult { - self.inner.call_zome(msg).await + pub async fn call_zome( + &mut self, + target: ZomeCallTarget, + zome_name: impl Into + Clone, + fn_name: impl Into + Clone, + payload: ExternIO, + ) -> ConductorApiResult { + self.inner + .call_zome(target, zome_name.into(), fn_name.into(), payload) + .await } #[wind_tunnel_instrument(prefix = "app_")] @@ -77,7 +81,21 @@ impl AppWebsocketInstrumented { } } -fn pre_call_zome(operation_record: &mut OperationRecord, msg: &ZomeCall) { - operation_record.add_attr("zome_name", msg.zome_name.0.to_string()); - operation_record.add_attr("fn_name", msg.fn_name.0.to_string()); +fn pre_call_zome( + operation_record: &mut OperationRecord, + _target: &ZomeCallTarget, + zome_name: &(impl Into + Clone), + fn_name: &(impl Into + Clone), + _payload: &ExternIO, +) { + let zome_name: ZomeName = zome_name.clone().into(); + let fn_name: FunctionName = fn_name.clone().into(); + operation_record.add_attr("zome_name", zome_name.0.to_string()); + operation_record.add_attr("fn_name", fn_name.0.to_string()); +} + +impl Debug for AppWebsocketInstrumented { + fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { + f.debug_struct("AppWebsocketInstrumented").finish() + } } diff --git a/bindings/client/src/lib.rs b/bindings/client/src/lib.rs index 6d321458..2303c0c6 100644 --- a/bindings/client/src/lib.rs +++ b/bindings/client/src/lib.rs @@ -1,12 +1,10 @@ use std::net::{SocketAddr, ToSocketAddrs}; mod admin_websocket; -mod app_agent_websocket; mod app_websocket; pub mod prelude { pub use crate::admin_websocket::AdminWebsocketInstrumented as AdminWebsocket; - pub use crate::app_agent_websocket::AppAgentWebsocketInstrumented as AppAgentWebsocket; pub use crate::app_websocket::AppWebsocketInstrumented as AppWebsocket; // Types defined in other crates should be fetched directly, but types defined in the client diff --git a/bindings/runner/src/common.rs b/bindings/runner/src/common.rs index ac2257f8..9b1f8d7b 100644 --- a/bindings/runner/src/common.rs +++ b/bindings/runner/src/common.rs @@ -2,7 +2,7 @@ use crate::context::HolochainAgentContext; use crate::runner_context::HolochainRunnerContext; use anyhow::Context; use holochain_client_instrumented::prelude::{ - AdminWebsocket, AppAgentWebsocket, AuthorizeSigningCredentialsPayload, ClientAgentSigner, + AdminWebsocket, AppWebsocket, AuthorizeSigningCredentialsPayload, ClientAgentSigner, }; use holochain_conductor_api::CellInfo; use holochain_types::prelude::{AppBundleSource, ExternIO, InstallAppPayload, RoleName}; @@ -44,16 +44,30 @@ pub fn configure_app_ws_url( .await .context("Unable to connect admin client")?; - let existing_app_ports = admin_client + let existing_app_interfaces = admin_client .list_app_interfaces() .await .map_err(|e| anyhow::anyhow!("Conductor API error: {:?}", e))?; + + let existing_app_ports = existing_app_interfaces + .into_iter() + .filter_map(|interface| { + if interface.allowed_origins == AllowedOrigins::Any + && interface.installed_app_id.is_none() + { + Some(interface.port) + } else { + None + } + }) + .collect::>(); + if !existing_app_ports.is_empty() { Ok(*existing_app_ports.first().context("No app ports found")?) } else { let attached_app_port = admin_client // Don't specify the port, let the conductor pick one - .attach_app_interface(0, AllowedOrigins::Any) + .attach_app_interface(0, AllowedOrigins::Any, None) .await .map_err(|e| anyhow::anyhow!("Conductor API error: {:?}", e))?; Ok(attached_app_port) @@ -99,7 +113,7 @@ pub fn configure_app_ws_url( /// fn agent_behaviour(ctx: &mut AgentContext) -> HookResult { /// let installed_app_id = ctx.get().installed_app_id(); /// let cell_id = ctx.get().cell_id(); -/// let app_agent_client = ctx.get().app_agent_client(); +/// let app_agent_client = ctx.get().app_client(); /// /// Ok(()) /// } @@ -182,13 +196,15 @@ where let mut signer = ClientAgentSigner::default(); signer.add_credentials(cell_id.clone(), credentials); - let app_agent_client = AppAgentWebsocket::connect( - app_ws_url, - installed_app_id.clone(), - signer.into(), - reporter, - ) - .await?; + let issued = client + .issue_app_auth_token(installed_app_id.clone().into()) + .await + .map_err(|e| { + anyhow::anyhow!("Could not issue auth token for app client: {:?}", e) + })?; + + let app_agent_client = + AppWebsocket::connect(app_ws_url, issued.token, signer.into(), reporter).await?; Ok((installed_app_id, cell_id, app_agent_client)) }) @@ -196,7 +212,7 @@ where ctx.get_mut().installed_app_id = Some(installed_app_id); ctx.get_mut().cell_id = Some(cell_id); - ctx.get_mut().app_agent_client = Some(app_agent_client); + ctx.get_mut().app_client = Some(app_agent_client); Ok(()) } @@ -242,13 +258,13 @@ where SV: UserValuesConstraint, { let cell_id = ctx.get().cell_id(); - let mut app_agent_client = ctx.get().app_agent_client(); + let mut app_agent_client = ctx.get().app_client(); ctx.runner_context().executor().execute_in_place(async { let result = app_agent_client .call_zome( cell_id.into(), - zome_name.into(), - fn_name.into(), + zome_name, + fn_name, ExternIO::encode(payload).context("Encoding failure")?, ) .await diff --git a/bindings/runner/src/context.rs b/bindings/runner/src/context.rs index cf9e1cdf..a810610d 100644 --- a/bindings/runner/src/context.rs +++ b/bindings/runner/src/context.rs @@ -1,4 +1,4 @@ -use holochain_client_instrumented::prelude::AppAgentWebsocket; +use holochain_client_instrumented::prelude::AppWebsocket; use holochain_types::prelude::CellId; use std::collections::HashMap; use std::fmt::Debug; @@ -16,7 +16,7 @@ impl UserValuesConstraint for DefaultScenarioValues {} pub struct HolochainAgentContext { pub(crate) installed_app_id: Option, pub(crate) cell_id: Option, - pub(crate) app_agent_client: Option, + pub(crate) app_client: Option, pub scenario_values: T, } @@ -35,8 +35,10 @@ impl HolochainAgentContext { .expect("cell_id is not set, did you forget to call `install_app` in your agent_setup?") } - /// Get the `app_agent_client` that was configured during agent setup. - pub fn app_agent_client(&self) -> AppAgentWebsocket { - self.app_agent_client.clone().expect("app_agent_client is not set, did you forget to call `install_app` in your agent_setup?") + /// Get the `app_client` that was configured during agent setup. + pub fn app_client(&self) -> AppWebsocket { + self.app_client.clone().expect( + "app_client is not set, did you forget to call `install_app` in your agent_setup?", + ) } } diff --git a/flake.lock b/flake.lock index 6f082d67..ad3f72ea 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1713738183, - "narHash": "sha256-qd/MuLm7OfKQKyd4FAMqV4H6zYyOfef5lLzRrmXwKJM=", + "lastModified": 1714536327, + "narHash": "sha256-zu4+LcygJwdyFHunTMeDFltBZ9+hoWvR/1A7IEy7ChA=", "owner": "ipetkov", "repo": "crane", - "rev": "f6c6a2fb1b8bd9b65d65ca9342dd0eb180a63f11", + "rev": "3124551aebd8db15d4560716d4f903bd44c64e4a", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1713768702, - "narHash": "sha256-+wmfZC9gVTy02Q0feWzaOxESYDYnWNpMWfl6k8VParw=", + "lastModified": 1714741020, + "narHash": "sha256-RLv97XHe/Rk7/X7cFIUb4+igc7jAfHmMcu7j740dvEo=", "owner": "holochain", "repo": "holochain", - "rev": "d9f2381f5ef5593450f7052335ba6e9e100ae57e", + "rev": "c863c05b44632db5d3761ec256f43932371925fd", "type": "github" }, "original": { @@ -228,16 +228,16 @@ "holochain_2": { "flake": false, "locked": { - "lastModified": 1713315590, - "narHash": "sha256-hWeNAq+F1rAoYulPFqpQOo0cjeMZVvKXLohnP0MOc9Y=", + "lastModified": 1714046698, + "narHash": "sha256-vGOWRJXR64qXRe4MCg13xNyww904KPFvYZIQyRhuPsU=", "owner": "holochain", "repo": "holochain", - "rev": "d8715775f359211b7031f4bdca1cc89db679ed10", + "rev": "b48562aa081b1dd177ec43035650262fbdb40d0e", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3.0-beta-dev.46", + "ref": "holochain-0.3.0-beta-dev.48", "repo": "holochain", "type": "github" } @@ -262,16 +262,16 @@ "launcher": { "flake": false, "locked": { - "lastModified": 1713340250, - "narHash": "sha256-J8dcl4TiUB93/08oO2Bh0qG6Qi+udbm6JrmPB92NZyU=", + "lastModified": 1714396970, + "narHash": "sha256-I/Vpxtg8cwhrrD5JugEgE4Qk8fZR6VewGm5FX69vbm0=", "owner": "holochain", "repo": "launcher", - "rev": "f7b7aabd3c3ef16edd391b0b94c4223a2de98d5b", + "rev": "b96d5aa790bf0da0a8f0c44741276f7f9c4b6b41", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-weekly", + "ref": "holochain-0.3", "repo": "launcher", "type": "github" } @@ -293,11 +293,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713537308, - "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", + "lastModified": 1714635257, + "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", + "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", "type": "github" }, "original": { @@ -374,11 +374,11 @@ ] }, "locked": { - "lastModified": 1713752081, - "narHash": "sha256-x0QDETp7paa8qq+LX6191JwSq8abUFXCnKNulQ8L7ps=", + "lastModified": 1714702555, + "narHash": "sha256-/NoUbE5S5xpK1FU3nlHhQ/tL126+JcisXdzy3Ng4pDU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "606c0ecb23c676c444a0b026eecf800d5bd5fec2", + "rev": "7f0e3ef7b7fbed78e12e5100851175d28af4b7c6", "type": "github" }, "original": { @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1713752081, - "narHash": "sha256-x0QDETp7paa8qq+LX6191JwSq8abUFXCnKNulQ8L7ps=", + "lastModified": 1714702555, + "narHash": "sha256-/NoUbE5S5xpK1FU3nlHhQ/tL126+JcisXdzy3Ng4pDU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "606c0ecb23c676c444a0b026eecf800d5bd5fec2", + "rev": "7f0e3ef7b7fbed78e12e5100851175d28af4b7c6", "type": "github" }, "original": { @@ -414,16 +414,16 @@ "scaffolding": { "flake": false, "locked": { - "lastModified": 1713363855, - "narHash": "sha256-Y9KsDAjlZZab07NL7pI1izxLOYT4BWYTx1h9DilW8Fk=", + "lastModified": 1714147981, + "narHash": "sha256-PIWouOg4W2jVFjsHexAqOCdnwy6gQgll7kWRHssiid0=", "owner": "holochain", "repo": "scaffolding", - "rev": "9ac485d52122b92bd2988a8fea1a8e4d9a18c3a1", + "rev": "6582621e73b5127ed863b13f5648d9a333542623", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-weekly", + "ref": "holochain-0.3", "repo": "scaffolding", "type": "github" } @@ -466,16 +466,16 @@ "scaffolding": "scaffolding" }, "locked": { - "dir": "versions/weekly", - "lastModified": 1713768702, - "narHash": "sha256-+wmfZC9gVTy02Q0feWzaOxESYDYnWNpMWfl6k8VParw=", + "dir": "versions/0_3_rc", + "lastModified": 1714741020, + "narHash": "sha256-RLv97XHe/Rk7/X7cFIUb4+igc7jAfHmMcu7j740dvEo=", "owner": "holochain", "repo": "holochain", - "rev": "d9f2381f5ef5593450f7052335ba6e9e100ae57e", + "rev": "c863c05b44632db5d3761ec256f43932371925fd", "type": "github" }, "original": { - "dir": "versions/weekly", + "dir": "versions/0_3_rc", "owner": "holochain", "repo": "holochain", "type": "github" diff --git a/flake.nix b/flake.nix index bda8e449..41148ed4 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Flake for Holochain testing"; inputs = { - versions.url = "github:holochain/holochain?dir=versions/weekly"; + versions.url = "github:holochain/holochain?dir=versions/0_3_rc"; holochain = { url = "github:holochain/holochain";