diff --git a/Cargo.lock b/Cargo.lock index b8627691..3d461bb6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -74,14 +74,14 @@ dependencies = [ [[package]] name = "aitia" -version = "0.2.0-beta-dev.8" +version = "0.2.0-beta-dev.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49ac48d997034c57d0ccefb3b85d3a0f217cbcc1a6bf025e906c5253d03651a6" +checksum = "0ebb9f6763b83ddcf5c50a320581b2918aea366fbf3d009cff49fc8de15f03ab" dependencies = [ "anyhow", "derive_more", "holochain_trace", - "parking_lot 0.10.2", + "parking_lot 0.12.2", "petgraph", "regex", "serde", @@ -218,12 +218,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.4" @@ -259,7 +253,7 @@ checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" dependencies = [ "concurrent-queue", "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite", ] @@ -272,7 +266,7 @@ checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-lite 2.3.0", "slab", ] @@ -324,8 +318,8 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.6.0", - "rustix 0.38.33", + "polling 3.7.0", + "rustix 0.38.34", "slab", "tracing", "windows-sys 0.52.0", @@ -370,19 +364,19 @@ dependencies = [ "cfg-if 1.0.0", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.33", + "rustix 0.38.34", "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "0.3.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2 1.0.81", "quote 1.0.36", - "syn 1.0.109", + "syn 2.0.60", ] [[package]] @@ -397,7 +391,7 @@ dependencies = [ "cfg-if 1.0.0", "futures-core", "futures-io", - "rustix 0.38.33", + "rustix 0.38.34", "signal-hook-registry", "slab", "windows-sys 0.52.0", @@ -454,9 +448,9 @@ dependencies = [ [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" @@ -519,7 +513,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d67782c3f868daa71d3533538e98a8e13713231969def7536e8039606fc46bf0" dependencies = [ - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-core", "pin-project", "tokio", @@ -552,6 +546,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "bimap" version = "0.6.3" @@ -615,17 +615,6 @@ dependencies = [ "wyz", ] -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "constant_time_eq 0.1.5", -] - [[package]] name = "blake2b_simd" version = "1.0.2" @@ -633,17 +622,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", - "arrayvec 0.7.4", - "constant_time_eq 0.3.0", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", + "arrayvec", + "constant_time_eq", ] [[package]] @@ -657,18 +637,16 @@ dependencies = [ [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" dependencies = [ "async-channel 2.2.1", "async-lock 3.3.0", "async-task", - "fastrand 2.0.2", "futures-io", "futures-lite 2.3.0", "piper", - "tracing", ] [[package]] @@ -790,16 +768,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" @@ -907,19 +875,13 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "constant_time_eq" version = "0.3.0" @@ -1010,7 +972,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", @@ -1021,7 +983,7 @@ dependencies = [ "gimli 0.26.2", "log", "regalloc2", - "smallvec 1.13.2", + "smallvec", "target-lexicon", ] @@ -1051,7 +1013,7 @@ dependencies = [ "hashbrown 0.12.3", "indexmap 1.9.3", "log", - "smallvec 1.13.2", + "smallvec", ] [[package]] @@ -1068,7 +1030,7 @@ checksum = "0d70abacb8cfef3dc8ff7e8836e9c1d70f7967dfdac824a4cd5e30223415aca6" dependencies = [ "cranelift-codegen", "log", - "smallvec 1.13.2", + "smallvec", "target-lexicon", ] @@ -1157,39 +1119,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "curve25519-dalek" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" -dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", - "subtle", - "zeroize", -] - -[[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", -] - [[package]] name = "darling" version = "0.14.4" @@ -1210,34 +1139,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 1.0.81", - "quote 1.0.36", - "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 1.0.81", - "quote 1.0.36", - "strsim 0.10.0", - "syn 1.0.109", -] - [[package]] name = "darling_core" version = "0.14.4" @@ -1262,31 +1163,10 @@ dependencies = [ "ident_case", "proc-macro2 1.0.81", "quote 1.0.36", + "strsim 0.10.0", "syn 2.0.60", ] -[[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 1.0.36", - "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 1.0.36", - "syn 1.0.109", -] - [[package]] name = "darling_macro" version = "0.14.4" @@ -1332,17 +1212,17 @@ 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", + "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 = "derivative" @@ -1368,27 +1248,33 @@ dependencies = [ [[package]] name = "derive_builder" -version = "0.9.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" dependencies = [ - "darling 0.10.2", - "derive_builder_core", - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 1.0.109", + "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 1.0.81", "quote 1.0.36", - "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]] @@ -1410,65 +1296,29 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - [[package]] name = "difflib" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - [[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "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 0.3.7", -] - [[package]] name = "dirs" version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "dirs-sys 0.4.1", -] - -[[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 0.3.9", + "dirs-sys", ] [[package]] @@ -1505,29 +1355,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" -[[package]] -name = "ed25519" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" -dependencies = [ - "signature", -] - -[[package]] -name = "ed25519-dalek" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -dependencies = [ - "curve25519-dalek", - "ed25519", - "rand 0.7.3", - "serde", - "sha2 0.9.9", - "zeroize", -] - [[package]] name = "either" version = "1.11.0" @@ -1688,9 +1515,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ "event-listener 5.3.0", "pin-project-lite", @@ -1702,6 +1529,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + [[package]] name = "fallible-streaming-iterator" version = "0.1.9" @@ -1719,9 +1552,9 @@ dependencies = [ [[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 = "filetime" @@ -1743,13 +1576,13 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[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", @@ -1760,23 +1593,14 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "4556222738635b7a3417ae6130d8f52201e45a0c4d1a907f0826383adb5f85e7" dependencies = [ "crc32fast", "miniz_oxide", ] -[[package]] -name = "float-cmp" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" -dependencies = [ - "num-traits", -] - [[package]] name = "float-cmp" version = "0.9.0" @@ -1813,7 +1637,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ - "percent-encoding 2.3.1", + "percent-encoding", ] [[package]] @@ -1903,7 +1727,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", @@ -2062,7 +1886,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" dependencies = [ - "fallible-iterator", + "fallible-iterator 0.2.0", "indexmap 1.9.3", "stable_deref_trait", ] @@ -2099,7 +1923,7 @@ dependencies = [ "parking_lot 0.11.2", "quanta", "rand 0.8.5", - "smallvec 1.13.2", + "smallvec", ] [[package]] @@ -2121,6 +1945,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 = "hashbrown" version = "0.8.2" @@ -2151,9 +1994,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", @@ -2165,7 +2008,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]] @@ -2185,9 +2028,9 @@ dependencies = [ [[package]] name = "hc_sleuth" -version = "0.2.0-beta-dev.15" +version = "0.2.0-beta-dev.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e29adab5d10ede1e2595a641a0d12f0f03ce8a15ec432ec6047ef1af8abd71f" +checksum = "4103fc13f708f78d7638a986938e0d3b66652b303a2eb58b06a4f330fdd6c792" dependencies = [ "aitia", "anyhow", @@ -2197,7 +2040,7 @@ dependencies = [ "holochain_types", "kitsune_p2p", "once_cell", - "parking_lot 0.10.2", + "parking_lot 0.12.2", "petgraph", "regex", "serde", @@ -2208,9 +2051,9 @@ dependencies = [ [[package]] name = "hdi" -version = "0.4.0-beta-dev.34" +version = "0.4.0-beta-dev.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efe35d8a7150f89f54d6a2c61320bfaf70af9d5d0dd5726b2ce68e802fcab2e4" +checksum = "f825dde020258d4af03ea8c0d899d8000ccac86da32f2233ce7abf4629639378" dependencies = [ "getrandom 0.2.14", "hdk_derive", @@ -2226,9 +2069,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.3.0-beta-dev.38" +version = "0.3.0-beta-dev.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "700ef8595eac45e31a61b1f1af054c247156fddc52dd31ba3902acd8d17c5db3" +checksum = "bd3d886617f1d75d33ca49fbabf297b2829d1c7c9339564b82e4a1f4fa3d24f8" dependencies = [ "getrandom 0.2.14", "hdi", @@ -2246,12 +2089,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", @@ -2328,13 +2171,13 @@ 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 = [ "arbitrary", - "base64 0.13.1", - "blake2b_simd 0.5.11", + "base64 0.22.0", + "blake2b_simd", "derive_more", "fixt", "futures", @@ -2354,27 +2197,24 @@ dependencies = [ [[package]] name = "holochain" -version = "0.3.0-beta-dev.45" +version = "0.3.0-beta-dev.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4bb959fa5b8b9065939d024317d252373430dfa70fe6836c418468201e8b4db" +checksum = "72f4004d44cf9fbf38fde0fdbd788a4517ef9cf38c9042e67fa77e3f340668b7" dependencies = [ "aitia", "anyhow", "arbitrary", "async-once-cell", - "async-recursion", "async-trait", "backtrace", - "base64 0.13.1", - "byteorder", - "cfg-if 0.1.10", + "base64 0.22.0", + "cfg-if 1.0.0", "chrono", "contrafact", "derive_more", "diff", - "directories", "either", - "fallible-iterator", + "fallible-iterator 0.3.0", "fixt", "futures", "get_if_addrs", @@ -2402,33 +2242,28 @@ dependencies = [ "holochain_wasmer_host", "holochain_websocket", "holochain_zome_types", - "hostname", + "hostname 0.4.0", "human-panic", - "itertools 0.10.5", + "itertools 0.12.1", "kitsune_p2p", "kitsune_p2p_bin_data", "kitsune_p2p_block", "kitsune_p2p_bootstrap", - "kitsune_p2p_bootstrap_client", "kitsune_p2p_types", "lair_keystore", - "lazy_static", "matches", "mockall", "mr_bundle", - "must_future", - "nanoid 0.3.0", - "num_cpus", + "nanoid", "once_cell", "one_err", "opentelemetry_api", - "parking_lot 0.10.2", + "parking_lot 0.12.2", "petgraph", - "predicates 1.0.8", + "predicates 3.1.0", "rand 0.8.5", "rand-utf8", "rand_chacha 0.3.1", - "rpassword 5.0.1", "rusqlite", "sd-notify", "serde", @@ -2446,34 +2281,27 @@ dependencies = [ "tiny-keccak", "tokio", "tokio-stream", - "toml 0.5.11", + "toml 0.8.12", "tracing", "tracing-futures", "tracing-subscriber", "unwrap_to", - "url 2.5.0", + "url", "url2", - "url_serde", - "uuid 0.7.4", + "uuid", "wasmer", "wasmer-middlewares", ] [[package]] name = "holochain_cascade" -version = "0.3.0-beta-dev.44" +version = "0.3.0-beta-dev.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be737e39dcafac62ddfd8ca79ce988742676e3c6296841900d505480826e1417" +checksum = "f3ebbef3a20d6d315711bbf9b3a7544a0819fb652687ee249018fc87c5e544a2" dependencies = [ "async-trait", - "derive_more", - "either", - "fallible-iterator", "fixt", "futures", - "ghost_actor", - "hdk", - "hdk_derive", "holo_hash", "holochain_nonce", "holochain_p2p", @@ -2486,24 +2314,19 @@ dependencies = [ "holochain_zome_types", "kitsune_p2p", "mockall", - "once_cell", "opentelemetry_api", - "serde", - "serde_derive", "thiserror", "tokio", "tracing", - "tracing-futures", ] [[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", @@ -2513,10 +2336,8 @@ dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_types", "serde", - "serde_derive", "serde_yaml", "shrinkwraprs", - "structopt", "thiserror", "tracing", "url2", @@ -2524,9 +2345,9 @@ dependencies = [ [[package]] name = "holochain_conductor_services" -version = "0.2.0-beta-dev.15" +version = "0.2.0-beta-dev.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a91ac5abadf40d3a7a105e06292be76b1ca03756b339688e52ada21cf49ce9d" +checksum = "8d2e90ae8be8623a23b5b4635431126a29eb505129cac19eff8f4f8529e99854" dependencies = [ "anyhow", "async-trait", @@ -2534,18 +2355,15 @@ dependencies = [ "futures", "holochain_keystore", "holochain_types", - "holochain_util", "mockall", - "must_future", - "serde", "thiserror", ] [[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 = [ "arbitrary", "derive_builder", @@ -2554,7 +2372,6 @@ dependencies = [ "holochain_serialized_bytes", "holochain_util", "kitsune_p2p_timestamp", - "paste", "proptest", "proptest-derive 0.4.0", "serde", @@ -2566,11 +2383,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.0", "derive_more", "futures", "holo_hash", @@ -2581,9 +2398,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", @@ -2595,21 +2412,19 @@ dependencies = [ [[package]] name = "holochain_metrics" -version = "0.3.0-beta-dev.11" +version = "0.3.0-beta-dev.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9af71f1f847d23591c33f5dd62ed630889f0bc18c6d71c70162ceab95de09fcb" +checksum = "6cac6af74a312102e66b27f7aef81ce3f83f8352711fabd95cc4453b9a521f85" dependencies = [ "opentelemetry_api", - "reqwest", - "sct", "tracing", ] [[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", @@ -2618,9 +2433,9 @@ dependencies = [ [[package]] name = "holochain_p2p" -version = "0.3.0-beta-dev.44" +version = "0.3.0-beta-dev.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97f568249b9ed6f6f9a1a51355b3be15cbb05727f5e57522ca78f63791b4f83b" +checksum = "2f612e31e44f9c9d2f9d6c26c6cb5c8e4e5e73a9b074473adfe7c7bff7649594" dependencies = [ "aitia", "async-trait", @@ -2635,7 +2450,6 @@ dependencies = [ "holochain_serialized_bytes", "holochain_trace", "holochain_types", - "holochain_util", "holochain_zome_types", "kitsune_p2p", "kitsune_p2p_types", @@ -2690,15 +2504,14 @@ 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", + "fallible-iterator 0.2.0", "futures", "getrandom 0.2.14", "holo_hash", @@ -2711,11 +2524,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", @@ -2723,10 +2536,9 @@ dependencies = [ "rusqlite", "scheduled-thread-pool", "serde", - "serde_derive", "serde_json", "shrinkwraprs", - "sqlformat 0.1.8", + "sqlformat", "tempfile", "thiserror", "tokio", @@ -2735,22 +2547,17 @@ dependencies = [ [[package]] name = "holochain_state" -version = "0.3.0-beta-dev.44" +version = "0.3.0-beta-dev.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f82382017c04be3349cb1f579274f54fa07448f7f4aa4f275c621462e5fe6bf" +checksum = "4d169eaae44f3ad88d702c6d16832050e67f508014a286363069a4b59772299f" dependencies = [ "aitia", "async-recursion", - "base64 0.13.1", - "byteorder", - "cfg-if 0.1.10", + "base64 0.22.0", "chrono", "contrafact", "cron", - "derive_more", - "either", - "fallible-iterator", - "futures", + "fallible-iterator 0.2.0", "hc_sleuth", "holo_hash", "holochain_keystore", @@ -2760,14 +2567,11 @@ dependencies = [ "holochain_sqlite", "holochain_state_types", "holochain_types", - "holochain_util", "holochain_zome_types", "kitsune_p2p", - "mockall", - "nanoid 0.3.0", + "nanoid", "one_err", - "parking_lot 0.10.2", - "rand 0.8.5", + "parking_lot 0.12.2", "serde", "serde_json", "shrinkwraprs", @@ -2775,14 +2579,13 @@ dependencies = [ "thiserror", "tokio", "tracing", - "tracing-futures", ] [[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", @@ -2791,9 +2594,9 @@ dependencies = [ [[package]] name = "holochain_test_wasm_common" -version = "0.3.0-beta-dev.38" +version = "0.3.0-beta-dev.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe92b88750e40a8ab15c14c55670fce756fe1e0e09dd7dbfb5040953a3301e1" +checksum = "eb6726c88b229f9324be701d17843c684aa9bae0afb1791d63e3047329ef6fe9" dependencies = [ "hdk", "serde", @@ -2801,9 +2604,9 @@ dependencies = [ [[package]] name = "holochain_trace" -version = "0.3.0-beta-dev.10" +version = "0.3.0-beta-dev.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40d847f36583355f3bc90cdad17fd951078325bccd93c68107cd61beeef3713c" +checksum = "ac46325f0772687693570b6ddfd15f7009be22a383ac9c490fbdc2ab72346287" dependencies = [ "chrono", "derive_more", @@ -2819,22 +2622,18 @@ 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", "arbitrary", "async-trait", "automap", "backtrace", - "base64 0.13.1", - "cfg-if 0.1.10", - "chrono", "contrafact", "derive_builder", "derive_more", - "either", "fixt", "flate2", "futures", @@ -2846,18 +2645,15 @@ dependencies = [ "holochain_sqlite", "holochain_trace", "holochain_util", - "holochain_wasmer_host", "holochain_zome_types", "isotest", - "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", "proptest", "proptest-derive 0.4.0", "rand 0.8.5", @@ -2880,20 +2676,17 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.3.0-beta-dev.7" +version = "0.3.0-beta-dev.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1b4134b28045c8da6a82a0a28b29d07d5995c547fa4afb8bb7e479c9c948ae9" +checksum = "c206aa2904cca055a7db01248c9e6ff2a2b14fedcd6673a8a739a3d6c46ab74e" dependencies = [ "backtrace", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "colored", - "derive_more", "dunce", "futures", - "getrandom 0.2.14", - "num_cpus", "once_cell", - "rpassword 7.3.1", + "rpassword", "sodoken", "tokio", "tracing", @@ -2901,15 +2694,15 @@ dependencies = [ [[package]] name = "holochain_wasm_test_utils" -version = "0.3.0-beta-dev.43" +version = "0.3.0-beta-dev.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d153b6d9b6184603e1176b4919f07b514ccc78b7793e6bd894dfac252077a7" +checksum = "6b8fd043d983f39ba8b2e6b5d2dcb567c8c551b7417c03f6e73bb7d91636e140" dependencies = [ "holochain_types", "holochain_util", "strum", "strum_macros 0.18.0", - "toml 0.5.11", + "toml 0.8.12", "walkdir", ] @@ -2935,7 +2728,7 @@ checksum = "8c429e84a19ee446f47541a6fed10e1a4376a8a8ba6d3dbff7d07e4a7bb4c85f" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "paste", "serde", "tracing", @@ -2952,7 +2745,7 @@ dependencies = [ "hex", "holochain_serialized_bytes", "holochain_wasmer_common", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rand 0.8.5", "serde", "tracing", @@ -2962,10 +2755,11 @@ dependencies = [ [[package]] name = "holochain_websocket" -version = "0.3.0-beta-dev.20" +version = "0.3.0-beta-dev.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f61e434ced22741f32d340e8afc1972f8ce661a6207d112b9c563b8b6f4c7cf" +checksum = "862c6c5af982f907a692542866798c34b8c0a54d0ab23f82259d7c08157adb16" dependencies = [ + "async-trait", "futures", "holochain_serialized_bytes", "holochain_types", @@ -2978,9 +2772,9 @@ 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 = [ "arbitrary", "contrafact", @@ -2990,17 +2784,14 @@ dependencies = [ "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", "once_cell", - "paste", "proptest", "proptest-derive 0.4.0", "rand 0.8.5", @@ -3036,6 +2827,17 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "hostname" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "windows", +] + [[package]] name = "http" version = "0.2.12" @@ -3069,6 +2871,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" @@ -3083,9 +2908,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "human-panic" -version = "1.2.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f016c89920bbb30951a8405ecacbb4540db5524313b9445736e7e1855cf370" +checksum = "a4c5d0e9120f6bca6120d142c7ede1ba376dd6bf276d69dd3dbe6cbeb7824179" dependencies = [ "anstream", "anstyle", @@ -3094,7 +2919,7 @@ dependencies = [ "serde", "serde_derive", "toml 0.8.12", - "uuid 1.8.0", + "uuid", ] [[package]] @@ -3107,31 +2932,74 @@ 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", "pin-project-lite", - "socket2 0.5.6", + "socket2 0.5.7", "tokio", "tower-service", "tracing", "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" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", - "hyper", + "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 0.5.7", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -3163,17 +3031,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.5.0" @@ -3196,12 +3053,12 @@ dependencies = [ [[package]] name = "if-addrs" -version = "0.8.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b24dd0826eee92c56edcda7ff190f2cf52115c49eadb2c2da8063e2673a8c2" +checksum = "bb2a33e9c38988ecbda730c85b0fd9ddcdf83c0305ac7fd21c8bb9f57f2f0cc8" dependencies = [ "libc", - "windows-sys 0.42.0", + "windows-sys 0.52.0", ] [[package]] @@ -3218,6 +3075,7 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg 1.2.0", "hashbrown 0.12.3", + "serde", ] [[package]] @@ -3227,7 +3085,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]] @@ -3340,15 +3199,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.12.1" @@ -3397,13 +3247,13 @@ dependencies = [ [[package]] name = "kitsune_p2p" -version = "0.3.0-beta-dev.38" +version = "0.3.0-beta-dev.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c46382f5d47bda4f6b1668d39fe7708bf8928730d9d13d2be62234633b0d41dc" +checksum = "ea55581c45c58712606fbd0a8d928bf10947fe59d2db5b1ddc859d824e6da6a3" dependencies = [ "arrayref", - "base64 0.21.7", - "blake2b_simd 0.5.11", + "base64 0.22.0", + "blake2b_simd", "bloomfilter", "bytes", "derive_more", @@ -3412,7 +3262,7 @@ dependencies = [ "ghost_actor", "governor", "holochain_trace", - "itertools 0.11.0", + "itertools 0.12.1", "kitsune_p2p_bin_data", "kitsune_p2p_block", "kitsune_p2p_bootstrap_client", @@ -3425,11 +3275,11 @@ dependencies = [ "maplit", "mockall", "must_future", - "nanoid 0.4.0", + "nanoid", "num-traits", "once_cell", "opentelemetry_api", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rand 0.8.5", "serde", "serde_bytes", @@ -3444,12 +3294,12 @@ 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 = [ "arbitrary", - "base64 0.13.1", + "base64 0.22.0", "derive_more", "fixt", "holochain_util", @@ -3463,9 +3313,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", @@ -3474,15 +3324,15 @@ dependencies = [ [[package]] name = "kitsune_p2p_bootstrap" -version = "0.2.0-beta-dev.26" +version = "0.2.0-beta-dev.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d2291ad3cb22f7c69de56ff79cf257c7d9ec40902fba28d8ecd4e285c126bf" +checksum = "f5a636463a819a7bf7d9c8dd23526a9be668ffdd4f14532942ffe33a363988d7" dependencies = [ "clap 4.5.4", "futures", "kitsune_p2p_bin_data", "kitsune_p2p_types", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rand 0.8.5", "reqwest", "serde", @@ -3494,27 +3344,24 @@ dependencies = [ [[package]] name = "kitsune_p2p_bootstrap_client" -version = "0.3.0-beta-dev.32" +version = "0.3.0-beta-dev.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122a4fdc9fca63248ddcf90cf4a4ff1876b006dd0ce398d9bf0b059f655a9333" +checksum = "16c2d62c94fb7ef92963c42af4eb335613aaa14b4b49391b57a736f03ea7cd50" dependencies = [ - "ed25519-dalek", "kitsune_p2p_bin_data", "kitsune_p2p_bootstrap", "kitsune_p2p_types", - "once_cell", "reqwest", "serde", "serde_bytes", - "tokio", "url2", ] [[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 = [ "arbitrary", "colored", @@ -3525,7 +3372,6 @@ dependencies = [ "kitsune_p2p_timestamp", "must_future", "num-traits", - "once_cell", "proptest", "proptest-derive 0.4.0", "rand 0.8.5", @@ -3537,9 +3383,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 = [ "arbitrary", "derive_more", @@ -3555,9 +3401,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_fetch" -version = "0.3.0-beta-dev.29" +version = "0.3.0-beta-dev.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59268a17a7fd1ec7abf7e8b97e0344b635a4bf9de1887de8cffc0529d186ac55" +checksum = "e962ab929eb2d3fb1bc5f31c8999168db5e32665267b0e9e3185ff90605d8779" dependencies = [ "backon", "derive_more", @@ -3571,13 +3417,13 @@ dependencies = [ [[package]] name = "kitsune_p2p_mdns" -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 = "e3ec6ed7b845a1c5ea8c4a243395b4266c6299c670debafa2956e39c1163e01b" +checksum = "6624c90b075ff417ad1a5b1f9d3c2b63368e84a8072a3d721483ddff9a768f17" dependencies = [ - "base64 0.21.7", + "base64 0.22.0", "err-derive 0.3.1", - "futures", + "futures-util", "libmdns", "mdns", "tokio", @@ -3586,11 +3432,11 @@ dependencies = [ [[package]] name = "kitsune_p2p_proxy" -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 = "97a82e60e19901feeb36e4580b93008d604be0b2fe37169288b994a3c182feb9" +checksum = "c808994814a1637683eaa383e455798ba352e35dafec8d090646c7760f3c7669" dependencies = [ - "base64 0.21.7", + "base64 0.22.0", "derive_more", "futures", "holochain_trace", @@ -3604,9 +3450,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 = [ "arbitrary", "chrono", @@ -3620,28 +3466,28 @@ dependencies = [ [[package]] name = "kitsune_p2p_transport_quic" -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 = "8efac1047351b67588a05d5d644877fd01dfe16b5f619a509daa2e7ce3ea7c90" +checksum = "f1ea09be6e2966b8ce1d3dbb6c2819de2d1898b280c991433e1246b9eb9c3687" dependencies = [ - "blake2b_simd 1.0.2", + "blake2b_simd", "futures", - "if-addrs 0.8.0", + "if-addrs 0.12.0", "kitsune_p2p_types", "quinn", - "rustls 0.20.9", + "rustls", "tokio", "webpki", ] [[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 = [ "arbitrary", - "base64 0.21.7", + "base64 0.22.0", "derive_more", "fixt", "futures", @@ -3654,19 +3500,19 @@ dependencies = [ "lair_keystore_api", "mockall", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "paste", "proptest", "proptest-derive 0.4.0", "rmp-serde", - "rustls 0.20.9", + "rustls", "serde", "serde_bytes", "serde_json", - "sysinfo 0.29.11", + "sysinfo 0.30.11", "thiserror", "tokio", - "url 2.5.0", + "url", "url2", ] @@ -3687,9 +3533,9 @@ checksum = "56689c6c7f318e5909c9de1d7eac7f2d383370341632ab845c2da24b5b6bb7aa" dependencies = [ "lair_keystore_api", "pretty_assertions", - "rpassword 7.3.1", + "rpassword", "rusqlite", - "sqlformat 0.2.3", + "sqlformat", "structopt", "sysinfo 0.28.4", "tracing-subscriber", @@ -3705,9 +3551,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", @@ -3716,7 +3562,7 @@ dependencies = [ "tokio", "toml 0.7.8", "tracing", - "url 2.5.0", + "url", "winapi 0.3.9", "zeroize", ] @@ -3787,7 +3633,7 @@ checksum = "6a60d8339ad1ddf68a81335fcafb6c6cf20d5036138a1e4ef86b8ce87f076c92" dependencies = [ "byteorder", "futures-util", - "hostname", + "hostname 0.3.1", "if-addrs 0.7.0", "log", "multimap", @@ -3811,19 +3657,20 @@ dependencies = [ [[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", "vcpkg", - "zip", + "zip 1.1.2", ] [[package]] @@ -3852,18 +3699,9 @@ 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", "scopeguard", @@ -3942,12 +3780,6 @@ dependencies = [ "rawpointer", ] -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "mdns" version = "3.0.0" @@ -4089,14 +3921,12 @@ 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 = [ "arbitrary", - "bytes", "derive_more", - "either", "flate2", "futures", "holochain_util", @@ -4106,7 +3936,6 @@ dependencies = [ "rmp-serde", "serde", "serde_bytes", - "serde_derive", "serde_yaml", "test-strategy", "thiserror", @@ -4178,15 +4007,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" @@ -4355,7 +4175,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "itoa", ] @@ -4413,23 +4233,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 1.0.81", "quote 1.0.36", - "syn 1.0.109", + "syn 2.0.60", ] [[package]] @@ -4459,12 +4279,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "opaque-debug" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" - [[package]] name = "openssl" version = "0.10.64" @@ -4581,39 +4395,12 @@ 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 = "parking" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" -[[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" @@ -4621,44 +4408,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 0.3.9", -] - -[[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 0.3.9", + "lock_api", + "parking_lot_core 0.9.10", ] [[package]] @@ -4671,21 +4432,21 @@ dependencies = [ "instant", "libc", "redox_syscall 0.2.16", - "smallvec 1.13.2", + "smallvec", "winapi 0.3.9", ] [[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", "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]] @@ -4701,13 +4462,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ "base64 0.13.1", -] - -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" +] [[package]] name = "percent-encoding" @@ -4776,7 +4531,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-io", ] @@ -4804,15 +4559,15 @@ dependencies = [ [[package]] name = "polling" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", "hermit-abi 0.3.9", "pin-project-lite", - "rustix 0.38.33", + "rustix 0.38.34", "tracing", "windows-sys 0.52.0", ] @@ -4825,12 +4580,13 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "1.0.8" +version = "2.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ - "difference", - "float-cmp 0.8.0", + "difflib", + "float-cmp", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -4838,13 +4594,13 @@ dependencies = [ [[package]] name = "predicates" -version = "2.1.5" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" +checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" dependencies = [ + "anstyle", "difflib", - "float-cmp 0.9.0", - "itertools 0.10.5", + "float-cmp", "normalize-line-endings", "predicates-core", "regex", @@ -4878,12 +4634,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]] @@ -5037,7 +4792,7 @@ dependencies = [ "fxhash", "quinn-proto", "quinn-udp", - "rustls 0.20.9", + "rustls", "thiserror", "tokio", "tracing", @@ -5054,7 +4809,7 @@ dependencies = [ "fxhash", "rand 0.8.5", "ring 0.16.20", - "rustls 0.20.9", + "rustls", "rustls-native-certs", "rustls-pemfile 0.2.1", "slab", @@ -5103,7 +4858,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", ] @@ -5123,19 +4878,6 @@ 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 0.3.9", -] - [[package]] name = "rand" version = "0.6.5" @@ -5389,12 +5131,6 @@ 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" @@ -5413,6 +5149,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + [[package]] name = "redox_users" version = "0.4.5" @@ -5433,7 +5178,7 @@ dependencies = [ "fxhash", "log", "slice-group-by", - "smallvec 1.13.2", + "smallvec", ] [[package]] @@ -5503,29 +5248,31 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.24" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ - "base64 0.21.7", + "base64 0.22.0", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2", - "http 0.2.12", - "http-body", - "hyper", + "h2 0.4.4", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.3.1", "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", "mime", "native-tls", "once_cell", - "percent-encoding 2.3.1", + "percent-encoding", "pin-project-lite", - "rustls-pemfile 1.0.4", + "rustls-pemfile 2.1.2", "serde", "serde_json", "serde_urlencoded", @@ -5534,7 +5281,7 @@ dependencies = [ "tokio", "tokio-native-tls", "tower-service", - "url 2.5.0", + "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -5596,7 +5343,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.8.0", + "uuid", ] [[package]] @@ -5650,16 +5397,6 @@ dependencies = [ "serde_bytes", ] -[[package]] -name = "rpassword" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" -dependencies = [ - "libc", - "winapi 0.3.9", -] - [[package]] name = "rpassword" version = "7.3.1" @@ -5688,11 +5425,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ "bitflags 2.5.0", - "fallible-iterator", + "fallible-iterator 0.2.0", "fallible-streaming-iterator", "hashlink", "libsqlite3-sys", - "smallvec 1.13.2", + "smallvec", ] [[package]] @@ -5726,9 +5463,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.33" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3cc72858054fcff6d7dea32df2aeaee6a7c24227366d7ea429aada2f26b16ad" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -5749,20 +5486,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -dependencies = [ - "log", - "ring 0.17.8", - "rustls-pki-types", - "rustls-webpki 0.102.3", - "subtle", - "zeroize", -] - [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -5793,11 +5516,21 @@ dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pemfile" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64 0.22.0", + "rustls-pki-types", +] + [[package]] name = "rustls-pki-types" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" +checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" [[package]] name = "rustls-webpki" @@ -5809,17 +5542,6 @@ dependencies = [ "untrusted 0.7.1", ] -[[package]] -name = "rustls-webpki" -version = "0.102.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" -dependencies = [ - "ring 0.17.8", - "rustls-pki-types", - "untrusted 0.9.0", -] - [[package]] name = "rustversion" version = "1.0.15" @@ -5877,7 +5599,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]] @@ -5894,19 +5616,19 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] name = "sd-notify" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cd08a21f852bd2fe42e3b2a6c76a0db6a95a5b5bd29c0521dd0b30fa1712ec8" +checksum = "621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32" [[package]] name = "seahash" @@ -5972,9 +5694,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.198" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" dependencies = [ "serde_derive", ] @@ -6010,9 +5732,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" dependencies = [ "proc-macro2 1.0.81", "quote 1.0.36", @@ -6054,24 +5776,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.0", + "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 1.0.81", "quote 1.0.36", - "syn 1.0.109", + "syn 2.0.60", ] [[package]] @@ -6095,7 +5825,7 @@ checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -6106,20 +5836,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", + "digest", ] [[package]] @@ -6130,7 +5847,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -6174,12 +5891,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" - [[package]] name = "simba" version = "0.6.0" @@ -6223,15 +5934,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" @@ -6250,9 +5952,9 @@ dependencies = [ [[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", @@ -6269,7 +5971,7 @@ dependencies = [ "num_cpus", "once_cell", "one_err", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "tokio", ] @@ -6285,17 +5987,6 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -[[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" @@ -6338,12 +6029,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" @@ -6527,9 +6212,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.11" +version = "0.30.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" +checksum = "87341a165d73787554941cd5ef55ad728011566fe714e987d1b976c15dbc3a83" dependencies = [ "cfg-if 1.0.0", "core-foundation-sys", @@ -6537,7 +6222,7 @@ dependencies = [ "ntapi", "once_cell", "rayon", - "winapi 0.3.9", + "windows", ] [[package]] @@ -6591,7 +6276,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7228e85537ffb5943539a46bf561786323f6112114005ba055e496192a6f8f41" dependencies = [ "futures", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "tokio", "tracing", ] @@ -6603,8 +6288,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.0.2", - "rustix 0.38.33", + "fastrand 2.1.0", + "rustix 0.38.34", "windows-sys 0.52.0", ] @@ -6712,17 +6397,6 @@ dependencies = [ "syn 2.0.60", ] -[[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 0.3.9", -] - [[package]] name = "thread_local" version = "1.1.8" @@ -6795,10 +6469,10 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.6", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] @@ -6830,7 +6504,7 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.9", + "rustls", "tokio", "webpki", ] @@ -6855,7 +6529,7 @@ checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" dependencies = [ "futures-util", "log", - "rustls 0.20.9", + "rustls", "rustls-native-certs", "tokio", "tokio-rustls", @@ -6889,15 +6563,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - [[package]] name = "toml" version = "0.7.8" @@ -6941,7 +6606,18 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +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]] @@ -6954,6 +6630,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", + "winnow 0.6.7", ] [[package]] @@ -6969,6 +6646,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" @@ -7052,7 +6751,7 @@ dependencies = [ "serde", "serde_json", "sharded-slab", - "smallvec 1.13.2", + "smallvec", "thread_local", "time", "tracing", @@ -7086,10 +6785,10 @@ dependencies = [ "httparse", "log", "rand 0.8.5", - "rustls 0.20.9", + "rustls", "sha1", "thiserror", - "url 2.5.0", + "url", "utf-8", "webpki", ] @@ -7109,7 +6808,7 @@ dependencies = [ "rand 0.8.5", "sha1", "thiserror", - "url 2.5.0", + "url", "utf-8", ] @@ -7125,7 +6824,7 @@ dependencies = [ "influxive-otel-atomic-obs", "once_cell", "opentelemetry_api", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rand 0.8.5", "rand-utf8", "serde", @@ -7135,7 +6834,7 @@ dependencies = [ "tx5-core", "tx5-go-pion", "tx5-signal", - "url 2.5.0", + "url", ] [[package]] @@ -7150,11 +6849,11 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "tempfile", "tokio", "tracing", - "url 2.5.0", + "url", ] [[package]] @@ -7164,11 +6863,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5731de2cad3c014ddce4552f32c0b0c68b8682390b7ac57c55cbeddf6c1dbe50" dependencies = [ "futures", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "tokio", "tracing", "tx5-go-pion-sys", - "url 2.5.0", + "url", ] [[package]] @@ -7184,10 +6883,10 @@ dependencies = [ "libloading", "once_cell", "ouroboros", - "sha2 0.10.8", + "sha2", "tracing", "tx5-core", - "zip", + "zip 0.6.6", ] [[package]] @@ -7199,24 +6898,24 @@ dependencies = [ "futures", "lair_keystore_api", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rand 0.8.5", "rand-utf8", "rcgen", "ring 0.16.20", - "rustls 0.20.9", + "rustls", "rustls-native-certs", "rustls-pemfile 1.0.4", "serde_json", - "sha2 0.10.8", - "socket2 0.5.6", + "sha2", + "socket2 0.5.7", "tokio", "tokio-rustls", "tokio-tungstenite 0.18.0", "tracing", "tx5-core", - "url 2.5.0", - "webpki-roots 0.23.1", + "url", + "webpki-roots", ] [[package]] @@ -7275,9 +6974,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-xid" @@ -7334,29 +7033,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.0", "log", + "native-tls", "once_cell", - "rustls 0.22.4", - "rustls-pki-types", - "rustls-webpki 0.102.3", - "url 2.5.0", - "webpki-roots 0.26.1", -] - -[[package]] -name = "url" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -dependencies = [ - "idna 0.1.5", - "matches", - "percent-encoding 1.0.1", + "url", ] [[package]] @@ -7366,8 +7051,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.5.0", - "percent-encoding 2.3.1", + "idna", + "percent-encoding", "serde", ] @@ -7378,17 +7063,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c89cd13f1de9862d363308f5ffdadcd2b64b2a4a812fb296a80b7d3e80011b1e" dependencies = [ "serde", - "url 2.5.0", -] - -[[package]] -name = "url_serde" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74e7d099f1ee52f823d4bdd60c93c3602043c728f5db3b97bdb548467f7bddea" -dependencies = [ - "serde", - "url 1.7.2", + "url", ] [[package]] @@ -7409,16 +7084,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" -[[package]] -name = "uuid" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" -dependencies = [ - "rand 0.6.5", - "serde", -] - [[package]] name = "uuid" version = "1.8.0" @@ -7426,6 +7091,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom 0.2.14", + "serde", ] [[package]] @@ -7503,12 +7169,12 @@ dependencies = [ "futures-util", "headers", "http 0.2.12", - "hyper", + "hyper 0.14.28", "log", "mime", "mime_guess", "multer", - "percent-encoding 2.3.1", + "percent-encoding", "pin-project", "scoped-tls", "serde", @@ -7655,7 +7321,7 @@ dependencies = [ "rkyv", "self_cell", "shared-buffer", - "smallvec 1.13.2", + "smallvec", "thiserror", "wasmer-types", "wasmer-vm", @@ -7675,7 +7341,7 @@ dependencies = [ "gimli 0.26.2", "more-asserts", "rayon", - "smallvec 1.13.2", + "smallvec", "target-lexicon", "tracing", "wasmer-compiler", @@ -7756,7 +7422,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a" dependencies = [ "indexmap 1.9.3", - "url 2.5.0", + "url", ] [[package]] @@ -7806,16 +7472,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ - "rustls-webpki 0.100.3", -] - -[[package]] -name = "webpki-roots" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" -dependencies = [ - "rustls-pki-types", + "rustls-webpki", ] [[package]] @@ -7852,11 +7509,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 0.3.9", + "windows-sys 0.52.0", ] [[package]] @@ -7865,6 +7522,16 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.5", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -7887,21 +7554,6 @@ dependencies = [ "windows_x86_64_msvc 0.33.0", ] -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-sys" version = "0.45.0" @@ -8146,11 +7798,20 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" -version = "0.50.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if 1.0.0", "windows-sys 0.48.0", @@ -8173,7 +7834,7 @@ checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys 0.4.13", - "rustix 0.38.33", + "rustix 0.38.34", ] [[package]] @@ -8222,27 +7883,26 @@ name = "zeroize" version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" -dependencies = [ - "zeroize_derive", -] [[package]] -name = "zeroize_derive" -version = "1.4.2" +name = "zip" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 2.0.60", + "byteorder", + "crc32fast", + "crossbeam-utils", + "flate2", ] [[package]] name = "zip" -version = "0.6.6" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "2a23468b4a7a4e9e1e62812f8d1dd614f67f148e2b3faa72f4843bf00b573fd7" dependencies = [ + "arbitrary", "byteorder", "crc32fast", "crossbeam-utils", diff --git a/Cargo.toml b/Cargo.toml index c7c5ed26..1df22c0f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,10 +9,10 @@ members = ["zomes/coordinator/*", "zomes/integrity/*"] resolver = "2" [workspace.dependencies] -holochain = { version = "=0.3.0-beta-dev.45", default-features = false, features = [ +holochain = { version = "0.3.0-beta-dev.48", default-features = false, features = [ "test_utils", ] } -hdi = "=0.4.0-beta-dev.34" -hdk = "=0.3.0-beta-dev.38" +hdi = "0.4.0-beta-dev.36" +hdk = "0.3.0-beta-dev.41" serde = "1.0.193" diff --git a/docs/notifications-store.md b/docs/notifications-store.md index d0559dde..90917f54 100644 --- a/docs/notifications-store.md +++ b/docs/notifications-store.md @@ -7,6 +7,6 @@ import { NotificationsStore, NotificationsClient } from "@darksoil-studio/notifi const store = new NotificationsStore(new NotificationsClient(appAgentClient, 'my-role-name')); ``` -> Learn how to setup the `AppAgentClient` object [here](https://www.npmjs.com/package/@holochain/client). +> Learn how to setup the `AppClient` object [here](https://www.npmjs.com/package/@holochain/client). Learn more about the stores and how to integrate them in different frameworks [here](https://holochain-open-dev.github.io/reusable-modules/frontend/using/#stores). diff --git a/docs/setup.md b/docs/setup.md index a83a983e..b3425716 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -16,15 +16,15 @@ This will do the following: Now you only need to integrate the zome's frontend in your web-app. -2. Connect to Holochain with the `AppAgentClient`, and create the `NotificationsStore` with it: +2. Connect to Holochain with the `AppClient`, and create the `NotificationsStore` with it: ```js import { NotificationsStore, NotificationsClient } from "@holochain-open-dev/profiles"; -import { AppAgentWebsocket } from "@holochain/client"; +import { AppWebsocket } from "@holochain/client"; async function setupNotificationsStore() { // TODO: change "MY_APP_NAME" for the roleId that you can find in your "happ.yaml" - const client = await AppAgentWebsocket.connect('') + const client = await AppWebsocket.connect('') // TODO: change "MY_CELL_ROLE" for the roleId that you can find in your "happ.yaml" return new NotificationsStore(new NotificationsClient(client, '')); diff --git a/flake.lock b/flake.lock index 41688607..5d119323 100644 --- a/flake.lock +++ b/flake.lock @@ -209,11 +209,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1713738183, - "narHash": "sha256-qd/MuLm7OfKQKyd4FAMqV4H6zYyOfef5lLzRrmXwKJM=", + "lastModified": 1713979152, + "narHash": "sha256-apdecPuh8SOQnkEET/kW/UcfjCRb8JbV5BKjoH+DcP4=", "owner": "ipetkov", "repo": "crane", - "rev": "f6c6a2fb1b8bd9b65d65ca9342dd0eb180a63f11", + "rev": "a5eca68a2cf11adb32787fc141cddd29ac8eb79c", "type": "github" }, "original": { @@ -270,11 +270,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1712513517, - "narHash": "sha256-VuLm5tTMqfS82NZAsNfsW7U+pTZ1+GcOU7gYR/Fb1Z4=", + "lastModified": 1713979152, + "narHash": "sha256-apdecPuh8SOQnkEET/kW/UcfjCRb8JbV5BKjoH+DcP4=", "owner": "ipetkov", "repo": "crane", - "rev": "9caad1eb0c69a13ee6467035353b71a76c85ea53", + "rev": "a5eca68a2cf11adb32787fc141cddd29ac8eb79c", "type": "github" }, "original": { @@ -920,11 +920,11 @@ "versions": "versions" }, "locked": { - "lastModified": 1713951396, - "narHash": "sha256-NCfrFZWZUM1UwgVbqxBAyN9+8E46Es1GpPXKTRQ2IWA=", + "lastModified": 1714392481, + "narHash": "sha256-6mCmYXO4Owj6v1DYm/5/UuzJSAzMSUwVfebU98OT+0Q=", "owner": "holochain-open-dev", "repo": "infrastructure", - "rev": "a54d6a9d1e74e4d6647bf24337b53f41a55f4398", + "rev": "ee01559c125414095817f666dee6be9c6be79fa5", "type": "github" }, "original": { @@ -947,16 +947,15 @@ "versions": "versions_2" }, "locked": { - "lastModified": 1712679919, - "narHash": "sha256-9xjdx5B981p6w20vZbGTXEyuUrjAarJf+lCdlmUxNjg=", + "lastModified": 1714322642, + "narHash": "sha256-eqF/LyWaAz3/S8cVRM6ZUdntcigANi5xgV24TbqUFzQ=", "owner": "holochain-open-dev", "repo": "infrastructure", - "rev": "27a5e9532e58f6dfa60b3dc0f49c6a7f1cd75250", + "rev": "63eed85c5373f8567272bfad82845f163dc9d895", "type": "github" }, "original": { "owner": "holochain-open-dev", - "ref": "0.300.0-dev", "repo": "infrastructure", "type": "github" } @@ -1001,11 +1000,11 @@ ] }, "locked": { - "lastModified": 1713944178, - "narHash": "sha256-I5EfdfppecLnJgsFKGvGTvqwhVCm1VgspzFFj5pJzpU=", + "lastModified": 1714389570, + "narHash": "sha256-qnbAGp3hu1IlegoHtstS6UObUFR7SZQOnxyeZcCStXs=", "owner": "holochain", "repo": "holochain", - "rev": "a7a7ff34b6477f87114fdb9ad29d50b90de1899c", + "rev": "b2c2de05036d4705cc29f639cabe33accb814039", "type": "github" }, "original": { @@ -1059,11 +1058,11 @@ ] }, "locked": { - "lastModified": 1713944178, - "narHash": "sha256-I5EfdfppecLnJgsFKGvGTvqwhVCm1VgspzFFj5pJzpU=", + "lastModified": 1714139924, + "narHash": "sha256-FiiDtPapNS57zxFvzQC1RFXTgVratKP6/lLE5VrEGhc=", "owner": "holochain", "repo": "holochain", - "rev": "a7a7ff34b6477f87114fdb9ad29d50b90de1899c", + "rev": "0275e13d832a210b856f6374218c484bade651f6", "type": "github" }, "original": { @@ -1075,16 +1074,16 @@ "holochain_11": { "flake": false, "locked": { - "lastModified": 1712710944, - "narHash": "sha256-ye4bu3XgmufPZWwd2RCBkdkyV9dCVAx4CLiL8QKgixg=", + "lastModified": 1713315590, + "narHash": "sha256-hWeNAq+F1rAoYulPFqpQOo0cjeMZVvKXLohnP0MOc9Y=", "owner": "holochain", "repo": "holochain", - "rev": "28dce06eef726cc7320637ab76ffe6f2798b12b8", + "rev": "d8715775f359211b7031f4bdca1cc89db679ed10", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3.0-beta-dev.45", + "ref": "holochain-0.3.0-beta-dev.46", "repo": "holochain", "type": "github" } @@ -1092,16 +1091,16 @@ "holochain_12": { "flake": false, "locked": { - "lastModified": 1712710944, - "narHash": "sha256-ye4bu3XgmufPZWwd2RCBkdkyV9dCVAx4CLiL8QKgixg=", + "lastModified": 1714046698, + "narHash": "sha256-vGOWRJXR64qXRe4MCg13xNyww904KPFvYZIQyRhuPsU=", "owner": "holochain", "repo": "holochain", - "rev": "28dce06eef726cc7320637ab76ffe6f2798b12b8", + "rev": "b48562aa081b1dd177ec43035650262fbdb40d0e", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3.0-beta-dev.45", + "ref": "holochain-0.3.0-beta-dev.48", "repo": "holochain", "type": "github" } @@ -1109,16 +1108,16 @@ "holochain_2": { "flake": false, "locked": { - "lastModified": 1712710944, - "narHash": "sha256-ye4bu3XgmufPZWwd2RCBkdkyV9dCVAx4CLiL8QKgixg=", + "lastModified": 1714046698, + "narHash": "sha256-vGOWRJXR64qXRe4MCg13xNyww904KPFvYZIQyRhuPsU=", "owner": "holochain", "repo": "holochain", - "rev": "28dce06eef726cc7320637ab76ffe6f2798b12b8", + "rev": "b48562aa081b1dd177ec43035650262fbdb40d0e", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3.0-beta-dev.45", + "ref": "holochain-0.3.0-beta-dev.48", "repo": "holochain", "type": "github" } @@ -1158,11 +1157,11 @@ ] }, "locked": { - "lastModified": 1713944178, - "narHash": "sha256-I5EfdfppecLnJgsFKGvGTvqwhVCm1VgspzFFj5pJzpU=", + "lastModified": 1714393559, + "narHash": "sha256-O6o8qkVxdgFNEXqDC2OsVR5BMpIcMRsDi/aCzwKyBO4=", "owner": "holochain", "repo": "holochain", - "rev": "a7a7ff34b6477f87114fdb9ad29d50b90de1899c", + "rev": "4763908947a72d93cfc96efd98eec90138cb9c4e", "type": "github" }, "original": { @@ -1216,11 +1215,11 @@ ] }, "locked": { - "lastModified": 1712658297, - "narHash": "sha256-+uDfTOPKtNUy2i6TjD7eMwRxU8RXo+FOgiY+C0SGwls=", + "lastModified": 1714310834, + "narHash": "sha256-6K2NcwA7aVukqyV/1iIlNjuU8QnXfKAzwy1yfvZmZZY=", "owner": "holochain", "repo": "holochain", - "rev": "e49d2eb781aba3f521c54b45e3585f42575ef367", + "rev": "f837d183f9d498c46b9d4f6b743e2265b5b976ee", "type": "github" }, "original": { @@ -1232,16 +1231,16 @@ "holochain_5": { "flake": false, "locked": { - "lastModified": 1712161287, - "narHash": "sha256-izcly9+JWv15F70SK5DcyZyuMomO4+HmvoQ0CWh3J3M=", + "lastModified": 1714046698, + "narHash": "sha256-vGOWRJXR64qXRe4MCg13xNyww904KPFvYZIQyRhuPsU=", "owner": "holochain", "repo": "holochain", - "rev": "a87b7b6280bd913d7ac88841810d2013864c0959", + "rev": "b48562aa081b1dd177ec43035650262fbdb40d0e", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3.0-beta-dev.44", + "ref": "holochain-0.3.0-beta-dev.48", "repo": "holochain", "type": "github" } @@ -1286,11 +1285,11 @@ ] }, "locked": { - "lastModified": 1712658297, - "narHash": "sha256-+uDfTOPKtNUy2i6TjD7eMwRxU8RXo+FOgiY+C0SGwls=", + "lastModified": 1714389570, + "narHash": "sha256-qnbAGp3hu1IlegoHtstS6UObUFR7SZQOnxyeZcCStXs=", "owner": "holochain", "repo": "holochain", - "rev": "e49d2eb781aba3f521c54b45e3585f42575ef367", + "rev": "b2c2de05036d4705cc29f639cabe33accb814039", "type": "github" }, "original": { @@ -1302,16 +1301,16 @@ "holochain_7": { "flake": false, "locked": { - "lastModified": 1712161287, - "narHash": "sha256-izcly9+JWv15F70SK5DcyZyuMomO4+HmvoQ0CWh3J3M=", + "lastModified": 1714046698, + "narHash": "sha256-vGOWRJXR64qXRe4MCg13xNyww904KPFvYZIQyRhuPsU=", "owner": "holochain", "repo": "holochain", - "rev": "a87b7b6280bd913d7ac88841810d2013864c0959", + "rev": "b48562aa081b1dd177ec43035650262fbdb40d0e", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3.0-beta-dev.44", + "ref": "holochain-0.3.0-beta-dev.48", "repo": "holochain", "type": "github" } @@ -1353,11 +1352,11 @@ "versions": "versions_4" }, "locked": { - "lastModified": 1713768702, - "narHash": "sha256-+wmfZC9gVTy02Q0feWzaOxESYDYnWNpMWfl6k8VParw=", + "lastModified": 1714310834, + "narHash": "sha256-6K2NcwA7aVukqyV/1iIlNjuU8QnXfKAzwy1yfvZmZZY=", "owner": "holochain", "repo": "holochain", - "rev": "d9f2381f5ef5593450f7052335ba6e9e100ae57e", + "rev": "f837d183f9d498c46b9d4f6b743e2265b5b976ee", "type": "github" }, "original": { @@ -1369,16 +1368,16 @@ "holochain_9": { "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" } @@ -1488,11 +1487,11 @@ "launcher": { "flake": false, "locked": { - "lastModified": 1712599324, - "narHash": "sha256-MNUTplS5O+w1G70kZMpFGfBTqOzzTRU6DYarl1bGVFY=", + "lastModified": 1714385528, + "narHash": "sha256-3ZGDC9zx/bqOgYOdImq6yWfZsbxx+B8yzzD8zsztG1U=", "owner": "holochain", "repo": "launcher", - "rev": "597592253c9d2ca64a4e4ac4675ff5081c9dd9b5", + "rev": "afe234041e27c1d8486bfaa4af270a033e9a1c9f", "type": "github" }, "original": { @@ -1505,11 +1504,11 @@ "launcher_2": { "flake": false, "locked": { - "lastModified": 1712599324, - "narHash": "sha256-MNUTplS5O+w1G70kZMpFGfBTqOzzTRU6DYarl1bGVFY=", + "lastModified": 1713340250, + "narHash": "sha256-J8dcl4TiUB93/08oO2Bh0qG6Qi+udbm6JrmPB92NZyU=", "owner": "holochain", "repo": "launcher", - "rev": "597592253c9d2ca64a4e4ac4675ff5081c9dd9b5", + "rev": "f7b7aabd3c3ef16edd391b0b94c4223a2de98d5b", "type": "github" }, "original": { @@ -1522,11 +1521,11 @@ "launcher_3": { "flake": false, "locked": { - "lastModified": 1712599324, - "narHash": "sha256-MNUTplS5O+w1G70kZMpFGfBTqOzzTRU6DYarl1bGVFY=", + "lastModified": 1714385528, + "narHash": "sha256-3ZGDC9zx/bqOgYOdImq6yWfZsbxx+B8yzzD8zsztG1U=", "owner": "holochain", "repo": "launcher", - "rev": "597592253c9d2ca64a4e4ac4675ff5081c9dd9b5", + "rev": "afe234041e27c1d8486bfaa4af270a033e9a1c9f", "type": "github" }, "original": { @@ -1556,11 +1555,11 @@ "launcher_5": { "flake": false, "locked": { - "lastModified": 1712599324, - "narHash": "sha256-MNUTplS5O+w1G70kZMpFGfBTqOzzTRU6DYarl1bGVFY=", + "lastModified": 1713340250, + "narHash": "sha256-J8dcl4TiUB93/08oO2Bh0qG6Qi+udbm6JrmPB92NZyU=", "owner": "holochain", "repo": "launcher", - "rev": "597592253c9d2ca64a4e4ac4675ff5081c9dd9b5", + "rev": "f7b7aabd3c3ef16edd391b0b94c4223a2de98d5b", "type": "github" }, "original": { @@ -1573,11 +1572,11 @@ "launcher_6": { "flake": false, "locked": { - "lastModified": 1713340250, - "narHash": "sha256-J8dcl4TiUB93/08oO2Bh0qG6Qi+udbm6JrmPB92NZyU=", + "lastModified": 1714385528, + "narHash": "sha256-3ZGDC9zx/bqOgYOdImq6yWfZsbxx+B8yzzD8zsztG1U=", "owner": "holochain", "repo": "launcher", - "rev": "f7b7aabd3c3ef16edd391b0b94c4223a2de98d5b", + "rev": "afe234041e27c1d8486bfaa4af270a033e9a1c9f", "type": "github" }, "original": { @@ -1803,11 +1802,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1713714899, - "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -1818,11 +1817,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1713714899, - "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -1833,11 +1832,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1712026416, - "narHash": "sha256-N/3VR/9e1NlN49p7kCiATiEY6Tzdo+CbrAG8kqCQKcI=", + "lastModified": 1713349283, + "narHash": "sha256-2bjFu3+1zPWZPPGqF+7rumTvEwmdBHBhjPva/AMSruQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "080a4a27f206d07724b88da096e27ef63401a504", + "rev": "2e359fb3162c85095409071d131e08252d91a14f", "type": "github" }, "original": { @@ -1849,11 +1848,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "type": "github" }, "original": { @@ -1864,11 +1863,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -1879,11 +1878,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1713537308, - "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "type": "github" }, "original": { @@ -1894,11 +1893,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1713714899, - "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "type": "github" }, "original": { @@ -2015,11 +2014,11 @@ "versions": "versions_3" }, "locked": { - "lastModified": 1712679939, - "narHash": "sha256-76jAHydF9ZFEHzKoFT3/K9g6zPNd4iLxcpAIr+3lPYQ=", + "lastModified": 1714392457, + "narHash": "sha256-j7ALZ3JBlEWTHH+in1/N/31n3lxgvUib3Clb/KjKWCw=", "owner": "holochain-open-dev", "repo": "profiles", - "rev": "69dba6ebf0ee04985e799ccaa39ae2852ab465b7", + "rev": "0ef5ce9c9e1a5550402fd16ccd19f338d3c61c47", "type": "github" }, "original": { @@ -2128,11 +2127,11 @@ ] }, "locked": { - "lastModified": 1713924823, - "narHash": "sha256-kOeyS3GFwgnKvzuBMmFqEAX0xwZ7Nj4/5tXuvpZ0d4U=", + "lastModified": 1714356894, + "narHash": "sha256-W6Mss7AG6bnFT1BqRApHXvLXBrFOu7V0+EUe9iML30s=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8a2edac3ae926a2a6ce60f4595dcc4540fc8cad4", + "rev": "d9b44509b4064f0a3fc9c7c92a603861f52fbedc", "type": "github" }, "original": { @@ -2150,11 +2149,11 @@ ] }, "locked": { - "lastModified": 1713924823, - "narHash": "sha256-kOeyS3GFwgnKvzuBMmFqEAX0xwZ7Nj4/5tXuvpZ0d4U=", + "lastModified": 1714356894, + "narHash": "sha256-W6Mss7AG6bnFT1BqRApHXvLXBrFOu7V0+EUe9iML30s=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8a2edac3ae926a2a6ce60f4595dcc4540fc8cad4", + "rev": "d9b44509b4064f0a3fc9c7c92a603861f52fbedc", "type": "github" }, "original": { @@ -2172,11 +2171,11 @@ ] }, "locked": { - "lastModified": 1713924823, - "narHash": "sha256-kOeyS3GFwgnKvzuBMmFqEAX0xwZ7Nj4/5tXuvpZ0d4U=", + "lastModified": 1714356894, + "narHash": "sha256-W6Mss7AG6bnFT1BqRApHXvLXBrFOu7V0+EUe9iML30s=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8a2edac3ae926a2a6ce60f4595dcc4540fc8cad4", + "rev": "d9b44509b4064f0a3fc9c7c92a603861f52fbedc", "type": "github" }, "original": { @@ -2196,11 +2195,11 @@ ] }, "locked": { - "lastModified": 1712628742, - "narHash": "sha256-FIAlt8mbPUs8jRuh6xpFtYzDsyHzmiLNPcen8HwvD00=", + "lastModified": 1714270637, + "narHash": "sha256-sq/0YEupY9yoRpg9ft8r2sjoRo84MQipionTuk4w1YI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e7354bb9e5f68b2074e272fd5f5ac3f4848860ba", + "rev": "44f8738f4b9805f7c60118c48f85da835839311a", "type": "github" }, "original": { @@ -2219,11 +2218,11 @@ ] }, "locked": { - "lastModified": 1712628742, - "narHash": "sha256-FIAlt8mbPUs8jRuh6xpFtYzDsyHzmiLNPcen8HwvD00=", + "lastModified": 1714270637, + "narHash": "sha256-sq/0YEupY9yoRpg9ft8r2sjoRo84MQipionTuk4w1YI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e7354bb9e5f68b2074e272fd5f5ac3f4848860ba", + "rev": "44f8738f4b9805f7c60118c48f85da835839311a", "type": "github" }, "original": { @@ -2242,11 +2241,11 @@ ] }, "locked": { - "lastModified": 1712628742, - "narHash": "sha256-FIAlt8mbPUs8jRuh6xpFtYzDsyHzmiLNPcen8HwvD00=", + "lastModified": 1714356894, + "narHash": "sha256-W6Mss7AG6bnFT1BqRApHXvLXBrFOu7V0+EUe9iML30s=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e7354bb9e5f68b2074e272fd5f5ac3f4848860ba", + "rev": "d9b44509b4064f0a3fc9c7c92a603861f52fbedc", "type": "github" }, "original": { @@ -2265,11 +2264,11 @@ ] }, "locked": { - "lastModified": 1713752081, - "narHash": "sha256-x0QDETp7paa8qq+LX6191JwSq8abUFXCnKNulQ8L7ps=", + "lastModified": 1714270637, + "narHash": "sha256-sq/0YEupY9yoRpg9ft8r2sjoRo84MQipionTuk4w1YI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "606c0ecb23c676c444a0b026eecf800d5bd5fec2", + "rev": "44f8738f4b9805f7c60118c48f85da835839311a", "type": "github" }, "original": { @@ -2289,11 +2288,11 @@ ] }, "locked": { - "lastModified": 1713924823, - "narHash": "sha256-kOeyS3GFwgnKvzuBMmFqEAX0xwZ7Nj4/5tXuvpZ0d4U=", + "lastModified": 1714097613, + "narHash": "sha256-044xbpBszupqN3nl/CGOCJtTQ4O6Aca81mJpX45i8/I=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8a2edac3ae926a2a6ce60f4595dcc4540fc8cad4", + "rev": "2a42c742ab04b61d9b2f1edf392842cf9f27ebfd", "type": "github" }, "original": { @@ -2305,11 +2304,11 @@ "scaffolding": { "flake": false, "locked": { - "lastModified": 1712841191, - "narHash": "sha256-96bq4Yo50p8Nu1CmsnmEOjGDHM8+ak8x+7mZ7vFtZHo=", + "lastModified": 1713363855, + "narHash": "sha256-Y9KsDAjlZZab07NL7pI1izxLOYT4BWYTx1h9DilW8Fk=", "owner": "holochain", "repo": "scaffolding", - "rev": "63a2c7966c21abff1c0397fbf4fde7329d0092cd", + "rev": "9ac485d52122b92bd2988a8fea1a8e4d9a18c3a1", "type": "github" }, "original": { @@ -2322,11 +2321,11 @@ "scaffolding_2": { "flake": false, "locked": { - "lastModified": 1712589090, - "narHash": "sha256-neMBujjSEsOI0/MT1JpYnjtMq4tKHloCbYd8w6ARAKQ=", + "lastModified": 1713363855, + "narHash": "sha256-Y9KsDAjlZZab07NL7pI1izxLOYT4BWYTx1h9DilW8Fk=", "owner": "holochain", "repo": "scaffolding", - "rev": "55b17239fb7aa80d6afce24479bb2b7ef18c5b6b", + "rev": "9ac485d52122b92bd2988a8fea1a8e4d9a18c3a1", "type": "github" }, "original": { @@ -2339,11 +2338,11 @@ "scaffolding_3": { "flake": false, "locked": { - "lastModified": 1712589090, - "narHash": "sha256-neMBujjSEsOI0/MT1JpYnjtMq4tKHloCbYd8w6ARAKQ=", + "lastModified": 1713363855, + "narHash": "sha256-Y9KsDAjlZZab07NL7pI1izxLOYT4BWYTx1h9DilW8Fk=", "owner": "holochain", "repo": "scaffolding", - "rev": "55b17239fb7aa80d6afce24479bb2b7ef18c5b6b", + "rev": "9ac485d52122b92bd2988a8fea1a8e4d9a18c3a1", "type": "github" }, "original": { @@ -2369,11 +2368,11 @@ "scaffolding": "scaffolding_6" }, "locked": { - "lastModified": 1713949230, - "narHash": "sha256-iEUVxGWilEUuP+hXjM9TpVNX7aXmRgrEfN1TsEFO070=", + "lastModified": 1714392491, + "narHash": "sha256-R1IQAiiGlJmke2ZYATSt0QILkp0A+WvVVpKQMh81Ex0=", "owner": "holochain-open-dev", "repo": "templates", - "rev": "f8c8e7841edc349368b4495f837b9ff55713e333", + "rev": "53f2c7b0459bf4b94938d0d04d289fda3ad552e6", "type": "github" }, "original": { @@ -2411,11 +2410,11 @@ "versions": "versions_5" }, "locked": { - "lastModified": 1713538137, - "narHash": "sha256-e+TDBBv87uBAHBnye9mkwE683C3ODxGvS4r/Mn194mE=", + "lastModified": 1714147981, + "narHash": "sha256-PIWouOg4W2jVFjsHexAqOCdnwy6gQgll7kWRHssiid0=", "owner": "holochain", "repo": "scaffolding", - "rev": "2389b70ee1ceb311d7802dc0b4e1f6ad42c7baf3", + "rev": "6582621e73b5127ed863b13f5648d9a333542623", "type": "github" }, "original": { @@ -2427,11 +2426,11 @@ "scaffolding_7": { "flake": false, "locked": { - "lastModified": 1712841191, - "narHash": "sha256-96bq4Yo50p8Nu1CmsnmEOjGDHM8+ak8x+7mZ7vFtZHo=", + "lastModified": 1713363855, + "narHash": "sha256-Y9KsDAjlZZab07NL7pI1izxLOYT4BWYTx1h9DilW8Fk=", "owner": "holochain", "repo": "scaffolding", - "rev": "63a2c7966c21abff1c0397fbf4fde7329d0092cd", + "rev": "9ac485d52122b92bd2988a8fea1a8e4d9a18c3a1", "type": "github" }, "original": { @@ -2587,17 +2586,16 @@ }, "locked": { "dir": "versions/weekly", - "lastModified": 1713315590, - "narHash": "sha256-hWeNAq+F1rAoYulPFqpQOo0cjeMZVvKXLohnP0MOc9Y=", + "lastModified": 1714389570, + "narHash": "sha256-qnbAGp3hu1IlegoHtstS6UObUFR7SZQOnxyeZcCStXs=", "owner": "holochain", "repo": "holochain", - "rev": "d8715775f359211b7031f4bdca1cc89db679ed10", + "rev": "b2c2de05036d4705cc29f639cabe33accb814039", "type": "github" }, "original": { "dir": "versions/weekly", "owner": "holochain", - "ref": "holochain-0.3.0-beta-dev.46", "repo": "holochain", "type": "github" } @@ -2611,11 +2609,11 @@ }, "locked": { "dir": "versions/weekly", - "lastModified": 1712658297, - "narHash": "sha256-+uDfTOPKtNUy2i6TjD7eMwRxU8RXo+FOgiY+C0SGwls=", + "lastModified": 1714310834, + "narHash": "sha256-6K2NcwA7aVukqyV/1iIlNjuU8QnXfKAzwy1yfvZmZZY=", "owner": "holochain", "repo": "holochain", - "rev": "e49d2eb781aba3f521c54b45e3585f42575ef367", + "rev": "f837d183f9d498c46b9d4f6b743e2265b5b976ee", "type": "github" }, "original": { @@ -2634,11 +2632,11 @@ }, "locked": { "dir": "versions/weekly", - "lastModified": 1712658297, - "narHash": "sha256-+uDfTOPKtNUy2i6TjD7eMwRxU8RXo+FOgiY+C0SGwls=", + "lastModified": 1714389570, + "narHash": "sha256-qnbAGp3hu1IlegoHtstS6UObUFR7SZQOnxyeZcCStXs=", "owner": "holochain", "repo": "holochain", - "rev": "e49d2eb781aba3f521c54b45e3585f42575ef367", + "rev": "b2c2de05036d4705cc29f639cabe33accb814039", "type": "github" }, "original": { @@ -2657,11 +2655,11 @@ }, "locked": { "dir": "versions/weekly", - "lastModified": 1714054885, - "narHash": "sha256-1gjNsApVxdWQBMkh8avegFb3ko2g7JWDvS0MX6f8Hwo=", + "lastModified": 1714393559, + "narHash": "sha256-O6o8qkVxdgFNEXqDC2OsVR5BMpIcMRsDi/aCzwKyBO4=", "owner": "holochain", "repo": "holochain", - "rev": "695658cafdf8c02255327fb3ee0784b7da7e3437", + "rev": "4763908947a72d93cfc96efd98eec90138cb9c4e", "type": "github" }, "original": { @@ -2680,11 +2678,11 @@ }, "locked": { "dir": "versions/weekly", - "lastModified": 1713343014, - "narHash": "sha256-cEsqca9ltE52CfusYXM51D5uXI9zZ8nR/ZuNa+q31m4=", + "lastModified": 1714139924, + "narHash": "sha256-FiiDtPapNS57zxFvzQC1RFXTgVratKP6/lLE5VrEGhc=", "owner": "holochain", "repo": "holochain", - "rev": "16820555debee252ac2ce6cb75276e4cadf8072c", + "rev": "0275e13d832a210b856f6374218c484bade651f6", "type": "github" }, "original": { @@ -2703,18 +2701,17 @@ }, "locked": { "dir": "versions/weekly", - "lastModified": 1713531171, - "narHash": "sha256-b8zxn8RWV7P2n/LH2gWZvLf44cXQmPbd2NygsYMvDIk=", + "lastModified": 1714393559, + "narHash": "sha256-O6o8qkVxdgFNEXqDC2OsVR5BMpIcMRsDi/aCzwKyBO4=", "owner": "holochain", "repo": "holochain", - "rev": "73e231beb85507ea0858eb914ac00f9538c23b15", + "rev": "4763908947a72d93cfc96efd98eec90138cb9c4e", "type": "github" }, "original": { "dir": "versions/weekly", "owner": "holochain", "repo": "holochain", - "rev": "73e231beb85507ea0858eb914ac00f9538c23b15", "type": "github" } } diff --git a/flake.nix b/flake.nix index c351824d..91638ee0 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,7 @@ description = "Template for Holochain app development"; inputs = { - versions.url = - "github:holochain/holochain/73e231beb85507ea0858eb914ac00f9538c23b15?dir=versions/weekly"; + versions.url = "github:holochain/holochain?dir=versions/weekly"; holochain.url = "github:holochain/holochain"; holochain.inputs.versions.follows = "versions"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dc692649..d154717f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -92,9 +92,6 @@ importers: '@msgpack/msgpack': specifier: ^2.7.0 version: 2.8.0 - async-signals: - specifier: 0.1.6 - version: 0.1.6 typescript: specifier: ^5.4.5 version: 5.4.5 @@ -105,20 +102,20 @@ importers: ui: dependencies: '@holochain-open-dev/elements': - specifier: ^0.300.0-dev.0 - version: 0.300.0-dev.0(@types/react@18.2.79) + specifier: ^0.300.0-dev.1 + version: 0.300.0-dev.1(@types/react@18.2.79) '@holochain-open-dev/profiles': - specifier: github:holochain-open-dev/profiles#69dba6ebf0ee04985e799ccaa39ae2852ab465b7&path:ui - version: github.com/holochain-open-dev/profiles/69dba6ebf0ee04985e799ccaa39ae2852ab465b7#path:ui(@types/react@18.2.79) + specifier: github:holochain-open-dev/profiles#0ef5ce9c9e1a5550402fd16ccd19f338d3c61c47&path:ui + version: github.com/holochain-open-dev/profiles/0ef5ce9c9e1a5550402fd16ccd19f338d3c61c47#path:ui(@types/react@18.2.79) '@holochain-open-dev/signals': - specifier: ^0.300.0-dev.3 - version: 0.300.0-dev.3(@types/react@18.2.79) + specifier: ^0.300.0-dev.5 + version: 0.300.0-dev.5(@types/react@18.2.79) '@holochain-open-dev/utils': - specifier: ^0.300.0-dev.0 - version: 0.300.0-dev.1 + specifier: ^0.300.0-dev.2 + version: 0.300.0-dev.2 '@holochain/client': - specifier: ^0.17.0-dev.9 - version: 0.17.0-dev.9 + specifier: ^0.17.0-dev.12 + version: 0.17.0-dev.12 '@lit/context': specifier: ^1.0.0 version: 1.1.1 @@ -137,9 +134,6 @@ importers: lit: specifier: ^3.0.0 version: 3.1.3 - lodash-es: - specifier: ^4.17.21 - version: 4.17.21 devDependencies: '@custom-elements-manifest/analyzer': specifier: ^0.9.4 @@ -667,9 +661,15 @@ packages: /@holochain-open-dev/elements@0.300.0-dev.0: resolution: {integrity: sha512-oyfnkg4hksQazQN4AVShgL3Hzg2GJEmQeE3z0G8cN5y4+0n3/eCfQsrtvZO4l+Xo01BH9llVRk6LC6EVsMP2Uw==} + /@holochain-open-dev/elements@0.300.0-dev.1: + resolution: {integrity: sha512-wjwUp2j9dZAm39K5pl+2SA5PzwY7s+8eouoBjzOoWuAQhSvzdyBw8r7mdUlnQlc+U6R+nwt2mz4Hl48XEa3p0g==} + /@holochain-open-dev/signals@0.300.0-dev.3: resolution: {integrity: sha512-Ju5UJkDUZhlm1VpxoBOPXk+/qhoA/WM8xHaIkAT7mWaWsKsAHUZghbI/ORV3DcUdQjFYT6KoU6G2VRmSj47HWw==} + /@holochain-open-dev/signals@0.300.0-dev.5: + resolution: {integrity: sha512-aglodUte9ov5oq6sIGZuAcF/TTNCw5vn+gOBxajd98H+MEAoCpRtH2bjO0ayIScoer0OvtaP//cEXuPcPkOksw==} + /@holochain-open-dev/stores@0.300.0-dev.0: resolution: {integrity: sha512-s6knLTAfVHUYR7Y8HYiLL9JJtr86b2kBQDQVfyDNLcSdf7kwJUjNbza8ZozQ1ON9IDvVC7+LMiQ87H3oJihU0g==} @@ -679,10 +679,17 @@ packages: /@holochain-open-dev/utils@0.300.0-dev.1: resolution: {integrity: sha512-AI8xaf5YEflHw3rRBjzMkMwSa3ErfNFe63ruWWWOw65eRGrBTF9d9mErT0qfmkpwICqvj02ANlCkSjZlP2Qeqw==} + /@holochain-open-dev/utils@0.300.0-dev.2: + resolution: {integrity: sha512-V4kwnfnVrxg35tiRebijDl8SCTJ7f+icIK7Apbwy5DwOOfdNH9/MinvkHP9ef26i6QooBuxlvwaLh0PvKgwegQ==} + /@holochain-playground/cli@0.1.1: resolution: {integrity: sha512-JbapAe+uBaec52rTePjdlP0mq3zQhJG/hrdbCd+eecZLA3cXWEGgISR5YwLtx6udN+0ghCDH4U6KILjPiwWZMg==} hasBin: true + /@holochain/client@0.17.0-dev.12: + resolution: {integrity: sha512-aEOkD4wtFeHAv5AiEkBfsiGeAujCyQf1yfvmtcdERnv73zgZhxCiZ0ZrEi46kdJhRHMXX/1Qkqo6VY8afrepfQ==} + engines: {node: '>=18.0.0 || >=20.0.0'} + /@holochain/client@0.17.0-dev.9: resolution: {integrity: sha512-/s4TiMAliB5XUEgs/lWVfx1xAXsjtkKDSd7cveWuHKUf2BiZ+eqk1Mt1UMXrkILAwpSpdFLknDHM7rNhXlk2nQ==} engines: {node: '>=18.0.0 || >=20.0.0'} @@ -2967,6 +2974,11 @@ packages: resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} engines: {node: '>=12.20'} + github.com/holochain-open-dev/profiles/0ef5ce9c9e1a5550402fd16ccd19f338d3c61c47#path:ui: + resolution: {path: ui, tarball: https://codeload.github.com/holochain-open-dev/profiles/tar.gz/0ef5ce9c9e1a5550402fd16ccd19f338d3c61c47} + name: '@holochain-open-dev/profiles' + version: 0.300.0-dev.0 + github.com/holochain-open-dev/profiles/69dba6ebf0ee04985e799ccaa39ae2852ab465b7#path:ui: resolution: {path: ui, tarball: https://codeload.github.com/holochain-open-dev/profiles/tar.gz/69dba6ebf0ee04985e799ccaa39ae2852ab465b7} name: '@holochain-open-dev/profiles' @@ -2980,6 +2992,7 @@ snapshots: /@alenaksu/json-viewer@2.0.1: dependencies: lit: 2.8.0 + dev: true /@algolia/autocomplete-core@1.9.3(@algolia/client-search@4.23.3)(algoliasearch@4.23.3)(search-insights@2.13.0): dependencies: @@ -3511,7 +3524,7 @@ snapshots: dependencies: '@holo-host/identicon': 0.1.0 '@holochain-open-dev/stores': 0.300.0-dev.0(@types/react@18.2.79) - '@holochain/client': 0.17.0-dev.9 + '@holochain/client': 0.17.0-dev.12 '@lit/localize': 0.12.1 '@mdi/js': 7.4.47 '@shoelace-style/shoelace': 2.15.0(@types/react@18.2.79) @@ -3524,6 +3537,25 @@ snapshots: - '@types/react' - bufferutil - utf-8-validate + dev: true + + /@holochain-open-dev/elements@0.300.0-dev.1(@types/react@18.2.79): + dependencies: + '@holo-host/identicon': 0.1.0 + '@holochain/client': 0.17.0-dev.12 + '@lit/localize': 0.12.1 + '@mdi/js': 7.4.47 + '@shoelace-style/shoelace': 2.15.0(@types/react@18.2.79) + lit: 3.1.3 + prosemirror-commands: 1.5.2 + prosemirror-keymap: 1.2.2 + prosemirror-state: 1.4.3 + prosemirror-view: 1.33.5 + transitivePeerDependencies: + - '@types/react' + - bufferutil + - utf-8-validate + dev: false /@holochain-open-dev/signals@0.300.0-dev.3(@types/react@18.2.79): dependencies: @@ -3539,11 +3571,25 @@ snapshots: - utf-8-validate dev: false + /@holochain-open-dev/signals@0.300.0-dev.5(@types/react@18.2.79): + dependencies: + '@holochain-open-dev/utils': 0.300.0-dev.2 + '@holochain/client': 0.17.0-dev.12 + '@shoelace-style/shoelace': 2.15.0(@types/react@18.2.79) + async-signals: 0.1.6 + lit-signal-watcher: 0.1.0 + signal-polyfill: 0.1.0 + transitivePeerDependencies: + - '@types/react' + - bufferutil + - utf-8-validate + dev: false + /@holochain-open-dev/stores@0.300.0-dev.0(@types/react@18.2.79): dependencies: '@alenaksu/json-viewer': 2.0.1 '@holochain-open-dev/utils': 0.300.0-dev.0 - '@holochain/client': 0.17.0-dev.9 + '@holochain/client': 0.17.0-dev.12 '@scoped-elements/cytoscape': 0.2.0 '@shoelace-style/shoelace': 2.15.0(@types/react@18.2.79) lit: 3.1.3 @@ -3553,10 +3599,11 @@ snapshots: - '@types/react' - bufferutil - utf-8-validate + dev: true /@holochain-open-dev/utils@0.300.0-dev.0: dependencies: - '@holochain/client': 0.17.0-dev.9 + '@holochain/client': 0.17.0-dev.12 '@msgpack/msgpack': 2.8.0 blakejs: 1.2.1 emittery: 1.0.3 @@ -3565,6 +3612,7 @@ snapshots: transitivePeerDependencies: - bufferutil - utf-8-validate + dev: true /@holochain-open-dev/utils@0.300.0-dev.1: dependencies: @@ -3579,9 +3627,37 @@ snapshots: - utf-8-validate dev: false + /@holochain-open-dev/utils@0.300.0-dev.2: + dependencies: + '@holochain/client': 0.17.0-dev.12 + '@msgpack/msgpack': 2.8.0 + blakejs: 1.2.1 + emittery: 1.0.3 + lodash-es: 4.17.21 + sort-keys: 5.0.0 + transitivePeerDependencies: + - bufferutil + - utf-8-validate + dev: false + /@holochain-playground/cli@0.1.1: dev: true + /@holochain/client@0.17.0-dev.12: + dependencies: + '@bitgo/blake2b': 3.2.4 + '@holochain/serialization': 0.1.0-beta-rc.3 + '@msgpack/msgpack': 2.8.0 + emittery: 1.0.3 + isomorphic-ws: 5.0.0(ws@8.16.0) + js-base64: 3.7.7 + libsodium-wrappers: 0.7.13 + lodash-es: 4.17.21 + ws: 8.16.0 + transitivePeerDependencies: + - bufferutil + - utf-8-validate + /@holochain/client@0.17.0-dev.9: dependencies: '@bitgo/blake2b': 3.2.4 @@ -3695,6 +3771,7 @@ snapshots: /@lit/reactive-element@1.6.3: dependencies: '@lit-labs/ssr-dom-shim': 1.2.0 + dev: true /@lit/reactive-element@2.0.4: dependencies: @@ -3731,12 +3808,14 @@ snapshots: fastq: 1.17.1 dev: true - /@open-wc/dedupe-mixin@1.4.0: {} + /@open-wc/dedupe-mixin@1.4.0: + dev: true /@open-wc/scoped-elements@2.2.4: dependencies: '@lit/reactive-element': 2.0.4 '@open-wc/dedupe-mixin': 1.4.0 + dev: true /@parse5/tools@0.3.0: dependencies: @@ -3802,6 +3881,7 @@ snapshots: cytoscape-klay: 3.1.4(cytoscape@3.29.0) lit: 2.8.0 lodash-es: 4.17.21 + dev: true /@shikijs/core@1.3.0: dev: true @@ -3846,7 +3926,8 @@ snapshots: - supports-color dev: true - /@types/cytoscape@3.21.0: {} + /@types/cytoscape@3.21.0: + dev: true /@types/d3-scale-chromatic@3.0.3: dev: true @@ -4458,6 +4539,7 @@ snapshots: /cose-base@1.0.3: dependencies: layout-base: 1.0.2 + dev: true /cose-base@2.2.0: dependencies: @@ -4483,11 +4565,13 @@ snapshots: dependencies: cytoscape: 3.29.0 webcola: 3.4.0 + dev: true /cytoscape-cose-bilkent@4.1.0(cytoscape@3.29.0): dependencies: cose-base: 1.0.3 cytoscape: 3.29.0 + dev: true /cytoscape-cose-bilkent@4.1.0(cytoscape@3.29.1): dependencies: @@ -4499,6 +4583,7 @@ snapshots: dependencies: cytoscape: 3.29.0 dagre: 0.8.5 + dev: true /cytoscape-fcose@2.2.0(cytoscape@3.29.0): dependencies: @@ -4511,8 +4596,10 @@ snapshots: dependencies: cytoscape: 3.29.0 klayjs: 0.4.1 + dev: true - /cytoscape@3.29.0: {} + /cytoscape@3.29.0: + dev: true /cytoscape@3.29.1: dev: true @@ -4557,7 +4644,8 @@ snapshots: delaunator: 5.0.1 dev: true - /d3-dispatch@1.0.6: {} + /d3-dispatch@1.0.6: + dev: true /d3-dispatch@3.0.1: dev: true @@ -4566,6 +4654,7 @@ snapshots: dependencies: d3-dispatch: 1.0.6 d3-selection: 1.4.2 + dev: true /d3-drag@3.0.0: dependencies: @@ -4611,7 +4700,8 @@ snapshots: d3-color: 3.1.0 dev: true - /d3-path@1.0.9: {} + /d3-path@1.0.9: + dev: true /d3-path@3.1.0: dev: true @@ -4646,7 +4736,8 @@ snapshots: d3-time-format: 4.1.0 dev: true - /d3-selection@1.4.2: {} + /d3-selection@1.4.2: + dev: true /d3-selection@3.0.0: dev: true @@ -4654,6 +4745,7 @@ snapshots: /d3-shape@1.3.7: dependencies: d3-path: 1.0.9 + dev: true /d3-shape@3.2.0: dependencies: @@ -4670,7 +4762,8 @@ snapshots: d3-array: 3.2.4 dev: true - /d3-timer@1.0.10: {} + /d3-timer@1.0.10: + dev: true /d3-timer@3.0.1: dev: true @@ -4738,6 +4831,7 @@ snapshots: dependencies: graphlib: 2.1.8 lodash: 4.17.21 + dev: true /date-fns@2.30.0: dependencies: @@ -5175,6 +5269,7 @@ snapshots: /graphlib@2.1.8: dependencies: lodash: 4.17.21 + dev: true /has-flag@3.0.0: dev: true @@ -5319,7 +5414,8 @@ snapshots: /khroma@2.1.0: dev: true - /klayjs@0.4.1: {} + /klayjs@0.4.1: + dev: true /kleur@4.1.5: dev: true @@ -5327,7 +5423,8 @@ snapshots: /kuler@2.0.0: dev: false - /layout-base@1.0.2: {} + /layout-base@1.0.2: + dev: true /layout-base@2.0.1: dev: true @@ -5350,6 +5447,7 @@ snapshots: '@lit-labs/ssr-dom-shim': 1.2.0 '@lit/reactive-element': 1.6.3 lit-html: 2.8.0 + dev: true /lit-element@4.0.5: dependencies: @@ -5360,6 +5458,7 @@ snapshots: /lit-html@2.8.0: dependencies: '@types/trusted-types': 2.0.7 + dev: true /lit-html@3.1.3: dependencies: @@ -5376,12 +5475,14 @@ snapshots: lit: 3.1.3 lodash-es: 4.17.21 svelte: 3.59.2 + dev: true /lit@2.8.0: dependencies: '@lit/reactive-element': 1.6.3 lit-element: 3.3.3 lit-html: 2.8.0 + dev: true /lit@3.1.3: dependencies: @@ -6132,7 +6233,8 @@ snapshots: has-flag: 4.0.0 dev: true - /svelte@3.59.2: {} + /svelte@3.59.2: + dev: true /tabbable@6.2.0: dev: true @@ -6453,6 +6555,7 @@ snapshots: d3-drag: 1.2.5 d3-shape: 1.3.7 d3-timer: 1.0.10 + dev: true /which@2.0.2: dependencies: @@ -6524,6 +6627,25 @@ snapshots: /yocto-queue@1.0.0: dev: false + github.com/holochain-open-dev/profiles/0ef5ce9c9e1a5550402fd16ccd19f338d3c61c47#path:ui(@types/react@18.2.79): + id: github.com/holochain-open-dev/profiles/0ef5ce9c9e1a5550402fd16ccd19f338d3c61c47#path:ui + dependencies: + '@holochain-open-dev/elements': 0.300.0-dev.1(@types/react@18.2.79) + '@holochain-open-dev/signals': 0.300.0-dev.5(@types/react@18.2.79) + '@holochain-open-dev/utils': 0.300.0-dev.2 + '@holochain/client': 0.17.0-dev.12 + '@lit/context': 1.1.1 + '@lit/localize': 0.12.1 + '@mdi/js': 7.4.47 + '@msgpack/msgpack': 2.8.0 + '@shoelace-style/shoelace': 2.15.0(@types/react@18.2.79) + lit: 3.1.3 + transitivePeerDependencies: + - '@types/react' + - bufferutil + - utf-8-validate + dev: false + github.com/holochain-open-dev/profiles/69dba6ebf0ee04985e799ccaa39ae2852ab465b7#path:ui(@types/react@18.2.79): id: github.com/holochain-open-dev/profiles/69dba6ebf0ee04985e799ccaa39ae2852ab465b7#path:ui dependencies: @@ -6541,3 +6663,4 @@ snapshots: - '@types/react' - bufferutil - utf-8-validate + dev: true diff --git a/tests/package.json b/tests/package.json index 12e3148e..0b3149ed 100644 --- a/tests/package.json +++ b/tests/package.json @@ -1,17 +1,17 @@ { - "name": "tests", - "private": true, - "scripts": { - "test": "vitest run" - }, - "dependencies": { - "@msgpack/msgpack": "^2.7.0", - "@holochain/client": "^0.17.0-dev.9", - "@holochain/tryorama": "^v0.16.0-dev.3", - "@holochain-open-dev/signals": "^0.300.0-dev.3", - "@holochain-open-dev/utils": "^0.300.0-dev.0", - "typescript": "^5.4.5", - "vitest": "^1.4.0" - }, - "type": "module" -} + "name": "tests", + "private": true, + "scripts": { + "test": "vitest run" + }, + "dependencies": { + "@msgpack/msgpack": "^2.7.0", + "@holochain/client": "^0.17.0-dev.9", + "@holochain/tryorama": "^v0.16.0-dev.3", + "@holochain-open-dev/signals": "^0.300.0-dev.3", + "@holochain-open-dev/utils": "^0.300.0-dev.0", + "typescript": "^5.4.5", + "vitest": "^1.4.0" + }, + "type": "module" +} \ No newline at end of file diff --git a/tests/src/setup.ts b/tests/src/setup.ts index 894c3e19..dc1199b4 100644 --- a/tests/src/setup.ts +++ b/tests/src/setup.ts @@ -2,8 +2,6 @@ import { EntryRecord } from '@holochain-open-dev/utils'; import { ActionHash, AgentPubKey, - AppAgentCallZomeRequest, - AppAgentWebsocket, AppBundleSource, EntryHash, NewEntryAction, diff --git a/ui/custom-elements.json b/ui/custom-elements.json index ddc7d62e..66aa71e2 100644 --- a/ui/custom-elements.json +++ b/ui/custom-elements.json @@ -456,7 +456,8 @@ }, { "kind": "field", - "name": "readNotifications$" + "name": "readNotifications$", + "default": "new AsyncComputed(() => {\n\t\tconst readNotificationsLinks = this.readNotificationsLinks$.get();\n\t\tconst undismissedNotifications = this.undismissedNotificationsLinks$.get();\n\t\tif (readNotificationsLinks.status !== 'completed')\n\t\t\treturn readNotificationsLinks;\n\t\tif (undismissedNotifications.status !== 'completed')\n\t\t\treturn undismissedNotifications;\n\n\t\t/** Aggregate the read notification hashes and filter them by whether they've been dismissed */\n\n\t\tconst allReadNotificationsHashes = uniquify(\n\t\t\tArray.from([] as ActionHash[]).concat(\n\t\t\t\t...readNotificationsLinks.value.map(\n\t\t\t\t\tlink => decode(link.tag) as ActionHash[],\n\t\t\t\t),\n\t\t\t),\n\t\t);\n\n\t\tconst undismissedNotificationsHashes = undismissedNotifications.value.map(\n\t\t\tl => encodeHashToBase64(l.target),\n\t\t);\n\n\t\tconst notificationsHashes = allReadNotificationsHashes.filter(hash =>\n\t\t\tundismissedNotificationsHashes.includes(encodeHashToBase64(hash)),\n\t\t);\n\t\tconst value = slice(this.notifications, notificationsHashes);\n\t\treturn {\n\t\t\tstatus: 'completed',\n\t\t\tvalue,\n\t\t};\n\t})" }, { "kind": "field", diff --git a/ui/demo/index.html b/ui/demo/index.html index 39d7592b..b5d591a6 100644 --- a/ui/demo/index.html +++ b/ui/demo/index.html @@ -39,9 +39,10 @@ profilesStoreContext, } from '@holochain-open-dev/profiles'; import '@holochain-open-dev/profiles/dist/elements/profile-prompt.js'; - import { AppAgentWebsocket } from '@holochain/client'; + import { SignalWatcher, joinAsync } from '@holochain-open-dev/signals'; + import { AppWebsocket } from '@holochain/client'; import { ContextProvider } from '@lit/context'; - import { encode } from '@msgpack/msgpack'; + import { decode, encode } from '@msgpack/msgpack'; import '@shoelace-style/shoelace/dist/components/button/button.js'; import '@shoelace-style/shoelace/dist/components/spinner/spinner.js'; import '@shoelace-style/shoelace/dist/themes/light.css'; @@ -51,7 +52,7 @@ import '../src/elements/notifications-context.ts'; import { NotificationsClient, NotificationsStore } from '../src/index.ts'; - export class DemoApp extends LitElement { + export class DemoApp extends SignalWatcher(LitElement) { constructor() { super(); this._loading = true; @@ -59,7 +60,7 @@ } async firstUpdated() { - this._client = await AppAgentWebsocket.connect('notifications'); + this._client = await AppWebsocket.connect(); await this.initStores(this._client); @@ -75,39 +76,71 @@ this._notificationsStore = new NotificationsStore( new NotificationsClient(appAgentClient, 'notifications_test'), + { + type1: n => { + const i = decode(n.entry.content); + + return { + title: i.title, + body: i.body, + onClick: () => console.log('clicked', n), + }; + }, + }, ); } renderContent() { + const result = joinAsync([ + this._notificationsStore.unreadNotifications$, + this._notificationsStore.readNotifications$, + ]).get(); + const undismissedNotifications = [ + ...Array.from(result.value ? result.value[0].keys() : []), + ...Array.from(result.value ? result.value[1].keys() : []), + ]; return html` - - this._notificationsStore.client.createNotification({ - notification_type: '', - notification_group: undefined, - persistent: true, - recipients: [ - this._notificationsStore.client.client.myPubKey, - ], - content: encode({ title: 'hey!', body: "what's up?" }), - })} - >Create persistent notification - - this._notificationsStore.client.createNotification({ - notification_type: '', - notification_group: undefined, - persistent: false, - recipients: [ - this._notificationsStore.client.client.myPubKey, - ], - content: encode({ title: 'hey!', body: "what's up?" }), - })} - >Create non-persistent notification +
+ { + console.log(e); + this._notificationsStore.client.createNotification({ + notification_type: 'type1', + notification_group: undefined, + persistent: true, + recipients: [ + this._notificationsStore.client.client.myPubKey, + ], + content: encode({ title: 'hey!', body: "what's up?" }), + }); + }} + >Create persistent notification + { + console.log(e); + this._notificationsStore.client.createNotification({ + notification_type: 'type1', + notification_group: undefined, + persistent: false, + recipients: [ + this._notificationsStore.client.client.myPubKey, + ], + content: encode({ title: 'hey!', body: "what's up2?" }), + }); + }} + >Create non-persistent notification + + this._notificationsStore.client.dismissNotifications( + undismissedNotifications, + )} + >Clear all notifications +
`; } diff --git a/ui/package.json b/ui/package.json index f52e59f4..119592b5 100644 --- a/ui/package.json +++ b/ui/package.json @@ -29,18 +29,17 @@ "./locales/*": "./locales/*" }, "dependencies": { - "@holochain-open-dev/elements": "^0.300.0-dev.0", - "@holochain-open-dev/profiles": "github:holochain-open-dev/profiles#69dba6ebf0ee04985e799ccaa39ae2852ab465b7&path:ui", - "@holochain-open-dev/signals": "^0.300.0-dev.3", - "@holochain-open-dev/utils": "^0.300.0-dev.0", - "@holochain/client": "^0.17.0-dev.9", + "@holochain-open-dev/elements": "^0.300.0-dev.1", + "@holochain-open-dev/profiles": "github:holochain-open-dev/profiles#0ef5ce9c9e1a5550402fd16ccd19f338d3c61c47&path:ui", + "@holochain-open-dev/signals": "^0.300.0-dev.5", + "@holochain-open-dev/utils": "^0.300.0-dev.2", + "@holochain/client": "^0.17.0-dev.12", "@lit/context": "^1.0.0", "@lit/localize": "^0.12.0", "@mdi/js": "^7.2.0", "@msgpack/msgpack": "^2.8.0", "@shoelace-style/shoelace": "^2.11.0", - "lit": "^3.0.0", - "lodash-es": "^4.17.21" + "lit": "^3.0.0" }, "devDependencies": { "@custom-elements-manifest/analyzer": "^0.9.4", diff --git a/ui/src/elements/my-notifications.ts b/ui/src/elements/my-notifications.ts index 84b02848..ab7dafcd 100644 --- a/ui/src/elements/my-notifications.ts +++ b/ui/src/elements/my-notifications.ts @@ -1,26 +1,38 @@ -import { - renderAsyncStatus, - sharedStyles, - wrapPathInSvg, -} from '@holochain-open-dev/elements'; +import { sharedStyles, wrapPathInSvg } from '@holochain-open-dev/elements'; import '@holochain-open-dev/elements/dist/elements/display-error.js'; import '@holochain-open-dev/profiles/dist/elements/agent-avatar.js'; -import { SignalWatcher } from '@holochain-open-dev/signals'; -import { EntryRecord, slice } from '@holochain-open-dev/utils'; -import { ActionHash, AgentPubKey, EntryHash, Record } from '@holochain/client'; +import { + AsyncSignal, + SignalWatcher, + joinAsync, + joinAsyncMap, +} from '@holochain-open-dev/signals'; +import { EntryRecord, mapValues } from '@holochain-open-dev/utils'; +import { ActionHash, Delete, SignedActionHashed } from '@holochain/client'; import { consume } from '@lit/context'; import { localized, msg } from '@lit/localize'; -import { mdiBell, mdiInformationOutline } from '@mdi/js'; +import { + mdiBell, + mdiInformationOutline, + mdiNotificationClearAll, +} from '@mdi/js'; import '@shoelace-style/shoelace/dist/components/badge/badge.js'; +import '@shoelace-style/shoelace/dist/components/button/button.js'; +import '@shoelace-style/shoelace/dist/components/card/card.js'; +import '@shoelace-style/shoelace/dist/components/divider/divider.js'; +import '@shoelace-style/shoelace/dist/components/dropdown/dropdown.js'; import '@shoelace-style/shoelace/dist/components/icon-button/icon-button.js'; import '@shoelace-style/shoelace/dist/components/icon/icon.js'; +import '@shoelace-style/shoelace/dist/components/relative-time/relative-time.js'; import '@shoelace-style/shoelace/dist/components/skeleton/skeleton.js'; import '@shoelace-style/shoelace/dist/components/spinner/spinner.js'; import { LitElement, html } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; +import { styleMap } from 'lit/directives/style-map.js'; import { notificationsStoreContext } from '../context.js'; import { NotificationsStore } from '../notifications-store.js'; +import { Notification } from '../types.js'; /** * @element my-notifications @@ -34,67 +46,245 @@ export class MyNotifications extends SignalWatcher(LitElement) { @consume({ context: notificationsStoreContext, subscribe: true }) notificationsStore!: NotificationsStore; - renderList(hashes: Array) { - if (hashes.length === 0) - return html`
- - ${msg('No notifications found for this recipient')} -
`; - - return html` -
- ${hashes.map( - hash => - html``, - )} + renderNotification( + read: boolean, + notification: EntryRecord, + last: boolean, + ) { + const info = + this.notificationsStore.notificationsTypes[ + notification.entry.notification_type + ](notification); + return html`
info.onClick()} + > +
+ ${info.title} +
+ +
+ ${info.body}
- `; - } - // firstUpdated() { - // effect(() => { - // const unreadNotifications = - // this.notificationsStore.unreadNotifications.get(); - // this.requestUpdate(); - // }); - // } + ${!last + ? html`` + : html``} `; + } - renderBadge() { - const unreadNotifications = - this.notificationsStore.unreadNotifications$.get(); - const readNotifications = this.notificationsStore.readNotifications$.get(); + renderNotifications( + unreadNotifications: ReadonlyMap< + ActionHash, + { + entry$: AsyncSignal>; + deletes$: AsyncSignal[]>; + } + >, + readNotifications: ReadonlyMap< + ActionHash, + { + entry$: AsyncSignal>; + deletes$: AsyncSignal[]>; + } + >, + ) { + const result = joinAsync([ + joinAsyncMap(mapValues(unreadNotifications, n => n.entry$)), + joinAsyncMap(mapValues(readNotifications, n => n.entry$)), + ]).get(); - switch (unreadNotifications.status) { + switch (result.status) { case 'pending': return html`
- + + +
`; case 'error': return html``; case 'completed': - console.log(unreadNotifications.value.size); - return html`${unreadNotifications.value.size}`; + const [unreadNotifications, readNotifications] = result.value; + const compareTimeAscendant = ( + n1: EntryRecord, + n2: EntryRecord, + ) => n2.action.timestamp - n1.action.timestamp; + + const unreadPersistent = Array.from(unreadNotifications.values()) + .filter(n => n.entry.persistent) + .sort(compareTimeAscendant); + const readPersistent = Array.from(readNotifications.values()) + .filter(n => n.entry.persistent) + .sort(compareTimeAscendant); + + const unreadNonPersistent = Array.from(unreadNotifications.values()) + .filter(n => !n.entry.persistent) + .sort(compareTimeAscendant); + const readNonPersistent = Array.from(readNotifications.values()) + .filter(n => !n.entry.persistent) + .sort(compareTimeAscendant); + const nonPersistentNotificationsCount = + unreadNonPersistent.length + readNonPersistent.length; + const persistentNotificationsCount = + unreadPersistent.length + readPersistent.length; + + return nonPersistentNotificationsCount > 0 || + persistentNotificationsCount > 0 + ? html` +
+
+ ${unreadPersistent.map((n, i) => + this.renderNotification( + false, + n, + i === unreadPersistent.length - 1, + ), + )} + ${unreadPersistent.length > 0 && readPersistent.length > 0 + ? html`` + : html``} + ${readPersistent.map((n, i) => + this.renderNotification( + true, + n, + i === readPersistent.length - 1, + ), + )} +
+
+ ${nonPersistentNotificationsCount > 0 + ? html` + +
+ + this.notificationsStore.client.dismissNotifications( + [ + ...unreadNonPersistent.map(n => n.actionHash), + ...readNonPersistent.map(n => n.actionHash), + ], + )} + > + + ${msg('Dismiss')} +
+ + +
+ ${unreadNonPersistent.map((n, i) => + this.renderNotification( + false, + n, + i === unreadNonPersistent.length - 1, + ), + )} + ${unreadNonPersistent.length > 0 && + readNonPersistent.length > 0 + ? html`` + : html``} + ${readNonPersistent.map((n, i) => + this.renderNotification( + true, + n, + i === readNonPersistent.length - 1, + ), + )} +
+ ` + : html``} +
+
+ ` + : html` +
+ + ${msg('You have no notifications')} +
+ `; } } render() { - return html` - - ${this.renderBadge()} - `; + const result = joinAsync([ + this.notificationsStore.unreadNotifications$, + this.notificationsStore.readNotifications$, + ]).get(); + + switch (result.status) { + case 'pending': + return html`
+ +
`; + case 'error': + return html``; + case 'completed': + const [unreadNotifications, readNotifications] = result.value; + return html` + + this.notificationsStore.client.markNotificationsAsRead( + Array.from(unreadNotifications.keys()), + )} + > +
+ + + ${unreadNotifications.size + readNotifications.size > 0 + ? html` + 0} + >${unreadNotifications.size + + readNotifications.size} + ` + : html``} +
+ + ${this.renderNotifications( + unreadNotifications, + readNotifications, + )} + +
+ `; + } } static styles = [sharedStyles]; diff --git a/ui/src/mocks.ts b/ui/src/mocks.ts index edaa9707..7ce9e03d 100644 --- a/ui/src/mocks.ts +++ b/ui/src/mocks.ts @@ -17,7 +17,7 @@ import { import { ActionHash, AgentPubKey, - AppAgentClient, + AppClient, Delete, EntryHash, Link, @@ -35,7 +35,7 @@ import { encode } from '@msgpack/msgpack'; import { NotificationsClient } from './notifications-client.js'; import { Notification } from './types.js'; -export class NotificationsZomeMock extends ZomeMock implements AppAgentClient { +export class NotificationsZomeMock extends ZomeMock implements AppClient { constructor(myPubKey?: AgentPubKey) { super('notifications_test', 'notifications', myPubKey); } diff --git a/ui/src/notifications-client.ts b/ui/src/notifications-client.ts index 3f4cda4e..a37dd232 100644 --- a/ui/src/notifications-client.ts +++ b/ui/src/notifications-client.ts @@ -1,16 +1,10 @@ -import { - EntryRecord, - ZomeClient, - isSignalFromCellWithRole, -} from '@holochain-open-dev/utils'; +import { EntryRecord, ZomeClient } from '@holochain-open-dev/utils'; import { ActionHash, - AgentPubKey, - AppAgentClient, + AppClient, CreateLink, Delete, DeleteLink, - EntryHash, Link, Record, SignedActionHashed, @@ -21,7 +15,7 @@ import { NotificationsSignal } from './types.js'; export class NotificationsClient extends ZomeClient { constructor( - public client: AppAgentClient, + public client: AppClient, public roleName: string, public zomeName = 'notifications', ) { diff --git a/ui/src/notifications-store.ts b/ui/src/notifications-store.ts index 4b7d9443..3f497aeb 100644 --- a/ui/src/notifications-store.ts +++ b/ui/src/notifications-store.ts @@ -7,14 +7,27 @@ import { uniquify, withLogger, } from '@holochain-open-dev/signals'; -import { LazyHoloHashMap, slice } from '@holochain-open-dev/utils'; +import { EntryRecord, LazyHoloHashMap, slice } from '@holochain-open-dev/utils'; import { ActionHash, encodeHashToBase64 } from '@holochain/client'; import { decode } from '@msgpack/msgpack'; import { NotificationsClient } from './notifications-client.js'; +import { Notification } from './types.js'; + +export type NotificationsTypes = Record< + string, + (notification: EntryRecord) => { + title: string; + body: string; + onClick: () => void; + } +>; export class NotificationsStore { - constructor(public client: NotificationsClient) {} + constructor( + public client: NotificationsClient, + public notificationsTypes: NotificationsTypes, + ) {} /** Notification */ diff --git a/zomes/coordinator/notifications/src/notification.rs b/zomes/coordinator/notifications/src/notification.rs index 7166502d..ff10d0b3 100644 --- a/zomes/coordinator/notifications/src/notification.rs +++ b/zomes/coordinator/notifications/src/notification.rs @@ -1,6 +1,8 @@ use hdk::prelude::*; use notifications_integrity::*; +pub const MAX_TAG_SIZE: usize = 1000; + #[hdk_extern] pub fn create_notification(notification: Notification) -> ExternResult { let notification_hash = create_entry(&EntryTypes::Notification(notification.clone()))?; @@ -36,20 +38,27 @@ pub struct ReadNotifications(pub Vec); #[hdk_extern] pub fn mark_notifications_as_read(notifications_hashes: Vec) -> ExternResult<()> { - let read_notifications = ReadNotifications(notifications_hashes); + let hash_size = 39; + let max_hashes_per_link_tag = (MAX_TAG_SIZE / hash_size) - 1; - let bytes = SerializedBytes::try_from(read_notifications).map_err(|err| { - wasm_error!(WasmErrorInner::Guest(format!( - "Failed to serialize ReadNotifications {err:?}" - ))) - })?; + let chunks = notifications_hashes.chunks(max_hashes_per_link_tag); - create_link( - agent_info()?.agent_latest_pubkey, - agent_info()?.agent_latest_pubkey, - LinkTypes::ReadNotifications, - bytes.bytes().to_vec(), - )?; + for chunk in chunks.into_iter() { + let read_notifications = ReadNotifications(chunk.to_vec()); + + let bytes = SerializedBytes::try_from(read_notifications).map_err(|err| { + wasm_error!(WasmErrorInner::Guest(format!( + "Failed to serialize ReadNotifications {err:?}" + ))) + })?; + + create_link( + agent_info()?.agent_latest_pubkey, + agent_info()?.agent_latest_pubkey, + LinkTypes::ReadNotifications, + bytes.bytes().to_vec(), + )?; + } Ok(()) } diff --git a/zomes/coordinator/notifications/tests/notification.rs b/zomes/coordinator/notifications/tests/notification.rs index 843edb5c..9cb5bf38 100644 --- a/zomes/coordinator/notifications/tests/notification.rs +++ b/zomes/coordinator/notifications/tests/notification.rs @@ -108,11 +108,11 @@ async fn create_and_delete_notification() { let original_action_hash = record.signed_action.hashed.hash; // Alice deletes the Notification - let delete_action_hash: ActionHash = conductors[0] + let _r: () = conductors[0] .call( &alice_zome, - "delete_notification", - original_action_hash.clone(), + "dismiss_notifications", + vec![original_action_hash.clone()], ) .await; @@ -129,5 +129,4 @@ async fn create_and_delete_notification() { .await; assert_eq!(deletes.len(), 1); - assert_eq!(deletes[0].hashed.hash, delete_action_hash); } diff --git a/zomes/integrity/notifications/src/lib.rs b/zomes/integrity/notifications/src/lib.rs index 4b584485..00d3b0b1 100644 --- a/zomes/integrity/notifications/src/lib.rs +++ b/zomes/integrity/notifications/src/lib.rs @@ -48,39 +48,14 @@ pub fn validate(op: Op) -> ExternResult { _ => Ok(ValidateCallbackResult::Valid), }, FlatOp::RegisterUpdate(update_entry) => match update_entry { - OpUpdate::Entry { - original_action, - original_app_entry, - app_entry, - action, - } => match (app_entry, original_app_entry) { - ( - EntryTypes::Notification(notification), - EntryTypes::Notification(original_notification), - ) => validate_update_notification( - action, - notification, - original_action, - original_notification, - ), - _ => Ok(ValidateCallbackResult::Invalid( - "Original and updated entry types must be the same".to_string(), - )), - }, - _ => Ok(ValidateCallbackResult::Valid), - }, - FlatOp::RegisterDelete(delete_entry) => match delete_entry { - OpDelete::Entry { - original_action, - original_app_entry, - action, - } => match original_app_entry { + OpUpdate::Entry { app_entry, action } => match app_entry { EntryTypes::Notification(notification) => { - validate_delete_notification(action, original_action, notification) + validate_update_notification(action, notification) } }, _ => Ok(ValidateCallbackResult::Valid), }, + FlatOp::RegisterDelete(delete_entry) => validate_delete_notification(delete_entry.action), FlatOp::RegisterCreateLink { link_type, base_address, @@ -128,108 +103,20 @@ pub fn validate(op: Op) -> ExternResult { } }, OpRecord::UpdateEntry { - original_action_hash, - app_entry, - action, - .. - } => { - let original_record = must_get_valid_record(original_action_hash)?; - let original_action = original_record.action().clone(); - let original_action = match original_action { - Action::Create(create) => EntryCreationAction::Create(create), - Action::Update(update) => EntryCreationAction::Update(update), - _ => { - return Ok(ValidateCallbackResult::Invalid( - "Original action for an update must be a Create or Update action" - .to_string(), - )); - } - }; - match app_entry { - EntryTypes::Notification(notification) => { - let result = validate_create_notification( - EntryCreationAction::Update(action.clone()), - notification.clone(), - )?; - if let ValidateCallbackResult::Valid = result { - let original_notification: Option = original_record - .entry() - .to_app_option() - .map_err(|e| wasm_error!(e))?; - let original_notification = match original_notification { - Some(notification) => notification, - None => { - return Ok(ValidateCallbackResult::Invalid( - "The updated entry type must be the same as the original entry type" - .to_string(), - )); - } - }; - validate_update_notification( - action, - notification, - original_action, - original_notification, - ) - } else { - Ok(result) - } - } - } - } - OpRecord::DeleteEntry { - original_action_hash, - action, - .. - } => { - let original_record = must_get_valid_record(original_action_hash)?; - let original_action = original_record.action().clone(); - let original_action = match original_action { - Action::Create(create) => EntryCreationAction::Create(create), - Action::Update(update) => EntryCreationAction::Update(update), - _ => { - return Ok(ValidateCallbackResult::Invalid( - "Original action for a delete must be a Create or Update action" - .to_string(), - )); - } - }; - let app_entry_type = match original_action.entry_type() { - EntryType::App(app_entry_type) => app_entry_type, - _ => { - return Ok(ValidateCallbackResult::Valid); - } - }; - let entry = match original_record.entry().as_option() { - Some(entry) => entry, - None => { - if original_action.entry_type().visibility().is_public() { - return Ok(ValidateCallbackResult::Invalid( - "Original record for a delete of a public entry must contain an entry".to_string(), - )); - } else { - return Ok(ValidateCallbackResult::Valid); - } - } - }; - let original_app_entry = match EntryTypes::deserialize_from_type( - app_entry_type.zome_index, - app_entry_type.entry_index, - entry, - )? { - Some(app_entry) => app_entry, - None => { - return Ok(ValidateCallbackResult::Invalid( - "Original app entry must be one of the defined entry types for this zome".to_string(), - )); - } - }; - match original_app_entry { - EntryTypes::Notification(original_notification) => { - validate_delete_notification(action, original_action, original_notification) - } + app_entry, action, .. + } => match app_entry { + EntryTypes::Notification(notification) => { + let result = validate_create_notification( + EntryCreationAction::Update(action.clone()), + notification.clone(), + )?; + let ValidateCallbackResult::Valid = result else { + return Ok(result); + }; + validate_update_notification(action, notification) } - } + }, + OpRecord::DeleteEntry { action, .. } => validate_delete_notification(action), OpRecord::CreateLink { base_address, target_address, diff --git a/zomes/integrity/notifications/src/notification.rs b/zomes/integrity/notifications/src/notification.rs index 63be4866..16b9d616 100644 --- a/zomes/integrity/notifications/src/notification.rs +++ b/zomes/integrity/notifications/src/notification.rs @@ -17,18 +17,12 @@ pub fn validate_create_notification( pub fn validate_update_notification( _action: Update, _notification: Notification, - _original_action: EntryCreationAction, - _original_notification: Notification, ) -> ExternResult { Ok(ValidateCallbackResult::Invalid(String::from( "Notifications cannot be updated", ))) } -pub fn validate_delete_notification( - _action: Delete, - _original_action: EntryCreationAction, - _original_notification: Notification, -) -> ExternResult { +pub fn validate_delete_notification(_action: Delete) -> ExternResult { Ok(ValidateCallbackResult::Valid) } pub fn validate_create_link_recipient_to_notifications(