From f7a4410a8d34d1d95dbcf350bf612d448d2d0e1c Mon Sep 17 00:00:00 2001 From: Leo Date: Mon, 1 Apr 2024 18:01:49 +0200 Subject: [PATCH] upgrade to holochain 0_3 --- Cargo.lock | 1156 +++++++---------- Cargo.toml | 6 +- .../zomes/coordinator/converge/Cargo.toml | 2 + .../coordinator/converge/src/all_criteria.rs | 4 +- .../converge/src/all_deliberations.rs | 6 +- .../coordinator/converge/src/all_proposals.rs | 4 +- .../converge/src/criterion_comment.rs | 6 +- .../converge/src/criterion_to_criteria.rs | 4 +- .../src/criterion_to_criterion_comments.rs | 10 +- .../coordinator/converge/src/deliberation.rs | 6 +- .../converge/src/deliberation_to_criteria.rs | 14 +- .../converge/src/deliberation_to_proposals.rs | 14 +- .../src/deliberator_to_deliberations.rs | 16 +- .../zomes/coordinator/converge/src/lib.rs | 15 +- .../converge/src/objector_to_criteria.rs | 30 +- .../converge/src/proposal_to_criteria.rs | 10 +- .../coordinator/converge/src/settings.rs | 6 +- .../converge/src/supporter_to_criteria.rs | 22 +- .../zomes/coordinator/profiles/Cargo.toml | 2 +- .../zomes/integrity/converge/src/lib.rs | 4 +- .../zomes/integrity/profiles/Cargo.toml | 2 +- flake.lock | 225 ++-- flake.nix | 26 +- package-lock.json | 324 +++-- package.json | 5 +- ui/package.json | 4 +- ui/src/App.svelte | 7 +- ui/src/dcan.css | 3 +- we_dev/config.json | 2 +- we_dev/converge.svg | 138 ++ 30 files changed, 961 insertions(+), 1112 deletions(-) create mode 100644 we_dev/converge.svg diff --git a/Cargo.lock b/Cargo.lock index a5b7f5e..130f938 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ "getrandom", "once_cell", @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -52,15 +52,6 @@ dependencies = [ "libc", ] -[[package]] -name = "approx" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -dependencies = [ - "num-traits", -] - [[package]] name = "arrayref" version = "0.3.7" @@ -73,24 +64,30 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.32.2", + "object", "rustc-demangle", ] @@ -130,12 +127,6 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - [[package]] name = "bitvec" version = "1.0.1" @@ -155,7 +146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" dependencies = [ "arrayref", - "arrayvec", + "arrayvec 0.5.2", "constant_time_eq", ] @@ -170,15 +161,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytecheck" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" dependencies = [ "bytecheck_derive", "ptr_meta", @@ -187,9 +178,9 @@ dependencies = [ [[package]] name = "bytecheck_derive" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" dependencies = [ "proc-macro2", "quote", @@ -204,9 +195,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "camino" @@ -219,9 +210,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.3" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" dependencies = [ "serde", ] @@ -234,7 +225,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.20", + "semver 1.0.22", "serde", "serde_json", "thiserror", @@ -242,12 +233,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" [[package]] name = "cfg-if" @@ -263,26 +251,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.48.5", -] - -[[package]] -name = "colored" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f741c91823341bebf717d4c71bda820630ce065443b58bd1b7451af008355" -dependencies = [ - "is-terminal", - "lazy_static", - "winapi", + "windows-targets 0.52.4", ] [[package]] @@ -298,6 +275,7 @@ dependencies = [ "converge_integrity", "hdk", "serde", + "zome_utils", ] [[package]] @@ -344,56 +322,74 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.82.3" +version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38faa2a16616c8e78a18d37b4726b98bfd2de192f2fdc8a39ddf568a408a0f75" +checksum = "2a2ab4512dfd3a6f4be184403a195f76e81a8a9f9e6c898e19d2dc3ce20e0115" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.82.3" +version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26f192472a3ba23860afd07d2b0217dc628f21fcc72617aa1336d98e1671f33b" +checksum = "98b022ed2a5913a38839dfbafe6cf135342661293b08049843362df4301261dc" dependencies = [ + "arrayvec 0.7.4", + "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", + "cranelift-egraph", "cranelift-entity", + "cranelift-isle", "gimli 0.26.2", "log", - "regalloc", + "regalloc2", "smallvec", "target-lexicon", ] [[package]] name = "cranelift-codegen-meta" -version = "0.82.3" +version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32ddb89e9b89d3d9b36a5b7d7ea3261c98235a76ac95ba46826b8ec40b1a24" +checksum = "639307b45434ad112a98f8300c0f0ab085cbefcd767efcdef9ef19d4c0756e74" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.82.3" +version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01fd0d9f288cc1b42d9333b7a776b17e278fc888c28e6a0f09b5573d45a150bc" +checksum = "278e52e29c53fcf32431ef08406c295699a70306d05a0715c5b1bf50e33a9ab7" + +[[package]] +name = "cranelift-egraph" +version = "0.91.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624b54323b06e675293939311943ba82d323bb340468ce1889be5da7932c8d73" +dependencies = [ + "cranelift-entity", + "fxhash", + "hashbrown 0.12.3", + "indexmap 1.9.3", + "log", + "smallvec", +] [[package]] name = "cranelift-entity" -version = "0.82.3" +version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3bfe172b83167604601faf9dc60453e0d0a93415b57a9c4d1a7ae6849185cf" +checksum = "9a59bcbca89c3f1b70b93ab3cbba5e5e0cbf3e63dadb23c7525cb142e21a9d4c" [[package]] name = "cranelift-frontend" -version = "0.82.3" +version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a006e3e32d80ce0e4ba7f1f9ddf66066d052a8c884a110b91d05404d6ce26dce" +checksum = "0d70abacb8cfef3dc8ff7e8836e9c1d70f7967dfdac824a4cd5e30223415aca6" dependencies = [ "cranelift-codegen", "log", @@ -402,13 +398,10 @@ dependencies = [ ] [[package]] -name = "crc32fast" -version = "1.3.2" +name = "cranelift-isle" +version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "393bc73c451830ff8dbb3a07f61843d6cb41a084f9996319917c0b291ed785bb" [[package]] name = "crossbeam-deque" @@ -429,6 +422,15 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.19" @@ -457,12 +459,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ - "darling_core 0.20.3", - "darling_macro 0.20.3", + "darling_core 0.20.8", + "darling_macro 0.20.8", ] [[package]] @@ -481,15 +483,15 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -505,13 +507,26 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ - "darling_core 0.20.3", + "darling_core 0.20.8", "quote", - "syn 2.0.48", + "syn 2.0.57", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if 1.0.0", + "hashbrown 0.14.3", + "lock_api", + "once_cell", + "parking_lot_core", ] [[package]] @@ -556,9 +571,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "enum-iterator" @@ -595,10 +610,10 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" dependencies = [ - "darling 0.20.3", + "darling 0.20.8", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -607,34 +622,27 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "fallible-iterator" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - [[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + [[package]] name = "funty" version = "2.0.0" @@ -697,7 +705,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -730,6 +738,15 @@ dependencies = [ "slab", ] +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + [[package]] name = "gcollections" version = "1.5.0" @@ -780,15 +797,6 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.12.3" @@ -807,7 +815,7 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hc_zome_profiles_coordinator" version = "0.2.0" -source = "git+https://github.com/holochain-open-dev/profiles?branch=for-hdk-v0.2.3#229a0b11a310b64a6b16fd010914aa09de07ec3c" +source = "git+https://github.com/holochain-open-dev/profiles?branch=for-hdk-v0.3.0-beta-dev.33#e97075cca091b9fdc2394e977f736cdaf02a1754" dependencies = [ "derive_more", "hc_zome_profiles_integrity", @@ -818,7 +826,7 @@ dependencies = [ [[package]] name = "hc_zome_profiles_integrity" version = "0.2.0" -source = "git+https://github.com/holochain-open-dev/profiles?branch=for-hdk-v0.2.3#229a0b11a310b64a6b16fd010914aa09de07ec3c" +source = "git+https://github.com/holochain-open-dev/profiles?branch=for-hdk-v0.3.0-beta-dev.33#e97075cca091b9fdc2394e977f736cdaf02a1754" dependencies = [ "derive_more", "hdi", @@ -827,10 +835,11 @@ dependencies = [ [[package]] name = "hdi" -version = "0.3.4" +version = "0.4.0-beta-dev.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433896b20fa55c3b571567d0a8904be61f71c91eb49f6cdeef338ac8598e3e2b" +checksum = "e9b10e28b62f081933f7c176ec16a2924afb05c74b56197882cff3b7ca24f84c" dependencies = [ + "getrandom", "hdk_derive", "holo_hash", "holochain_integrity_types", @@ -844,9 +853,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.2.4" +version = "0.3.0-beta-dev.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b49aec7019a737dc1104814edd970315954f477f4508e317f7cc10938ffa36" +checksum = "4dbd50ff3d475e269285f01e04ad1bd341a7ce8c0619d1985e7de25fbd125094" dependencies = [ "getrandom", "hdi", @@ -864,9 +873,9 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.2.4" +version = "0.3.0-beta-dev.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3dfc8932e6668d5a93a1a2d678977fb32acb92c5a4bdbd48beafba32af570d" +checksum = "081aa1efba0967921c7cabd6b6325eb4c84b176c4c053d1afa6b70075c0b0af9" dependencies = [ "darling 0.14.4", "heck", @@ -886,9 +895,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -898,9 +907,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.2.4" +version = "0.3.0-beta-dev.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25fb90402dbfcf179f2f96a8dc247bde1d86ccf4ed2ecbbe7fe34446027e30fd" +checksum = "83ecbd6d5e663c9e26bdeb7d8bb3a3656f7a4ca22e4ab5bfc557889329a5bd90" dependencies = [ "base64", "blake2b_simd", @@ -916,14 +925,14 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.2.4" +version = "0.3.0-beta-dev.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "294ba29e9e11b31137544f07d51c1b132dd336fbb7ca5b6ce33ca6619e416189" +checksum = "bdbf96cc42d70f08cacac17bae0195fb2aa451e2d6ba613b4a4b24807b393244" dependencies = [ "holo_hash", + "holochain_secure_primitive", "holochain_serialized_bytes", "holochain_util", - "kitsune_p2p_dht", "kitsune_p2p_timestamp", "paste", "serde", @@ -932,11 +941,33 @@ dependencies = [ "tracing", ] +[[package]] +name = "holochain_nonce" +version = "0.3.0-beta-dev.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffdee2f3cb5c43078153ffb6482ed86ba288567eb12febf2688a649882e2c753" +dependencies = [ + "getrandom", + "holochain_secure_primitive", + "kitsune_p2p_timestamp", +] + +[[package]] +name = "holochain_secure_primitive" +version = "0.3.0-beta-dev.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7701cf72c29cc7ccd0ef02e00e5091ad120d24619e948af1277011583eb566a" +dependencies = [ + "paste", + "serde", + "subtle", +] + [[package]] name = "holochain_serialized_bytes" -version = "0.0.51" +version = "0.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9805b3e01e7b5c144782a0823db4dc895fec18a9ccd45a492ce7c7bf157a9e38" +checksum = "5f7a5fc7c745a107f8ebcb04caab7a6b7a8463e2811f07ced19c281977583de7" dependencies = [ "holochain_serialized_bytes_derive", "rmp-serde", @@ -949,9 +980,9 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes_derive" -version = "0.0.51" +version = "0.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1077232d0c427d64feb9e138fa22800e447eafb1810682d6c13beb95333cb32c" +checksum = "ec3e0cf02005cbf0f514476d40e02125b26df6d4922d7a2c48a84fc588539d71" dependencies = [ "quote", "syn 1.0.109", @@ -959,23 +990,24 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.2.4" +version = "0.3.0-beta-dev.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19dfedf84953843a45ebbe273b59daabb444146e98499f136c3b2bfb2fc3d5d" +checksum = "7e6911683a6cbefa2b055879f4cd474cae7b32aeedeba0ca9f3c6ddc3849df67" dependencies = [ "cfg-if 0.1.10", "derive_more", "dunce", "futures", + "getrandom", "num_cpus", "once_cell", ] [[package]] name = "holochain_wasmer_common" -version = "0.0.84" +version = "0.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223daec7ca62d4e36841a99d8799b29cc616f5976ad0e2975e6ca6810de8f14f" +checksum = "72007fd2a72d77e76ffa494e5847bf6e893e25e73fe1d1de902e1b8d5033a64e" dependencies = [ "holochain_serialized_bytes", "serde", @@ -983,14 +1015,13 @@ dependencies = [ "test-fuzz", "thiserror", "wasmer", - "wasmer-engine", ] [[package]] name = "holochain_wasmer_guest" -version = "0.0.84" +version = "0.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92b2026e44595cb16108464973622577936605582aa22932933a5130ad32ce42" +checksum = "8c429e84a19ee446f47541a6fed10e1a4376a8a8ba6d3dbff7d07e4a7bb4c85f" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", @@ -1002,12 +1033,15 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.2.4" +version = "0.3.0-beta-dev.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0366fdc03fd8cad948456579183124b2778be4b5e21230ceb221dc4818523e" +checksum = "d3828fb0d0ff17abd962e44884b6e0662aa73608b378f3d30e329f0c74d11259" dependencies = [ + "derive_more", "holo_hash", "holochain_integrity_types", + "holochain_nonce", + "holochain_secure_primitive", "holochain_serialized_bytes", "holochain_wasmer_common", "kitsune_p2p_bin_data", @@ -1032,9 +1066,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1059,6 +1093,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "if_chain" version = "1.0.2" @@ -1073,14 +1117,13 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde", ] [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -1099,17 +1142,6 @@ dependencies = [ "trilean", ] -[[package]] -name = "is-terminal" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys 0.52.0", -] - [[package]] name = "itertools" version = "0.8.2" @@ -1121,24 +1153,24 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "kitsune_p2p_bin_data" -version = "0.2.4" +version = "0.3.0-beta-dev.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a444a4508397be02027442fa3bc106db8a8ff79a02e680a652146ef07802aa" +checksum = "6d67bca0a227476108d62c72c4f997f6c8a94cba656e6edd96eb2624f0768be9" dependencies = [ "base64", "derive_more", @@ -1151,61 +1183,36 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.2.4" +version = "0.3.0-beta-dev.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c49c5cde7b3a68e0c8759a4be3820af90a0e79d5697254538d183823ecada823" +checksum = "a9d82082528329d4404f50f2c364b7d3a731a70f5bacf0be1232c469cce984d8" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", "serde", - "serde_bytes", -] - -[[package]] -name = "kitsune_p2p_dht" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea8a9866ba8cb51f443aeda15646d0cc6ea35eac7dc82e2ca3e101e2089ed109" -dependencies = [ - "colored", - "derivative", - "derive_more", - "futures", - "gcollections", - "intervallum", - "kitsune_p2p_dht_arc", - "kitsune_p2p_timestamp", - "must_future", - "num-traits", - "once_cell", - "rand", - "serde", - "statrs", - "thiserror", - "tracing", ] [[package]] name = "kitsune_p2p_dht_arc" -version = "0.2.4" +version = "0.3.0-beta-dev.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ab2c05e469ccade1e6a3f50138998148ff25330d83a4a334516fd0daec35c7" +checksum = "3a7cf8e2cdb3274f1f5963edf2b07fe5c3f50f07b7f8c9871186024e1adfc7c9" dependencies = [ "derive_more", "gcollections", "intervallum", + "kitsune_p2p_timestamp", "num-traits", "serde", ] [[package]] name = "kitsune_p2p_timestamp" -version = "0.2.4" +version = "0.3.0-beta-dev.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1b199e027c58d7cd55530431dddbdfe622258fda3e9aa0b61b4e938fcf463d" +checksum = "2079319784e851cdcceb11463db7672fec543d73fd045a437737caf70fe5386b" dependencies = [ "chrono", - "derive_more", "serde", ] @@ -1223,31 +1230,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" - -[[package]] -name = "libloading" -version = "0.7.4" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if 1.0.0", - "winapi", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "linux-raw-sys" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "lock_api" @@ -1261,30 +1246,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "loupe" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6a72dfa44fe15b5e76b94307eeb2ff995a8c5b283b55008940c02e0c5b634d" -dependencies = [ - "indexmap 1.9.3", - "loupe-derive", - "rustversion", -] - -[[package]] -name = "loupe-derive" -version = "0.1.3" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fbfc88337168279f2e9ae06e157cfed4efd3316e14dc96ed074d4f2e6c5952" -dependencies = [ - "quote", - "syn 1.0.109", -] +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "mach" @@ -1296,20 +1260,19 @@ dependencies = [ ] [[package]] -name = "matrixmultiply" -version = "0.3.8" +name = "mach2" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" dependencies = [ - "autocfg", - "rawpointer", + "libc", ] [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" @@ -1320,20 +1283,29 @@ dependencies = [ "libc", ] +[[package]] +name = "memmap2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" +dependencies = [ + "libc", +] + [[package]] name = "memoffset" -version = "0.6.5" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] @@ -1344,83 +1316,22 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" -[[package]] -name = "must_future" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a160ffed3c2f98d2906c67a9b6e4e1f09cca7e17e3f780286a349061459eeebe" -dependencies = [ - "futures", - "pin-utils", -] - -[[package]] -name = "nalgebra" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "462fffe4002f4f2e1f6a9dcf12cc1a6fc0e15989014efc02a941d3e0f5dc2120" -dependencies = [ - "approx", - "matrixmultiply", - "nalgebra-macros", - "num-complex", - "num-rational", - "num-traits", - "rand", - "rand_distr", - "simba", - "typenum", -] - -[[package]] -name = "nalgebra-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "num-complex" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" -dependencies = [ - "num-traits", -] - [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -1433,18 +1344,6 @@ dependencies = [ "libc", ] -[[package]] -name = "object" -version = "0.28.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" -dependencies = [ - "crc32fast", - "hashbrown 0.11.2", - "indexmap 1.9.3", - "memchr", -] - [[package]] name = "object" version = "0.32.2" @@ -1489,11 +1388,17 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + [[package]] name = "pest" -version = "2.7.6" +version = "2.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f200d8d83c44a45b21764d1916299752ca035d15ecd46faca3e9a2a2bf6ad06" +checksum = "56f8023d0fb78c8e03784ea1c7f3fa36e68a723138990b8d5a47d916b651e7a8" dependencies = [ "memchr", "thiserror", @@ -1502,9 +1407,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1512,12 +1417,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - [[package]] name = "proc-macro-error" version = "1.0.4" @@ -1544,9 +1443,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -1600,57 +1499,11 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_distr" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" -dependencies = [ - "num-traits", - "rand", -] - -[[package]] -name = "rawpointer" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" - [[package]] name = "rayon" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -1658,9 +1511,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -1672,25 +1525,26 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] -name = "regalloc" -version = "0.0.34" +name = "regalloc2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62446b1d3ebf980bdc68837700af1d77b37bc430e524bf95319c6eada2a4cc02" +checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c" dependencies = [ + "fxhash", "log", - "rustc-hash", + "slice-group-by", "smallvec", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -1700,9 +1554,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -1711,41 +1565,42 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "region" -version = "3.0.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e" +checksum = "e6b6ebd13bc009aef9cd476c1310d49ac354d36e240cf1bd753290f3dc7199a7" dependencies = [ - "bitflags 1.3.2", + "bitflags", "libc", - "mach", - "winapi", + "mach2", + "windows-sys 0.52.0", ] [[package]] name = "rend" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" dependencies = [ "bytecheck", ] [[package]] name = "rkyv" -version = "0.7.43" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527a97cdfef66f65998b5f3b637c26f5a5ec09cc52a3f9932313ac645f4190f5" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" dependencies = [ "bitvec", "bytecheck", "bytes", "hashbrown 0.12.3", + "indexmap 1.9.3", "ptr_meta", "rend", "rkyv_derive", @@ -1756,9 +1611,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.43" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5c462a1328c8e67e4d6dbad1eb0355dd43e8ab432c6e227a43657f16ade5033" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ "proc-macro2", "quote", @@ -1793,32 +1648,13 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.20", -] - -[[package]] -name = "rustix" -version = "0.38.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", + "semver 1.0.22", ] [[package]] @@ -1829,9 +1665,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -1854,6 +1690,12 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" +[[package]] +name = "self_cell" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" + [[package]] name = "semver" version = "0.11.0" @@ -1865,9 +1707,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" dependencies = [ "serde", ] @@ -1883,9 +1725,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.166" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] @@ -1899,6 +1741,17 @@ dependencies = [ "serde", ] +[[package]] +name = "serde-wasm-bindgen" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + [[package]] name = "serde_bytes" version = "0.11.14" @@ -1910,22 +1763,22 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.166" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] name = "serde_json" -version = "1.0.109" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -1942,31 +1795,29 @@ dependencies = [ "digest", ] +[[package]] +name = "shared-buffer" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6c99835bad52957e7aa241d3975ed17c1e5f8c92026377d117a606f36b84b16" +dependencies = [ + "bytes", + "memmap2 0.6.2", +] + [[package]] name = "shrinkwraprs" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e63e6744142336dfb606fe2b068afa2e1cca1ee6a5d8377277a92945d81fa331" dependencies = [ - "bitflags 1.3.2", + "bitflags", "itertools", "proc-macro2", "quote", "syn 1.0.109", ] -[[package]] -name = "simba" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e82063457853d00243beda9952e910b82593e4b07ae9f721b9278a99a0d3d5c" -dependencies = [ - "approx", - "num-complex", - "num-traits", - "paste", -] - [[package]] name = "simdutf8" version = "0.1.4" @@ -1982,11 +1833,17 @@ dependencies = [ "autocfg", ] +[[package]] +name = "slice-group-by" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" + [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "stable_deref_trait" @@ -1994,19 +1851,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "statrs" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05bdbb8e4e78216a85785a85d3ec3183144f98d0097b9281802c019bb07a6f05" -dependencies = [ - "approx", - "lazy_static", - "nalgebra", - "num-traits", - "rand", -] - [[package]] name = "strsim" version = "0.10.0" @@ -2055,9 +1899,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35" dependencies = [ "proc-macro2", "quote", @@ -2072,22 +1916,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.13" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" - -[[package]] -name = "tempfile" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.52.0", -] +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "test-fuzz" @@ -2148,22 +1979,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -2200,7 +2031,6 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2214,7 +2044,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -2245,12 +2075,27 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + [[package]] name = "unicode-width" version = "0.1.11" @@ -2268,11 +2113,22 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + [[package]] name = "uuid" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" [[package]] name = "valuable" @@ -2288,9 +2144,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -2304,9 +2160,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -2314,24 +2170,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2339,101 +2195,97 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.57", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-encoder" -version = "0.38.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad2b51884de9c7f4fe2fd1043fccb8dcad4b1e29558146ee57a144d15779f3f" +checksum = "1ba64e81215916eaeb48fee292f29401d69235d62d8b8fd92a7b2844ec5ae5f7" dependencies = [ "leb128", ] [[package]] name = "wasmer" -version = "2.3.0" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea8d8361c9d006ea3d7797de7bd6b1492ffd0f91a22430cfda6c1658ad57bedf" +checksum = "ce45cc009177ca345a6d041f9062305ad467d15e7d41494f5b81ab46d62d7a58" dependencies = [ + "bytes", "cfg-if 1.0.0", + "derivative", "indexmap 1.9.3", "js-sys", - "loupe", "more-asserts", + "rustc-demangle", + "serde", + "serde-wasm-bindgen", + "shared-buffer", "target-lexicon", "thiserror", "wasm-bindgen", - "wasmer-artifact", "wasmer-compiler", "wasmer-compiler-cranelift", "wasmer-derive", - "wasmer-engine", - "wasmer-engine-dylib", - "wasmer-engine-universal", "wasmer-types", "wasmer-vm", "wat", "winapi", ] -[[package]] -name = "wasmer-artifact" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aaf9428c29c1d8ad2ac0e45889ba8a568a835e33fd058964e5e500f2f7ce325" -dependencies = [ - "enumset", - "loupe", - "thiserror", - "wasmer-compiler", - "wasmer-types", -] - [[package]] name = "wasmer-compiler" -version = "2.3.0" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67a6cd866aed456656db2cfea96c18baabbd33f676578482b85c51e1ee19d2c" +checksum = "e044f6140c844602b920deb4526aea3cc9c0d7cf23f00730bb9b2034669f522a" dependencies = [ + "backtrace", + "bytes", + "cfg-if 1.0.0", + "enum-iterator", "enumset", - "loupe", + "lazy_static", + "leb128", + "memmap2 0.5.10", + "more-asserts", + "region", "rkyv", - "serde", - "serde_bytes", + "self_cell", + "shared-buffer", "smallvec", - "target-lexicon", "thiserror", "wasmer-types", + "wasmer-vm", "wasmparser", + "winapi", ] [[package]] name = "wasmer-compiler-cranelift" -version = "2.3.0" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48be2f9f6495f08649e4f8b946a2cbbe119faf5a654aa1457f9504a99d23dae0" +checksum = "32ce02358eb44a149d791c1d6648fb7f8b2f99cd55e3c4eef0474653ec8cc889" dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", "gimli 0.26.2", - "loupe", "more-asserts", "rayon", "smallvec", @@ -2445,9 +2297,9 @@ dependencies = [ [[package]] name = "wasmer-derive" -version = "2.3.0" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e50405cc2a2f74ff574584710a5f2c1d5c93744acce2ca0866084739284b51" +checksum = "c782d80401edb08e1eba206733f7859db6c997fc5a7f5fb44edc3ecd801468f6" dependencies = [ "proc-macro-error", "proc-macro2", @@ -2455,158 +2307,65 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "wasmer-engine" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f98f010978c244db431b392aeab0661df7ea0822343334f8f2a920763548e45" -dependencies = [ - "backtrace", - "enumset", - "lazy_static", - "loupe", - "memmap2", - "more-asserts", - "rustc-demangle", - "serde", - "serde_bytes", - "target-lexicon", - "thiserror", - "wasmer-artifact", - "wasmer-compiler", - "wasmer-types", - "wasmer-vm", -] - -[[package]] -name = "wasmer-engine-dylib" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0358af9c154724587731175553805648d9acb8f6657880d165e378672b7e53" -dependencies = [ - "cfg-if 1.0.0", - "enum-iterator", - "enumset", - "leb128", - "libloading", - "loupe", - "object 0.28.4", - "rkyv", - "serde", - "tempfile", - "tracing", - "wasmer-artifact", - "wasmer-compiler", - "wasmer-engine", - "wasmer-object", - "wasmer-types", - "wasmer-vm", - "which", -] - -[[package]] -name = "wasmer-engine-universal" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "440dc3d93c9ca47865a4f4edd037ea81bf983b5796b59b3d712d844b32dbef15" -dependencies = [ - "cfg-if 1.0.0", - "enumset", - "leb128", - "loupe", - "region", - "rkyv", - "wasmer-compiler", - "wasmer-engine", - "wasmer-engine-universal-artifact", - "wasmer-types", - "wasmer-vm", - "winapi", -] - -[[package]] -name = "wasmer-engine-universal-artifact" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f1db3f54152657eb6e86c44b66525ff7801dad8328fe677da48dd06af9ad41" -dependencies = [ - "enum-iterator", - "enumset", - "loupe", - "rkyv", - "thiserror", - "wasmer-artifact", - "wasmer-compiler", - "wasmer-types", -] - -[[package]] -name = "wasmer-object" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d831335ff3a44ecf451303f6f891175c642488036b92ceceb24ac8623a8fa8b" -dependencies = [ - "object 0.28.4", - "thiserror", - "wasmer-compiler", - "wasmer-types", -] - [[package]] name = "wasmer-types" -version = "2.3.0" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39df01ea05dc0a9bab67e054c7cb01521e53b35a7bb90bd02eca564ed0b2667f" +checksum = "fd09e80d4d74bb9fd0ce6c3c106b1ceba1a050f9948db9d9b78ae53c172d6157" dependencies = [ - "backtrace", + "bytecheck", "enum-iterator", + "enumset", "indexmap 1.9.3", - "loupe", "more-asserts", "rkyv", - "serde", + "target-lexicon", "thiserror", ] [[package]] name = "wasmer-vm" -version = "2.3.0" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d965fa61f4dc4cdb35a54daaf7ecec3563fbb94154a6c35433f879466247dd" +checksum = "bdcd8a4fd36414a7b6a003dbfbd32393bce3e155d715dd877c05c1b7a41d224d" dependencies = [ "backtrace", "cc", "cfg-if 1.0.0", "corosensei", + "crossbeam-queue", + "dashmap", + "derivative", "enum-iterator", + "fnv", "indexmap 1.9.3", "lazy_static", "libc", - "loupe", "mach", "memoffset", "more-asserts", "region", - "rkyv", "scopeguard", - "serde", "thiserror", - "wasmer-artifact", "wasmer-types", "winapi", ] [[package]] name = "wasmparser" -version = "0.83.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" +checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a" +dependencies = [ + "indexmap 1.9.3", + "url", +] [[package]] name = "wast" -version = "69.0.1" +version = "64.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ee37317321afde358e4d7593745942c48d6d17e0e6e943704de9bbee121e7a" +checksum = "a259b226fd6910225aa7baeba82f9d9933b6d00f2ce1b49b80fa4214328237cc" dependencies = [ "leb128", "memchr", @@ -2616,25 +2375,13 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.82" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeb338ee8dee4d4cd05e6426683f21c5087dc7cfc8903e839ccf48d43332da3c" +checksum = "53253d920ab413fca1c7dc2161d601c79b4fdf631d0ba51dd4343bf9b556c3f6" dependencies = [ "wast", ] -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - [[package]] name = "winapi" version = "0.3.9" @@ -2672,7 +2419,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -2694,7 +2441,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -2714,17 +2461,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -2735,9 +2482,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -2753,9 +2500,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -2771,9 +2518,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -2789,9 +2536,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -2807,9 +2554,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -2819,9 +2566,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -2837,9 +2584,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "wyz" @@ -2849,3 +2596,12 @@ checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] + +[[package]] +name = "zome_utils" +version = "0.1.0" +source = "git+https://github.com/ddd-mtl/zome-utils?branch=hdk-3.0#2181b0f40696d954bcc069504aaba7e888e5e548" +dependencies = [ + "hdk", + "serde", +] diff --git a/Cargo.toml b/Cargo.toml index 81858d5..48e7357 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,10 +10,12 @@ members = ["dnas/*/zomes/coordinator/*", "dnas/*/zomes/integrity/*"] resolver = "2" [workspace.dependencies] -hdi = "0.3.1" -hdk = "0.2.1" +hdi = "0.4.0-beta-dev.30" +hdk = "0.3.0-beta-dev.34" serde = "1" +zome_utils = { git = "https://github.com/ddd-mtl/zome-utils", branch = "hdk-3.0" } + [workspace.dependencies.converge] path = "dnas/converge/zomes/coordinator/converge" diff --git a/dnas/converge/zomes/coordinator/converge/Cargo.toml b/dnas/converge/zomes/coordinator/converge/Cargo.toml index 4b8e1c6..5d19154 100644 --- a/dnas/converge/zomes/coordinator/converge/Cargo.toml +++ b/dnas/converge/zomes/coordinator/converge/Cargo.toml @@ -12,4 +12,6 @@ hdk = { workspace = true } serde = { workspace = true } +zome_utils.workspace = true + converge_integrity = { workspace = true } diff --git a/dnas/converge/zomes/coordinator/converge/src/all_criteria.rs b/dnas/converge/zomes/coordinator/converge/src/all_criteria.rs index 59a1d4b..cfc5499 100644 --- a/dnas/converge/zomes/coordinator/converge/src/all_criteria.rs +++ b/dnas/converge/zomes/coordinator/converge/src/all_criteria.rs @@ -1,9 +1,11 @@ use hdk::prelude::*; use converge_integrity::*; +use zome_utils::*; + #[hdk_extern] pub fn get_all_criteria(_: ()) -> ExternResult> { let path = Path::from("all_criteria"); - let links = get_links(path.path_entry_hash()?, LinkTypes::AllCriteria, None)?; + let links = get_links(link_input(path.path_entry_hash()?, LinkTypes::AllCriteria, None))?; let get_input: Vec = links .into_iter() .map(|link| GetInput::new( diff --git a/dnas/converge/zomes/coordinator/converge/src/all_deliberations.rs b/dnas/converge/zomes/coordinator/converge/src/all_deliberations.rs index 9b2f8a6..a4aa24f 100644 --- a/dnas/converge/zomes/coordinator/converge/src/all_deliberations.rs +++ b/dnas/converge/zomes/coordinator/converge/src/all_deliberations.rs @@ -1,9 +1,11 @@ use hdk::prelude::*; use converge_integrity::*; +use zome_utils::*; + #[hdk_extern] pub fn get_all_deliberations(_: ()) -> ExternResult> { let path = Path::from("all_deliberations"); - let links = get_links(path.path_entry_hash()?, LinkTypes::AllDeliberations, None)?; + let links = get_links(link_input(path.path_entry_hash()?, LinkTypes::AllDeliberations, None))?; let get_input: Vec = links .into_iter() .map(|link| GetInput::new( @@ -23,7 +25,7 @@ pub fn get_all_deliberations(_: ()) -> ExternResult> { #[hdk_extern] pub fn search_all_deliberations(query: String) -> ExternResult> { let path = Path::from("all_deliberations"); - let links = get_links(path.path_entry_hash()?, LinkTypes::AllDeliberations, None)?; + let links = get_links(link_input(path.path_entry_hash()?, LinkTypes::AllDeliberations, None))?; let get_input: Vec = links .into_iter() .map(|link| GetInput::new( diff --git a/dnas/converge/zomes/coordinator/converge/src/all_proposals.rs b/dnas/converge/zomes/coordinator/converge/src/all_proposals.rs index 07c9d47..3207d3d 100644 --- a/dnas/converge/zomes/coordinator/converge/src/all_proposals.rs +++ b/dnas/converge/zomes/coordinator/converge/src/all_proposals.rs @@ -1,9 +1,11 @@ use hdk::prelude::*; use converge_integrity::*; +use zome_utils::*; + #[hdk_extern] pub fn get_all_proposals(_: ()) -> ExternResult> { let path = Path::from("all_proposals"); - let links = get_links(path.path_entry_hash()?, LinkTypes::AllProposals, None)?; + let links = get_links(link_input(path.path_entry_hash()?, LinkTypes::AllProposals, None))?; let get_input: Vec = links .into_iter() .map(|link| GetInput::new( diff --git a/dnas/converge/zomes/coordinator/converge/src/criterion_comment.rs b/dnas/converge/zomes/coordinator/converge/src/criterion_comment.rs index 4aa5dbc..ba95dac 100644 --- a/dnas/converge/zomes/coordinator/converge/src/criterion_comment.rs +++ b/dnas/converge/zomes/coordinator/converge/src/criterion_comment.rs @@ -1,5 +1,7 @@ use hdk::prelude::*; use converge_integrity::*; +use zome_utils::*; + #[derive(Serialize, Deserialize, Debug)] pub struct CreateCriterionCommentInput { pub criterion_comment: CriterionComment, @@ -30,11 +32,11 @@ pub fn create_criterion_comment( pub fn get_criterion_comment( original_criterion_comment_hash: ActionHash, ) -> ExternResult> { - let links = get_links( + let links = get_links(link_input( original_criterion_comment_hash.clone(), LinkTypes::CriterionCommentUpdates, None, - )?; + ))?; let latest_link = links .into_iter() .max_by(|link_a, link_b| link_a.timestamp.cmp(&link_b.timestamp)); diff --git a/dnas/converge/zomes/coordinator/converge/src/criterion_to_criteria.rs b/dnas/converge/zomes/coordinator/converge/src/criterion_to_criteria.rs index de9135a..fcf856e 100644 --- a/dnas/converge/zomes/coordinator/converge/src/criterion_to_criteria.rs +++ b/dnas/converge/zomes/coordinator/converge/src/criterion_to_criteria.rs @@ -1,5 +1,7 @@ use hdk::prelude::*; use converge_integrity::*; +use zome_utils::*; + use std::collections::HashSet; #[derive(Serialize, Deserialize, Debug)] pub struct AddCriterionForCriterionInput { @@ -22,7 +24,7 @@ pub fn add_criterion_for_criterion( pub fn get_criteria_for_criterion( criterion_hash: ActionHash, ) -> ExternResult> { - let links = get_links(criterion_hash, LinkTypes::CriterionToCriteria, None)?; + let links = get_links(link_input(criterion_hash, LinkTypes::CriterionToCriteria, None))?; let mut seen_targets = HashSet::new(); let get_input: Vec = links .into_iter() diff --git a/dnas/converge/zomes/coordinator/converge/src/criterion_to_criterion_comments.rs b/dnas/converge/zomes/coordinator/converge/src/criterion_to_criterion_comments.rs index de3015e..4d8500b 100644 --- a/dnas/converge/zomes/coordinator/converge/src/criterion_to_criterion_comments.rs +++ b/dnas/converge/zomes/coordinator/converge/src/criterion_to_criterion_comments.rs @@ -1,5 +1,7 @@ use hdk::prelude::*; use converge_integrity::*; +use zome_utils::*; + #[derive(Serialize, Deserialize, Debug)] pub struct AddCriterionCommentForCriterionInput { pub base_criterion_hash: ActionHash, @@ -21,11 +23,11 @@ pub fn add_criterion_comment_for_criterion( pub fn get_criterion_comments_for_criterion( criterion_hash: ActionHash, ) -> ExternResult> { - let links = get_links( + let links = get_links(link_input( criterion_hash, LinkTypes::CriterionToCriterionComments, None, - )?; + ))?; let get_input: Vec = links .into_iter() .map(|link| GetInput::new( @@ -54,11 +56,11 @@ pub struct RemoveCriterionCommentForCriterionInput { pub fn remove_criterion_comment_for_criterion( input: RemoveCriterionCommentForCriterionInput, ) -> ExternResult<()> { - let links = get_links( + let links = get_links(link_input( input.base_criterion_hash.clone(), LinkTypes::CriterionToCriterionComments, None, - )?; + ))?; for link in links { if ActionHash::try_from(link.target.clone()) .map_err(|_| { diff --git a/dnas/converge/zomes/coordinator/converge/src/deliberation.rs b/dnas/converge/zomes/coordinator/converge/src/deliberation.rs index 7a7543a..ba71752 100644 --- a/dnas/converge/zomes/coordinator/converge/src/deliberation.rs +++ b/dnas/converge/zomes/coordinator/converge/src/deliberation.rs @@ -1,5 +1,7 @@ use hdk::prelude::*; use converge_integrity::*; +use zome_utils::*; + #[hdk_extern] pub fn create_deliberation(deliberation: Deliberation) -> ExternResult { debug!("create_deliberation: {:?}", deliberation); @@ -25,11 +27,11 @@ pub fn create_deliberation(deliberation: Deliberation) -> ExternResult { pub fn get_deliberation( original_deliberation_hash: ActionHash, ) -> ExternResult> { - let links = get_links( + let links = get_links(link_input( original_deliberation_hash.clone(), LinkTypes::DeliberationUpdates, None, - )?; + ))?; let latest_link = links .into_iter() .max_by(|link_a, link_b| link_a.timestamp.cmp(&link_b.timestamp)); diff --git a/dnas/converge/zomes/coordinator/converge/src/deliberation_to_criteria.rs b/dnas/converge/zomes/coordinator/converge/src/deliberation_to_criteria.rs index 2943db3..d898286 100644 --- a/dnas/converge/zomes/coordinator/converge/src/deliberation_to_criteria.rs +++ b/dnas/converge/zomes/coordinator/converge/src/deliberation_to_criteria.rs @@ -1,5 +1,7 @@ use hdk::prelude::*; use converge_integrity::*; +use zome_utils::*; + #[derive(Serialize, Deserialize, Debug)] pub struct AddCriterionForDeliberationInput { pub base_deliberation_hash: ActionHash, @@ -27,7 +29,7 @@ pub fn add_criterion_for_deliberation( pub fn get_criteria_for_deliberation( deliberation_hash: ActionHash, ) -> ExternResult> { - let links = get_links(deliberation_hash, LinkTypes::DeliberationToCriteria, None)?; + let links = get_links(link_input(deliberation_hash, LinkTypes::DeliberationToCriteria, None))?; let get_input: Vec = links .into_iter() .map(|link| GetInput::new( @@ -51,7 +53,7 @@ pub fn get_criteria_for_deliberation( pub fn get_deliberations_for_criterion( criterion_hash: ActionHash, ) -> ExternResult> { - let links = get_links(criterion_hash, LinkTypes::CriterionToDeliberations, None)?; + let links = get_links(link_input(criterion_hash, LinkTypes::CriterionToDeliberations, None))?; let get_input: Vec = links .into_iter() .map(|link| GetInput::new( @@ -80,11 +82,11 @@ pub struct RemoveCriterionForDeliberationInput { pub fn remove_criterion_for_deliberation( input: RemoveCriterionForDeliberationInput, ) -> ExternResult<()> { - let links = get_links( + let links = get_links(link_input( input.base_deliberation_hash.clone(), LinkTypes::DeliberationToCriteria, None, - )?; + ))?; for link in links { if ActionHash::try_from(link.target.clone()) .map_err(|_| { @@ -96,11 +98,11 @@ pub fn remove_criterion_for_deliberation( delete_link(link.create_link_hash)?; } } - let links = get_links( + let links = get_links(link_input( input.target_criterion_hash.clone(), LinkTypes::CriterionToDeliberations, None, - )?; + ))?; for link in links { if ActionHash::try_from(link.target.clone()) .map_err(|_| { diff --git a/dnas/converge/zomes/coordinator/converge/src/deliberation_to_proposals.rs b/dnas/converge/zomes/coordinator/converge/src/deliberation_to_proposals.rs index 0a4b85f..f9132b1 100644 --- a/dnas/converge/zomes/coordinator/converge/src/deliberation_to_proposals.rs +++ b/dnas/converge/zomes/coordinator/converge/src/deliberation_to_proposals.rs @@ -1,5 +1,7 @@ use hdk::prelude::*; use converge_integrity::*; +use zome_utils::*; + #[derive(Serialize, Deserialize, Debug)] pub struct AddProposalForDeliberationInput { pub base_deliberation_hash: ActionHash, @@ -27,7 +29,7 @@ pub fn add_proposal_for_deliberation( pub fn get_proposals_for_deliberation( deliberation_hash: ActionHash, ) -> ExternResult> { - let links = get_links(deliberation_hash, LinkTypes::DeliberationToProposals, None)?; + let links = get_links(link_input(deliberation_hash, LinkTypes::DeliberationToProposals, None))?; let get_input: Vec = links .into_iter() .map(|link| GetInput::new( @@ -51,7 +53,7 @@ pub fn get_proposals_for_deliberation( pub fn get_deliberations_for_proposal( proposal_hash: ActionHash, ) -> ExternResult> { - let links = get_links(proposal_hash, LinkTypes::ProposalToDeliberations, None)?; + let links = get_links(link_input(proposal_hash, LinkTypes::ProposalToDeliberations, None))?; let get_input: Vec = links .into_iter() .map(|link| GetInput::new( @@ -80,11 +82,11 @@ pub struct RemoveProposalForDeliberationInput { pub fn remove_proposal_for_deliberation( input: RemoveProposalForDeliberationInput, ) -> ExternResult<()> { - let links = get_links( + let links = get_links(link_input( input.base_deliberation_hash.clone(), LinkTypes::DeliberationToProposals, None, - )?; + ))?; for link in links { if ActionHash::try_from(link.target.clone()) .map_err(|_| { @@ -96,11 +98,11 @@ pub fn remove_proposal_for_deliberation( delete_link(link.create_link_hash)?; } } - let links = get_links( + let links = get_links(link_input( input.target_proposal_hash.clone(), LinkTypes::ProposalToDeliberations, None, - )?; + ))?; for link in links { if ActionHash::try_from(link.target.clone()) .map_err(|_| { diff --git a/dnas/converge/zomes/coordinator/converge/src/deliberator_to_deliberations.rs b/dnas/converge/zomes/coordinator/converge/src/deliberator_to_deliberations.rs index 7c54c8f..edb9859 100644 --- a/dnas/converge/zomes/coordinator/converge/src/deliberator_to_deliberations.rs +++ b/dnas/converge/zomes/coordinator/converge/src/deliberator_to_deliberations.rs @@ -1,5 +1,7 @@ use hdk::prelude::*; use converge_integrity::*; +use zome_utils::*; + #[derive(Serialize, Deserialize, Debug)] pub struct AddDeliberationForDeliberatorInput { pub base_deliberator: AgentPubKey, @@ -27,7 +29,7 @@ pub fn add_deliberation_for_deliberator( pub fn get_deliberations_for_deliberator( deliberator: AgentPubKey, ) -> ExternResult> { - let links = get_links(deliberator, LinkTypes::DeliberatorToDeliberations, None)?; + let links = get_links(link_input(deliberator, LinkTypes::DeliberatorToDeliberations, None))?; let get_input: Vec = links .into_iter() .map(|link| GetInput::new( @@ -51,11 +53,11 @@ pub fn get_deliberations_for_deliberator( pub fn get_deliberators_for_deliberation( deliberation_hash: ActionHash, ) -> ExternResult> { - let links = get_links( + let links = get_links(link_input( deliberation_hash, LinkTypes::DeliberationToDeliberators, None, - )?; + ))?; let agents: Vec = links .into_iter() .map(|link| AgentPubKey::from( @@ -77,11 +79,11 @@ pub struct RemoveDeliberationForDeliberatorInput { pub fn remove_deliberation_for_deliberator( input: RemoveDeliberationForDeliberatorInput, ) -> ExternResult<()> { - let links = get_links( + let links = get_links(link_input( input.base_deliberator.clone(), LinkTypes::DeliberatorToDeliberations, None, - )?; + ))?; for link in links { if ActionHash::try_from(link.target.clone()) .map_err(|_| { @@ -93,11 +95,11 @@ pub fn remove_deliberation_for_deliberator( delete_link(link.create_link_hash)?; } } - let links = get_links( + let links = get_links(link_input( input.target_deliberation_hash.clone(), LinkTypes::DeliberationToDeliberators, None, - )?; + ))?; for link in links { if AgentPubKey::from( EntryHash::try_from(link.target.clone()) diff --git a/dnas/converge/zomes/coordinator/converge/src/lib.rs b/dnas/converge/zomes/coordinator/converge/src/lib.rs index d6ebc9d..57f226d 100644 --- a/dnas/converge/zomes/coordinator/converge/src/lib.rs +++ b/dnas/converge/zomes/coordinator/converge/src/lib.rs @@ -66,12 +66,15 @@ pub fn new_activity_sender(data: ActivityPayload) -> ExternResult ExternResult { } #[hdk_extern] pub fn get_criteria_for_objector(objector: AgentPubKey) -> ExternResult> { - let links = get_links(objector, LinkTypes::ObjectorToCriteria, None)?; + let links = get_links(link_input(objector, LinkTypes::ObjectorToCriteria, None))?; let get_input: Vec = links .into_iter() .map(|link| GetInput::new( @@ -175,7 +177,7 @@ pub struct AgentPubKeyWithTag { pub fn get_objectors_for_criterion( criterion_hash: ActionHash, ) -> ExternResult> { - let links = get_links(criterion_hash, LinkTypes::CriterionToObjectors, None)?; + let links = get_links(link_input(criterion_hash, LinkTypes::CriterionToObjectors, None))?; let agents: Vec = links .into_iter() .map(|link| { @@ -207,11 +209,11 @@ pub struct RemoveCriterionForObjectorInput { pub fn remove_criterion_for_objector( input: RemoveCriterionForObjectorInput, ) -> ExternResult<()> { - let links = get_links( + let links = get_links(link_input( input.base_objector.clone(), LinkTypes::ObjectorToCriteria, None, - )?; + ))?; for link in links { if ActionHash::try_from(link.target.clone()) .map_err(|_| { @@ -223,11 +225,11 @@ pub fn remove_criterion_for_objector( delete_link(link.create_link_hash)?; } } - let links = get_links( + let links = get_links(link_input( input.target_criterion_hash.clone(), LinkTypes::CriterionToObjectors, None, - )?; + ))?; for link in links { if AgentPubKey::from( EntryHash::try_from(link.target.clone()) diff --git a/dnas/converge/zomes/coordinator/converge/src/proposal_to_criteria.rs b/dnas/converge/zomes/coordinator/converge/src/proposal_to_criteria.rs index fa8de7e..ad38dda 100644 --- a/dnas/converge/zomes/coordinator/converge/src/proposal_to_criteria.rs +++ b/dnas/converge/zomes/coordinator/converge/src/proposal_to_criteria.rs @@ -1,5 +1,7 @@ use hdk::prelude::*; use converge_integrity::*; +use zome_utils::*; + #[derive(Serialize, Deserialize, Debug)] pub struct AddCriterionForProposalInput { pub base_proposal_hash: ActionHash, @@ -29,7 +31,7 @@ pub struct Rating { } #[hdk_extern] pub fn get_ratings_for_proposal(proposal_hash: ActionHash) -> ExternResult> { - let links = get_links(proposal_hash, LinkTypes::ProposalToCriteria, None)?; + let links = get_links(link_input(proposal_hash, LinkTypes::ProposalToCriteria, None))?; let output: Vec = links .into_iter() .map(|link| { @@ -54,7 +56,7 @@ pub fn get_ratings_for_proposal(proposal_hash: ActionHash) -> ExternResult ExternResult> { - let links = get_links(proposal_hash, LinkTypes::ProposalToCriteria, None)?; + let links = get_links(link_input(proposal_hash, LinkTypes::ProposalToCriteria, None))?; let get_input: Vec = links .into_iter() .map(|link| GetInput::new( @@ -83,11 +85,11 @@ pub struct RemoveCriterionForProposalInput { pub fn remove_criterion_for_proposal( input: RemoveCriterionForProposalInput, ) -> ExternResult<()> { - let links = get_links( + let links = get_links(link_input( input.base_proposal_hash.clone(), LinkTypes::ProposalToCriteria, None, - )?; + ))?; for link in links { let me: AgentPubKey = agent_info()?.agent_latest_pubkey.into(); if link.author == me { diff --git a/dnas/converge/zomes/coordinator/converge/src/settings.rs b/dnas/converge/zomes/coordinator/converge/src/settings.rs index 02d3e1d..ae484e3 100644 --- a/dnas/converge/zomes/coordinator/converge/src/settings.rs +++ b/dnas/converge/zomes/coordinator/converge/src/settings.rs @@ -1,5 +1,7 @@ use hdk::prelude::*; use converge_integrity::*; +use zome_utils::*; + #[hdk_extern] pub fn create_settings(settings: Settings) -> ExternResult { let settings_hash = create_entry(&EntryTypes::Settings(settings.clone()))?; @@ -13,11 +15,11 @@ pub fn create_settings(settings: Settings) -> ExternResult { } #[hdk_extern] pub fn get_settings(original_settings_hash: ActionHash) -> ExternResult> { - let links = get_links( + let links = get_links(link_input( original_settings_hash.clone(), LinkTypes::SettingsUpdates, None, - )?; + ))?; let latest_link = links .into_iter() .max_by(|link_a, link_b| link_a.timestamp.cmp(&link_b.timestamp)); diff --git a/dnas/converge/zomes/coordinator/converge/src/supporter_to_criteria.rs b/dnas/converge/zomes/coordinator/converge/src/supporter_to_criteria.rs index b346448..653a6f2 100644 --- a/dnas/converge/zomes/coordinator/converge/src/supporter_to_criteria.rs +++ b/dnas/converge/zomes/coordinator/converge/src/supporter_to_criteria.rs @@ -1,5 +1,7 @@ use hdk::prelude::*; use converge_integrity::*; +use zome_utils::*; + #[derive(Serialize, Deserialize, Debug)] pub struct AddCriterionForSupporterInput { pub base_supporter: AgentPubKey, @@ -10,11 +12,11 @@ pub struct AddCriterionForSupporterInput { pub fn add_criterion_for_supporter( input: AddCriterionForSupporterInput, ) -> ExternResult<()> { - let links = get_links( + let links = get_links(link_input( input.base_supporter.clone(), LinkTypes::ObjectorToCriteria, None, - )?; + ))?; for link in links { if ActionHash::try_from(link.target.clone()) .map_err(|_| { @@ -26,11 +28,11 @@ pub fn add_criterion_for_supporter( delete_link(link.create_link_hash)?; } } - let links = get_links( + let links = get_links(link_input( input.target_criterion_hash.clone(), LinkTypes::CriterionToObjectors, None, - )?; + ))?; for link in links { if AgentPubKey::from( EntryHash::try_from(link.target.clone()) @@ -57,7 +59,7 @@ pub fn add_criterion_for_supporter( } #[hdk_extern] pub fn get_criteria_for_supporter(supporter: AgentPubKey) -> ExternResult> { - let links = get_links(supporter, LinkTypes::SupporterToCriteria, None)?; + let links = get_links(link_input(supporter, LinkTypes::SupporterToCriteria, None))?; let get_input: Vec = links .into_iter() .map(|link| GetInput::new( @@ -86,7 +88,7 @@ pub struct AgentPubKeyWithTag { pub fn get_supporters_for_criterion( criterion_hash: ActionHash, ) -> ExternResult> { - let links = get_links(criterion_hash, LinkTypes::CriterionToSupporters, None)?; + let links = get_links(link_input(criterion_hash, LinkTypes::CriterionToSupporters, None))?; let agents: Vec = links .into_iter() .map(|link| { @@ -117,11 +119,11 @@ pub struct RemoveCriterionForSupporterInput { pub fn remove_criterion_for_supporter( input: RemoveCriterionForSupporterInput, ) -> ExternResult<()> { - let links = get_links( + let links = get_links(link_input( input.base_supporter.clone(), LinkTypes::SupporterToCriteria, None, - )?; + ))?; for link in links { if ActionHash::try_from(link.target.clone()) .map_err(|_| { @@ -133,11 +135,11 @@ pub fn remove_criterion_for_supporter( delete_link(link.create_link_hash)?; } } - let links = get_links( + let links = get_links(link_input( input.target_criterion_hash.clone(), LinkTypes::CriterionToSupporters, None, - )?; + ))?; for link in links { if AgentPubKey::from( EntryHash::try_from(link.target.clone()) diff --git a/dnas/converge/zomes/coordinator/profiles/Cargo.toml b/dnas/converge/zomes/coordinator/profiles/Cargo.toml index 6173432..b002a23 100644 --- a/dnas/converge/zomes/coordinator/profiles/Cargo.toml +++ b/dnas/converge/zomes/coordinator/profiles/Cargo.toml @@ -8,4 +8,4 @@ crate-type = ["cdylib", "rlib"] name = "profiles" [dependencies] -hc_zome_profiles_coordinator = { git = "https://github.com/holochain-open-dev/profiles", branch = "for-hdk-v0.2.3" } +hc_zome_profiles_coordinator = { git = "https://github.com/holochain-open-dev/profiles", branch = "for-hdk-v0.3.0-beta-dev.33" } \ No newline at end of file diff --git a/dnas/converge/zomes/integrity/converge/src/lib.rs b/dnas/converge/zomes/integrity/converge/src/lib.rs index 57eb755..b72138d 100644 --- a/dnas/converge/zomes/integrity/converge/src/lib.rs +++ b/dnas/converge/zomes/integrity/converge/src/lib.rs @@ -27,14 +27,14 @@ pub use deliberation::*; use hdi::prelude::*; #[derive(Serialize, Deserialize)] #[serde(tag = "type")] -#[hdk_entry_defs] +#[hdk_entry_types] #[unit_enum(UnitEntryTypes)] pub enum EntryTypes { Deliberation(Deliberation), Criterion(Criterion), Proposal(Proposal), CriterionComment(CriterionComment), - #[entry_def(name = "Settings", visibility = "private")] + #[entry_type(name = "Settings", visibility = "private")] Settings(Settings), } #[derive(Serialize, Deserialize)] diff --git a/dnas/converge/zomes/integrity/profiles/Cargo.toml b/dnas/converge/zomes/integrity/profiles/Cargo.toml index 512520d..dd2f0c1 100644 --- a/dnas/converge/zomes/integrity/profiles/Cargo.toml +++ b/dnas/converge/zomes/integrity/profiles/Cargo.toml @@ -8,4 +8,4 @@ crate-type = ["cdylib", "rlib"] name = "profiles_integrity" [dependencies] -hc_zome_profiles_integrity = { git = "https://github.com/holochain-open-dev/profiles", branch = "for-hdk-v0.2.3" } \ No newline at end of file +hc_zome_profiles_integrity = { git = "https://github.com/holochain-open-dev/profiles", branch = "for-hdk-v0.3.0-beta-dev.33" } \ No newline at end of file diff --git a/flake.lock b/flake.lock index b655425..efedd1e 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "cargo-chef": { "flake": false, "locked": { - "lastModified": 1672901199, - "narHash": "sha256-MHTuR4aQ1rQaBKx1vWDy2wbvcT0ZAzpkVB2zylSC+k0=", + "lastModified": 1695999026, + "narHash": "sha256-UtLoZd7YBRSF9uXStfC3geEFqSqZXFh1rLHaP8hre0Y=", "owner": "LukeMathWalker", "repo": "cargo-chef", - "rev": "5c9f11578a2e0783cce27666737d50f84510b8b5", + "rev": "6e96ae5cd023b718ae40d608981e50a6e7d7facf", "type": "github" }, "original": { @@ -36,20 +36,17 @@ }, "crane": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", "nixpkgs": [ "holochain-flake", "nixpkgs" - ], - "rust-overlay": "rust-overlay" + ] }, "locked": { - "lastModified": 1675475924, - "narHash": "sha256-KWdfV9a6+zG6Ij/7PZYLnomjBZZUu8gdRy+hfjGrrJQ=", + "lastModified": 1707363936, + "narHash": "sha256-QbqyvGFYt84QNOQLOOTWplZZkzkyDhYrAl/N/9H0vFM=", "owner": "ipetkov", "repo": "crane", - "rev": "1bde9c762ebf26de9f8ecf502357c92105bc4577", + "rev": "9107434eda6991e9388ad87b815dafa337446d16", "type": "github" }, "original": { @@ -61,11 +58,11 @@ "crate2nix": { "flake": false, "locked": { - "lastModified": 1693149153, - "narHash": "sha256-HUszQcnIal1FFRAWraODDbxTp0HECwczRTD+Zf0v9o0=", + "lastModified": 1706909251, + "narHash": "sha256-T7G9Uhh77P0kKri/u+Mwa/4YnXwdPsJSwYCiJCCW+fs=", "owner": "kolloch", "repo": "crate2nix", - "rev": "8749f46953b46d44fd181b002399e4a20371f323", + "rev": "15656bb6cb15f55ee3344bf4362e6489feb93db6", "type": "github" }, "original": { @@ -93,27 +90,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -127,11 +108,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1675295133, - "narHash": "sha256-dU8fuLL98WFXG0VnRgM00bqKX6CEPBLybhiIDIgO45o=", + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bf53492df08f3178ce85e0c9df8ed8d03c030c9f", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "type": "github" }, "original": { @@ -140,30 +121,15 @@ } }, "flake-utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -175,16 +141,16 @@ "holochain": { "flake": false, "locked": { - "lastModified": 1694632043, - "narHash": "sha256-5QWUpWnwuzUi3hROrOZyQNla8iGdr+oGCH2nniRePBE=", + "lastModified": 1711501268, + "narHash": "sha256-jr2LIJ8b85XXvLaugpvjne6x8zj8WawXcwPSuw1XOWg=", "owner": "holochain", "repo": "holochain", - "rev": "1f59d33623031eefe76b5f3573970c9c33f21877", + "rev": "bc70d3d833c6cf36e1c8006b2cc1e9ba8d3bd6bd", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.2.2", + "ref": "holochain-0.3.0-beta-dev.43", "repo": "holochain", "type": "github" } @@ -196,7 +162,7 @@ "crane": "crane", "crate2nix": "crate2nix", "empty": "empty", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts", "holochain": [ "holochain-flake", @@ -214,24 +180,47 @@ "nixpkgs": "nixpkgs", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "repo-git": "repo-git", - "rust-overlay": "rust-overlay_2", + "rust-overlay": "rust-overlay", "scaffolding": [ "holochain-flake", "empty" ], "versions": [ - "versions" + "holochain-nix-versions" ] }, "locked": { - "lastModified": 1697955857, - "narHash": "sha256-v9SlW4mUYJpCbdULWUux3hvt3eHZgncM84EYeNrGMdA=", + "lastModified": 1711952995, + "narHash": "sha256-kCQx/vmtKkG8cLB6PJyGNvuNLzwkrQTP+ZAVi3l3ohM=", + "owner": "holochain", + "repo": "holochain", + "rev": "f1abe4db80f16a0c66c3f7a6485b2972a0a89eb2", + "type": "github" + }, + "original": { + "owner": "holochain", + "repo": "holochain", + "type": "github" + } + }, + "holochain-nix-versions": { + "inputs": { + "holochain": "holochain", + "lair": "lair", + "launcher": "launcher", + "scaffolding": "scaffolding" + }, + "locked": { + "dir": "versions/weekly", + "lastModified": 1711952995, + "narHash": "sha256-kCQx/vmtKkG8cLB6PJyGNvuNLzwkrQTP+ZAVi3l3ohM=", "owner": "holochain", "repo": "holochain", - "rev": "942acf43cdc488cbef592d206137c5edbffce021", + "rev": "f1abe4db80f16a0c66c3f7a6485b2972a0a89eb2", "type": "github" }, "original": { + "dir": "versions/weekly", "owner": "holochain", "repo": "holochain", "type": "github" @@ -240,16 +229,16 @@ "lair": { "flake": false, "locked": { - "lastModified": 1691746070, - "narHash": "sha256-CHsTI4yIlkfnYWx2sNgzAoDBvKTLIChybzyJNbB1sMU=", + "lastModified": 1709335027, + "narHash": "sha256-rKMhh7TLuR1lqze2YFWZCGYKZQoB4dZxjpX3sb7r7Jk=", "owner": "holochain", "repo": "lair", - "rev": "6ab41b60744515f1760669db6fc5272298a5f324", + "rev": "826be915efc839d1d1b8a2156b158999b8de8d5b", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.3.0", + "ref": "lair_keystore-v0.4.4", "repo": "lair", "type": "github" } @@ -257,27 +246,27 @@ "launcher": { "flake": false, "locked": { - "lastModified": 1684183666, - "narHash": "sha256-rOE/W/BBYyZKOyypKb8X9Vpc4ty1TNRoI/fV5+01JPw=", + "lastModified": 1706294585, + "narHash": "sha256-92Qc6hBMFfHo3w1m1+EpNAAV+7whpkgRHiGqNiXaMCg=", "owner": "holochain", "repo": "launcher", - "rev": "75ecdd0aa191ed830cc209a984a6030e656042ff", + "rev": "51a45a7141abc98a861b34b288b384f50f359485", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.2", + "ref": "holochain-weekly", "repo": "launcher", "type": "github" } }, "nix-filter": { "locked": { - "lastModified": 1675361037, - "narHash": "sha256-CTbDuDxFD3U3g/dWUB+r+B/snIe+qqP1R+1myuFGe2I=", + "lastModified": 1705332318, + "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", "owner": "numtide", "repo": "nix-filter", - "rev": "e1b2f96c2a31415f362268bc48c3fccf47dff6eb", + "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", "type": "github" }, "original": { @@ -288,11 +277,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697059129, - "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -304,11 +293,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1675183161, - "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", "type": "github" }, "original": { @@ -322,11 +311,11 @@ "pre-commit-hooks-nix": { "flake": false, "locked": { - "lastModified": 1676513100, - "narHash": "sha256-MK39nQV86L2ag4TmcK5/+r1ULpzRLPbbfvWbPvIoYJE=", + "lastModified": 1707297608, + "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5f0cba88ac4d6dd8cad5c6f6f1540b3d6a21a798", + "rev": "0db2e67ee49910adfa13010e7f012149660af7f0", "type": "github" }, "original": { @@ -354,54 +343,27 @@ "flake-parts" ], "holochain-flake": "holochain-flake", + "holochain-nix-versions": "holochain-nix-versions", "nixpkgs": [ "holochain-flake", "nixpkgs" - ], - "versions": "versions" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "holochain-flake", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "holochain-flake", - "crane", - "nixpkgs" ] - }, - "locked": { - "lastModified": 1675391458, - "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" } }, - "rust-overlay_2": { + "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "holochain-flake", "nixpkgs" ] }, "locked": { - "lastModified": 1697595136, - "narHash": "sha256-9honwiIeMbBKi7FzfEy89f1ShUiXz/gVxZSS048pKyc=", + "lastModified": 1711937855, + "narHash": "sha256-jlfDBRtsLoqRNFxtQtG47wsrwVsQSV4AqoMgWG6Bvng=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a2ccfb2134622b28668a274e403ba6f075ae1223", + "rev": "3f46a51b47f56c24b4d7e8db8fb8e73118923f96", "type": "github" }, "original": { @@ -413,16 +375,16 @@ "scaffolding": { "flake": false, "locked": { - "lastModified": 1695674679, - "narHash": "sha256-IwgQbgitUo61ZXYSXBAro5ThfYy/yMGmzZGTb3c6sT0=", + "lastModified": 1710952697, + "narHash": "sha256-ANiylQ4Tm0x4ErOn1EvB8P/5SmgMGf8ZyXg8tGzVGRQ=", "owner": "holochain", "repo": "scaffolding", - "rev": "821439b8dd49d5ce594be04c4720df25e88a4dbc", + "rev": "a2e388d93a682f2969de2819f9bbbb228819b7d8", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.2", + "ref": "holochain-weekly", "repo": "scaffolding", "type": "github" } @@ -441,29 +403,6 @@ "repo": "default", "type": "github" } - }, - "versions": { - "inputs": { - "holochain": "holochain", - "lair": "lair", - "launcher": "launcher", - "scaffolding": "scaffolding" - }, - "locked": { - "dir": "versions/0_2", - "lastModified": 1697955857, - "narHash": "sha256-v9SlW4mUYJpCbdULWUux3hvt3eHZgncM84EYeNrGMdA=", - "owner": "holochain", - "repo": "holochain", - "rev": "942acf43cdc488cbef592d206137c5edbffce021", - "type": "github" - }, - "original": { - "dir": "versions/0_2", - "owner": "holochain", - "repo": "holochain", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 89dc1ce..6919378 100644 --- a/flake.nix +++ b/flake.nix @@ -1,36 +1,34 @@ { - description = "Convergent group decision making"; + description = "Template for Holochain app development"; inputs = { - versions.url = "github:holochain/holochain?dir=versions/0_2"; - - holochain-flake.url = "github:holochain/holochain"; - holochain-flake.inputs.versions.follows = "versions"; + holochain-nix-versions.url = "github:holochain/holochain/?dir=versions/weekly"; + holochain-flake = { + url = "github:holochain/holochain"; + inputs.versions.follows = "holochain-nix-versions"; + }; nixpkgs.follows = "holochain-flake/nixpkgs"; flake-parts.follows = "holochain-flake/flake-parts"; }; - outputs = inputs: - inputs.flake-parts.lib.mkFlake + outputs = inputs @ { flake-parts, holochain-flake, ... }: + flake-parts.lib.mkFlake { inherit inputs; } { - systems = builtins.attrNames inputs.holochain-flake.devShells; + systems = builtins.attrNames holochain-flake.devShells; perSystem = - { inputs' + { inputs , config , pkgs , system , ... }: { devShells.default = pkgs.mkShell { - inputsFrom = [ inputs'.holochain-flake.devShells.holonix ]; - packages = [ - pkgs.nodejs-18_x - # more packages go here - ]; + inputsFrom = [ holochain-flake.devShells.${system}.holonix ]; + packages = [ pkgs.nodejs-18_x ]; }; }; }; diff --git a/package-lock.json b/package-lock.json index 649ce1f..14a7b31 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,9 +74,9 @@ } }, "node_modules/@ctrl/tinycolor": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-4.0.2.tgz", - "integrity": "sha512-fKQinXE9pJ83J1n+C3rDl2xNLJwfoYNvXLRy5cYZA9hBJJw2q+sbb/AOSNKmLxnTWyNTmy4994dueSwP4opi5g==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-4.0.3.tgz", + "integrity": "sha512-e9nEVehVJwkymQpkGhdSNzLT2Lr9UTTby+JePq4Z2SxBbOQjY7pLgSouAaXvfaGQVSAaY0U4eJdwfSDmCbItcw==", "engines": { "node": ">=14" } @@ -461,19 +461,19 @@ } }, "node_modules/@floating-ui/core": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.5.3.tgz", - "integrity": "sha512-O0WKDOo0yhJuugCx6trZQj5jVJ9yR0ystG2JaNAemYUWce+pmM6WUEFIibnWyEJKdrDxhm75NoSRME35FNaM/Q==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.0.tgz", + "integrity": "sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==", "dependencies": { - "@floating-ui/utils": "^0.2.0" + "@floating-ui/utils": "^0.2.1" } }, "node_modules/@floating-ui/dom": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.4.tgz", - "integrity": "sha512-jByEsHIY+eEdCjnTVu+E3ephzTOzkQ8hgUfGwos+bg7NlH33Zc5uO+QHz1mrQUOgIKKDD1RtS201P9NvAfq3XQ==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.3.tgz", + "integrity": "sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==", "dependencies": { - "@floating-ui/core": "^1.5.3", + "@floating-ui/core": "^1.0.0", "@floating-ui/utils": "^0.2.0" } }, @@ -488,13 +488,13 @@ "integrity": "sha512-Dn5pTV/m3XaK1Zvq3liw/vQUt7goM7Y84x2zUyH8cb9CNMs4kPCNHs3kalbJZ/ymzFvwcdiLwwNW8AKk+WWN5A==" }, "node_modules/@holochain-open-dev/elements": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@holochain-open-dev/elements/-/elements-0.8.4.tgz", - "integrity": "sha512-9iT59XcDJyuV8m92oPAGBaHJ7MR3pDN7mSlxj4J99HqzrxFC/IK2NaPKdCc4kfmbH28ABpavppv4/5y8Ab4CAA==", + "version": "0.300.0-dev.0", + "resolved": "https://registry.npmjs.org/@holochain-open-dev/elements/-/elements-0.300.0-dev.0.tgz", + "integrity": "sha512-oyfnkg4hksQazQN4AVShgL3Hzg2GJEmQeE3z0G8cN5y4+0n3/eCfQsrtvZO4l+Xo01BH9llVRk6LC6EVsMP2Uw==", "dependencies": { "@holo-host/identicon": "^0.1.0", - "@holochain-open-dev/stores": "^0.7.12", - "@holochain/client": "^0.16.0", + "@holochain-open-dev/stores": "0.300.0-dev.0", + "@holochain/client": "^0.17.0-dev.7", "@lit/localize": "^0.12.0", "@mdi/js": "^7.1.96", "@shoelace-style/shoelace": "^2.11.0", @@ -505,25 +505,10 @@ "prosemirror-view": "^1.31.3" } }, - "node_modules/@holochain-open-dev/elements/node_modules/@holochain-open-dev/stores": { - "version": "0.7.16", - "resolved": "https://registry.npmjs.org/@holochain-open-dev/stores/-/stores-0.7.16.tgz", - "integrity": "sha512-hBiTq7d2fIgqMyhQHlyPWi9RMkfhjFOsQG+1MRSleIOZRPepp/IkFeg8yqjImbdEj9GgHkZQPV72JZyWAohqgg==", - "dependencies": { - "@alenaksu/json-viewer": "^2.0.1", - "@holochain-open-dev/utils": "^0.16.2", - "@holochain/client": "^0.16.0", - "@scoped-elements/cytoscape": "^0.2.0", - "@shoelace-style/shoelace": "^2.11.2", - "lit": "^3.0.2", - "lit-svelte-stores": "^0.3.0", - "svelte": "^3.53.1" - } - }, "node_modules/@holochain-open-dev/elements/node_modules/@holochain/client": { - "version": "0.16.7", - "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.16.7.tgz", - "integrity": "sha512-wCFm71HUnZ9vxmuguqKqDOhqjE5Qq5e8bM4q9W1ginel3UAZF3LmYym5Ny4pOG2aqf2tD5mpf7xTZjBxPDGnjA==", + "version": "0.17.0-dev.7", + "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.17.0-dev.7.tgz", + "integrity": "sha512-dr0S+4Au/sS/PXu0T7Lm1uqwkPVpcWvbMBL9xD7bRv4pfWMratGdP3OpeA356l4bkpSJxkOltz2o2kN3pW3tRQ==", "dependencies": { "@bitgo/blake2b": "^3.2.4", "@holochain/serialization": "^0.1.0-beta-rc.3", @@ -541,50 +526,50 @@ } }, "node_modules/@holochain-open-dev/elements/node_modules/@lit/reactive-element": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.3.tgz", - "integrity": "sha512-e067EuTNNgOHm1tZcc0Ia7TCzD/9ZpoPegHKgesrGK6pSDRGkGDAQbYuQclqLPIoJ9eC8Kb9mYtGryWcM5AywA==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.4.tgz", + "integrity": "sha512-GFn91inaUa2oHLak8awSIigYz0cU0Payr1rcFsrkf5OJ5eSPxElyZfKh0f2p9FsTiZWXQdWGJeXZICEfXXYSXQ==", "dependencies": { - "@lit-labs/ssr-dom-shim": "^1.1.2" + "@lit-labs/ssr-dom-shim": "^1.2.0" } }, "node_modules/@holochain-open-dev/elements/node_modules/lit": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lit/-/lit-3.1.1.tgz", - "integrity": "sha512-hF1y4K58+Gqrz+aAPS0DNBwPqPrg6P04DuWK52eMkt/SM9Qe9keWLcFgRcEKOLuDlRZlDsDbNL37Vr7ew1VCuw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lit/-/lit-3.1.2.tgz", + "integrity": "sha512-VZx5iAyMtX7CV4K8iTLdCkMaYZ7ipjJZ0JcSdJ0zIdGxxyurjIn7yuuSxNBD7QmjvcNJwr0JS4cAdAtsy7gZ6w==", "dependencies": { - "@lit/reactive-element": "^2.0.0", - "lit-element": "^4.0.0", - "lit-html": "^3.1.0" + "@lit/reactive-element": "^2.0.4", + "lit-element": "^4.0.4", + "lit-html": "^3.1.2" } }, "node_modules/@holochain-open-dev/elements/node_modules/lit-element": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.0.3.tgz", - "integrity": "sha512-2vhidmC7gGLfnVx41P8UZpzyS0Fb8wYhS5RCm16cMW3oERO0Khd3EsKwtRpOnttuByI5rURjT2dfoA7NlInCNw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.0.4.tgz", + "integrity": "sha512-98CvgulX6eCPs6TyAIQoJZBCQPo80rgXR+dVBs61cstJXqtI+USQZAbA4gFHh6L/mxBx9MrgPLHLsUgDUHAcCQ==", "dependencies": { - "@lit-labs/ssr-dom-shim": "^1.1.2", - "@lit/reactive-element": "^2.0.0", - "lit-html": "^3.1.0" + "@lit-labs/ssr-dom-shim": "^1.2.0", + "@lit/reactive-element": "^2.0.4", + "lit-html": "^3.1.2" } }, "node_modules/@holochain-open-dev/elements/node_modules/lit-html": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.1.1.tgz", - "integrity": "sha512-x/EwfGk2D/f4odSFM40hcGumzqoKv0/SUh6fBO+1Ragez81APrcAMPo1jIrCDd9Sn+Z4CT867HWKViByvkDZUA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.1.2.tgz", + "integrity": "sha512-3OBZSUrPnAHoKJ9AMjRL/m01YJxQMf+TMHanNtTHG68ubjnZxK0RFl102DPzsw4mWnHibfZIBJm3LWCZ/LmMvg==", "dependencies": { "@types/trusted-types": "^2.0.2" } }, "node_modules/@holochain-open-dev/profiles": { - "version": "0.17.3", - "resolved": "https://registry.npmjs.org/@holochain-open-dev/profiles/-/profiles-0.17.3.tgz", - "integrity": "sha512-V6Hn0JV5xYFTIzzqTkrNDrZPwPsqht+OqvZj6k2wHJ0tyGTuRsTCAxks27TG38f7PfXseGxIn7xLtGLLtmJwSw==", - "dependencies": { - "@holochain-open-dev/elements": "^0.8.4", - "@holochain-open-dev/stores": "^0.8.2", - "@holochain-open-dev/utils": "^0.16.2", - "@holochain/client": "^0.16.0", + "version": "0.300.0-dev.0", + "resolved": "https://registry.npmjs.org/@holochain-open-dev/profiles/-/profiles-0.300.0-dev.0.tgz", + "integrity": "sha512-CNyyJNCiWQON1v0UnMMWiNN+C6qsFB0W1bwOGAi0yQKxUMfgwMCLXottQt1hHkHZ0R3xyXaVbBzVyfjH8Z0jZQ==", + "dependencies": { + "@holochain-open-dev/elements": "0.300.0-dev.0", + "@holochain-open-dev/stores": "0.300.0-dev.0", + "@holochain-open-dev/utils": "0.300.0-dev.0", + "@holochain/client": "^0.17.0-dev.7", "@lit/context": "^1.0.1", "@lit/localize": "^0.12.0", "@mdi/js": "^7.1.96", @@ -593,9 +578,9 @@ } }, "node_modules/@holochain-open-dev/profiles/node_modules/@holochain/client": { - "version": "0.16.7", - "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.16.7.tgz", - "integrity": "sha512-wCFm71HUnZ9vxmuguqKqDOhqjE5Qq5e8bM4q9W1ginel3UAZF3LmYym5Ny4pOG2aqf2tD5mpf7xTZjBxPDGnjA==", + "version": "0.17.0-dev.7", + "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.17.0-dev.7.tgz", + "integrity": "sha512-dr0S+4Au/sS/PXu0T7Lm1uqwkPVpcWvbMBL9xD7bRv4pfWMratGdP3OpeA356l4bkpSJxkOltz2o2kN3pW3tRQ==", "dependencies": { "@bitgo/blake2b": "^3.2.4", "@holochain/serialization": "^0.1.0-beta-rc.3", @@ -649,13 +634,13 @@ } }, "node_modules/@holochain-open-dev/stores": { - "version": "0.8.10", - "resolved": "https://registry.npmjs.org/@holochain-open-dev/stores/-/stores-0.8.10.tgz", - "integrity": "sha512-5LlmC8qSgSsn7XCITUd8nxjpk5K0At3eAMj6tdw4+tl4IAEpfx7Vt/yyWAvFl9bQkNGqzv1IH/n0bz22FoFNVA==", + "version": "0.300.0-dev.0", + "resolved": "https://registry.npmjs.org/@holochain-open-dev/stores/-/stores-0.300.0-dev.0.tgz", + "integrity": "sha512-s6knLTAfVHUYR7Y8HYiLL9JJtr86b2kBQDQVfyDNLcSdf7kwJUjNbza8ZozQ1ON9IDvVC7+LMiQ87H3oJihU0g==", "dependencies": { "@alenaksu/json-viewer": "^2.0.1", - "@holochain-open-dev/utils": "^0.16.2", - "@holochain/client": "^0.16.6", + "@holochain-open-dev/utils": "0.300.0-dev.0", + "@holochain/client": "^0.17.0-dev.7", "@scoped-elements/cytoscape": "^0.2.0", "@shoelace-style/shoelace": "^2.11.2", "lit": "^3.0.2", @@ -664,9 +649,9 @@ } }, "node_modules/@holochain-open-dev/stores/node_modules/@holochain/client": { - "version": "0.16.7", - "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.16.7.tgz", - "integrity": "sha512-wCFm71HUnZ9vxmuguqKqDOhqjE5Qq5e8bM4q9W1ginel3UAZF3LmYym5Ny4pOG2aqf2tD5mpf7xTZjBxPDGnjA==", + "version": "0.17.0-dev.7", + "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.17.0-dev.7.tgz", + "integrity": "sha512-dr0S+4Au/sS/PXu0T7Lm1uqwkPVpcWvbMBL9xD7bRv4pfWMratGdP3OpeA356l4bkpSJxkOltz2o2kN3pW3tRQ==", "dependencies": { "@bitgo/blake2b": "^3.2.4", "@holochain/serialization": "^0.1.0-beta-rc.3", @@ -684,48 +669,48 @@ } }, "node_modules/@holochain-open-dev/stores/node_modules/@lit/reactive-element": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.3.tgz", - "integrity": "sha512-e067EuTNNgOHm1tZcc0Ia7TCzD/9ZpoPegHKgesrGK6pSDRGkGDAQbYuQclqLPIoJ9eC8Kb9mYtGryWcM5AywA==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.4.tgz", + "integrity": "sha512-GFn91inaUa2oHLak8awSIigYz0cU0Payr1rcFsrkf5OJ5eSPxElyZfKh0f2p9FsTiZWXQdWGJeXZICEfXXYSXQ==", "dependencies": { - "@lit-labs/ssr-dom-shim": "^1.1.2" + "@lit-labs/ssr-dom-shim": "^1.2.0" } }, "node_modules/@holochain-open-dev/stores/node_modules/lit": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lit/-/lit-3.1.1.tgz", - "integrity": "sha512-hF1y4K58+Gqrz+aAPS0DNBwPqPrg6P04DuWK52eMkt/SM9Qe9keWLcFgRcEKOLuDlRZlDsDbNL37Vr7ew1VCuw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lit/-/lit-3.1.2.tgz", + "integrity": "sha512-VZx5iAyMtX7CV4K8iTLdCkMaYZ7ipjJZ0JcSdJ0zIdGxxyurjIn7yuuSxNBD7QmjvcNJwr0JS4cAdAtsy7gZ6w==", "dependencies": { - "@lit/reactive-element": "^2.0.0", - "lit-element": "^4.0.0", - "lit-html": "^3.1.0" + "@lit/reactive-element": "^2.0.4", + "lit-element": "^4.0.4", + "lit-html": "^3.1.2" } }, "node_modules/@holochain-open-dev/stores/node_modules/lit-element": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.0.3.tgz", - "integrity": "sha512-2vhidmC7gGLfnVx41P8UZpzyS0Fb8wYhS5RCm16cMW3oERO0Khd3EsKwtRpOnttuByI5rURjT2dfoA7NlInCNw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.0.4.tgz", + "integrity": "sha512-98CvgulX6eCPs6TyAIQoJZBCQPo80rgXR+dVBs61cstJXqtI+USQZAbA4gFHh6L/mxBx9MrgPLHLsUgDUHAcCQ==", "dependencies": { - "@lit-labs/ssr-dom-shim": "^1.1.2", - "@lit/reactive-element": "^2.0.0", - "lit-html": "^3.1.0" + "@lit-labs/ssr-dom-shim": "^1.2.0", + "@lit/reactive-element": "^2.0.4", + "lit-html": "^3.1.2" } }, "node_modules/@holochain-open-dev/stores/node_modules/lit-html": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.1.1.tgz", - "integrity": "sha512-x/EwfGk2D/f4odSFM40hcGumzqoKv0/SUh6fBO+1Ragez81APrcAMPo1jIrCDd9Sn+Z4CT867HWKViByvkDZUA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.1.2.tgz", + "integrity": "sha512-3OBZSUrPnAHoKJ9AMjRL/m01YJxQMf+TMHanNtTHG68ubjnZxK0RFl102DPzsw4mWnHibfZIBJm3LWCZ/LmMvg==", "dependencies": { "@types/trusted-types": "^2.0.2" } }, "node_modules/@holochain-open-dev/utils": { - "version": "0.16.4", - "resolved": "https://registry.npmjs.org/@holochain-open-dev/utils/-/utils-0.16.4.tgz", - "integrity": "sha512-XQt5XGp2VtLFvxhy35B8GSebcGVN/cPRQcdKzzDLULH41YYyZppnUlgdGF9WU36gJShvqn/8W9xF2xmZvuSnZA==", + "version": "0.300.0-dev.0", + "resolved": "https://registry.npmjs.org/@holochain-open-dev/utils/-/utils-0.300.0-dev.0.tgz", + "integrity": "sha512-sqpnfK3xh5ufMD98HHOhVH2iUnJ+xbe87BWLnJ9g3iQ/Dkp7yeM22HanBV8GKw5lr8CPgOKKlJ1EQ+q8eGGXag==", "dependencies": { - "@holochain/client": "^0.16.2", - "@msgpack/msgpack": "^2.7.2", + "@holochain/client": "^0.17.0-dev.7", + "@msgpack/msgpack": "^2.8.0", "blakejs": "^1.2.1", "emittery": "^1.0.1", "lodash-es": "^4.17.21", @@ -733,9 +718,9 @@ } }, "node_modules/@holochain-open-dev/utils/node_modules/@holochain/client": { - "version": "0.16.7", - "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.16.7.tgz", - "integrity": "sha512-wCFm71HUnZ9vxmuguqKqDOhqjE5Qq5e8bM4q9W1ginel3UAZF3LmYym5Ny4pOG2aqf2tD5mpf7xTZjBxPDGnjA==", + "version": "0.17.0-dev.7", + "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.17.0-dev.7.tgz", + "integrity": "sha512-dr0S+4Au/sS/PXu0T7Lm1uqwkPVpcWvbMBL9xD7bRv4pfWMratGdP3OpeA356l4bkpSJxkOltz2o2kN3pW3tRQ==", "dependencies": { "@bitgo/blake2b": "^3.2.4", "@holochain/serialization": "^0.1.0-beta-rc.3", @@ -994,9 +979,9 @@ } }, "node_modules/@lit-labs/ssr-dom-shim": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.2.tgz", - "integrity": "sha512-jnOD+/+dSrfTWYfSXBXlo5l5f0q1UuJo3tkbMDCYA2lKUYq79jaxqtGEvnRoh049nt1vdo1+45RinipU6FGY2g==" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.2.0.tgz", + "integrity": "sha512-yWJKmpGE6lUURKAaIltoPIE/wrbY3TEkqQt+X0m+7fQNnAv0keydnYvbiJFP1PnMhizmIWRWOG5KLhYyc/xl+g==" }, "node_modules/@lit/context": { "version": "1.1.0", @@ -1023,9 +1008,9 @@ } }, "node_modules/@lit/react": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@lit/react/-/react-1.0.2.tgz", - "integrity": "sha512-UJ5TQ46DPcJDIzyjbwbj6Iye0XcpCxL2yb03zcWq1BpWchpXS3Z0BPVhg7zDfZLF6JemPml8u/gt/+KwJ/23sg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@lit/react/-/react-1.0.4.tgz", + "integrity": "sha512-6HBvk3AwF46z17fTkZp5F7/EdCJW9xqqQgYKr3sQGgoEJv0TKV1voWydG4UQQA2RWkoD4SHjy08snSpzyoyd0w==", "peerDependencies": { "@types/react": "17 || 18" } @@ -2138,9 +2123,9 @@ "integrity": "sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==" }, "node_modules/@mdi/js": { - "version": "7.2.96", - "resolved": "https://registry.npmjs.org/@mdi/js/-/js-7.2.96.tgz", - "integrity": "sha512-paR9M9ZT7rKbh2boksNUynuSZMHhqRYnEZOm/KrZTjQ4/FzyhjLHuvw/8XYzP+E7fS4+/Ms/82EN1pl/OFsiIA==" + "version": "7.4.47", + "resolved": "https://registry.npmjs.org/@mdi/js/-/js-7.4.47.tgz", + "integrity": "sha512-KPnNOtm5i2pMabqZxpUz7iQf+mfrYZyKCZ8QNz85czgEt7cuHcGorWfdzUMWYA0SD+a6Hn4FmJ+YhzzzjkTZrQ==" }, "node_modules/@msgpack/msgpack": { "version": "2.8.0", @@ -2273,9 +2258,9 @@ "integrity": "sha512-Hf45HeO+vdQblabpyZOTxJ4ZeZsmIUYXXPmoYrrR4OJ5OKxL+bhMz5mK8JXgl7HsoEowfz7+e248UGi861de9Q==" }, "node_modules/@shoelace-style/shoelace": { - "version": "2.12.0", - "resolved": "https://registry.npmjs.org/@shoelace-style/shoelace/-/shoelace-2.12.0.tgz", - "integrity": "sha512-1Amirj0c5WLkymDcP6ZQmBfMC6zTNmGGK7/mjmGq4yhljrVaECVlBoKm0tfmo1jd3r8XJ8xYbQ8cxPAlwiDDvw==", + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/@shoelace-style/shoelace/-/shoelace-2.15.0.tgz", + "integrity": "sha512-Lcg938Y8U2VsHqIYewzlt+H1rbrXC4GRSUkTJgXyF8/0YAOlI+srd5OSfIw+/LYmwLP2Peyh398Kae/6tg4PDA==", "dependencies": { "@ctrl/tinycolor": "^4.0.2", "@floating-ui/dom": "^1.5.3", @@ -2295,37 +2280,37 @@ } }, "node_modules/@shoelace-style/shoelace/node_modules/@lit/reactive-element": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.3.tgz", - "integrity": "sha512-e067EuTNNgOHm1tZcc0Ia7TCzD/9ZpoPegHKgesrGK6pSDRGkGDAQbYuQclqLPIoJ9eC8Kb9mYtGryWcM5AywA==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.4.tgz", + "integrity": "sha512-GFn91inaUa2oHLak8awSIigYz0cU0Payr1rcFsrkf5OJ5eSPxElyZfKh0f2p9FsTiZWXQdWGJeXZICEfXXYSXQ==", "dependencies": { - "@lit-labs/ssr-dom-shim": "^1.1.2" + "@lit-labs/ssr-dom-shim": "^1.2.0" } }, "node_modules/@shoelace-style/shoelace/node_modules/lit": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lit/-/lit-3.1.1.tgz", - "integrity": "sha512-hF1y4K58+Gqrz+aAPS0DNBwPqPrg6P04DuWK52eMkt/SM9Qe9keWLcFgRcEKOLuDlRZlDsDbNL37Vr7ew1VCuw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lit/-/lit-3.1.2.tgz", + "integrity": "sha512-VZx5iAyMtX7CV4K8iTLdCkMaYZ7ipjJZ0JcSdJ0zIdGxxyurjIn7yuuSxNBD7QmjvcNJwr0JS4cAdAtsy7gZ6w==", "dependencies": { - "@lit/reactive-element": "^2.0.0", - "lit-element": "^4.0.0", - "lit-html": "^3.1.0" + "@lit/reactive-element": "^2.0.4", + "lit-element": "^4.0.4", + "lit-html": "^3.1.2" } }, "node_modules/@shoelace-style/shoelace/node_modules/lit-element": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.0.3.tgz", - "integrity": "sha512-2vhidmC7gGLfnVx41P8UZpzyS0Fb8wYhS5RCm16cMW3oERO0Khd3EsKwtRpOnttuByI5rURjT2dfoA7NlInCNw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.0.4.tgz", + "integrity": "sha512-98CvgulX6eCPs6TyAIQoJZBCQPo80rgXR+dVBs61cstJXqtI+USQZAbA4gFHh6L/mxBx9MrgPLHLsUgDUHAcCQ==", "dependencies": { - "@lit-labs/ssr-dom-shim": "^1.1.2", - "@lit/reactive-element": "^2.0.0", - "lit-html": "^3.1.0" + "@lit-labs/ssr-dom-shim": "^1.2.0", + "@lit/reactive-element": "^2.0.4", + "lit-html": "^3.1.2" } }, "node_modules/@shoelace-style/shoelace/node_modules/lit-html": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.1.1.tgz", - "integrity": "sha512-x/EwfGk2D/f4odSFM40hcGumzqoKv0/SUh6fBO+1Ragez81APrcAMPo1jIrCDd9Sn+Z4CT867HWKViByvkDZUA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.1.2.tgz", + "integrity": "sha512-3OBZSUrPnAHoKJ9AMjRL/m01YJxQMf+TMHanNtTHG68ubjnZxK0RFl102DPzsw4mWnHibfZIBJm3LWCZ/LmMvg==", "dependencies": { "@types/trusted-types": "^2.0.2" } @@ -2439,9 +2424,9 @@ } }, "node_modules/@types/cytoscape": { - "version": "3.19.16", - "resolved": "https://registry.npmjs.org/@types/cytoscape/-/cytoscape-3.19.16.tgz", - "integrity": "sha512-A3zkjaZ6cOGyqEvrVuC1YUgiRSJhDZOj8Qhd1ALH2/+YxH2za1BOmR4RWQsKYHsc+aMP/IWoqg1COuUbZ39t/g==" + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/@types/cytoscape/-/cytoscape-3.21.0.tgz", + "integrity": "sha512-RN5SPiyVDpUP+LoOlxxlOYAMzkE7iuv3gA1jt3Hx2qTwArpZVPPdO+SI0hUj49OAn4QABR7JK9Gi0hibzGE0Aw==" }, "node_modules/@types/http-cache-semantics": { "version": "4.0.4", @@ -2464,9 +2449,9 @@ "integrity": "sha512-pg9d0yC4rVNWQzX8U7xb4olIOFuuVL9za3bzMT2pu2SU0SNEi66i2qrvhE2qt0HvkhuCaWJu7pLNOt/Pj8BIrw==" }, "node_modules/@types/prop-types": { - "version": "15.7.11", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz", - "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==", + "version": "15.7.12", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz", + "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==", "peer": true }, "node_modules/@types/pug": { @@ -2476,13 +2461,12 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.47", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.47.tgz", - "integrity": "sha512-xquNkkOirwyCgoClNk85BjP+aqnIS+ckAJ8i37gAbDs14jfW/J23f2GItAf33oiUPQnqNMALiFeoM9Y5mbjpVQ==", + "version": "18.2.73", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.73.tgz", + "integrity": "sha512-XcGdod0Jjv84HOC7N5ziY3x+qL0AfmubvKOZ9hJjJ2yd5EE+KYjWhdOjt387e9HPheHkdggF9atTifMRtyAaRA==", "peer": true, "dependencies": { "@types/prop-types": "*", - "@types/scheduler": "*", "csstype": "^3.0.2" } }, @@ -2505,12 +2489,6 @@ "sass": "*" } }, - "node_modules/@types/scheduler": { - "version": "0.16.8", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz", - "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==", - "peer": true - }, "node_modules/@types/triple-beam": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.2.tgz", @@ -4657,37 +4635,37 @@ } }, "node_modules/lit-svelte-stores/node_modules/@lit/reactive-element": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.3.tgz", - "integrity": "sha512-e067EuTNNgOHm1tZcc0Ia7TCzD/9ZpoPegHKgesrGK6pSDRGkGDAQbYuQclqLPIoJ9eC8Kb9mYtGryWcM5AywA==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.4.tgz", + "integrity": "sha512-GFn91inaUa2oHLak8awSIigYz0cU0Payr1rcFsrkf5OJ5eSPxElyZfKh0f2p9FsTiZWXQdWGJeXZICEfXXYSXQ==", "dependencies": { - "@lit-labs/ssr-dom-shim": "^1.1.2" + "@lit-labs/ssr-dom-shim": "^1.2.0" } }, "node_modules/lit-svelte-stores/node_modules/lit": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lit/-/lit-3.1.1.tgz", - "integrity": "sha512-hF1y4K58+Gqrz+aAPS0DNBwPqPrg6P04DuWK52eMkt/SM9Qe9keWLcFgRcEKOLuDlRZlDsDbNL37Vr7ew1VCuw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lit/-/lit-3.1.2.tgz", + "integrity": "sha512-VZx5iAyMtX7CV4K8iTLdCkMaYZ7ipjJZ0JcSdJ0zIdGxxyurjIn7yuuSxNBD7QmjvcNJwr0JS4cAdAtsy7gZ6w==", "dependencies": { - "@lit/reactive-element": "^2.0.0", - "lit-element": "^4.0.0", - "lit-html": "^3.1.0" + "@lit/reactive-element": "^2.0.4", + "lit-element": "^4.0.4", + "lit-html": "^3.1.2" } }, "node_modules/lit-svelte-stores/node_modules/lit-element": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.0.3.tgz", - "integrity": "sha512-2vhidmC7gGLfnVx41P8UZpzyS0Fb8wYhS5RCm16cMW3oERO0Khd3EsKwtRpOnttuByI5rURjT2dfoA7NlInCNw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.0.4.tgz", + "integrity": "sha512-98CvgulX6eCPs6TyAIQoJZBCQPo80rgXR+dVBs61cstJXqtI+USQZAbA4gFHh6L/mxBx9MrgPLHLsUgDUHAcCQ==", "dependencies": { - "@lit-labs/ssr-dom-shim": "^1.1.2", - "@lit/reactive-element": "^2.0.0", - "lit-html": "^3.1.0" + "@lit-labs/ssr-dom-shim": "^1.2.0", + "@lit/reactive-element": "^2.0.4", + "lit-html": "^3.1.2" } }, "node_modules/lit-svelte-stores/node_modules/lit-html": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.1.1.tgz", - "integrity": "sha512-x/EwfGk2D/f4odSFM40hcGumzqoKv0/SUh6fBO+1Ragez81APrcAMPo1jIrCDd9Sn+Z4CT867HWKViByvkDZUA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.1.2.tgz", + "integrity": "sha512-3OBZSUrPnAHoKJ9AMjRL/m01YJxQMf+TMHanNtTHG68ubjnZxK0RFl102DPzsw4mWnHibfZIBJm3LWCZ/LmMvg==", "dependencies": { "@types/trusted-types": "^2.0.2" } @@ -5233,9 +5211,9 @@ } }, "node_modules/prosemirror-view": { - "version": "1.32.7", - "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.32.7.tgz", - "integrity": "sha512-pvxiOoD4shW41X5bYDjRQk3DSG4fMqxh36yPMt7VYgU3dWRmqFzWJM/R6zeo1KtC8nyk717ZbQND3CC9VNeptw==", + "version": "1.33.3", + "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.33.3.tgz", + "integrity": "sha512-P4Ao/bc4OrU/2yLIf8dL4lJaEtjLR3QjIvQHgJYp2jUS7kYM4bSR6okbBjkqzOs/FwUon6UGjTLdKMnPL1MZqw==", "dependencies": { "prosemirror-model": "^1.16.0", "prosemirror-state": "^1.0.0", @@ -6542,8 +6520,8 @@ "ui": { "version": "0.1.0", "dependencies": { - "@holochain-open-dev/profiles": "^0.17.3", - "@holochain/client": "^0.16.7", + "@holochain-open-dev/profiles": "^0.300.0-dev.0", + "@holochain/client": "^0.17.0-dev.7", "@lightningrodlabs/we-applet": "^0.14.2", "@material/mwc-button": "^0.27.0", "@material/mwc-checkbox": "^0.27.0", @@ -6574,9 +6552,9 @@ } }, "ui/node_modules/@holochain/client": { - "version": "0.16.7", - "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.16.7.tgz", - "integrity": "sha512-wCFm71HUnZ9vxmuguqKqDOhqjE5Qq5e8bM4q9W1ginel3UAZF3LmYym5Ny4pOG2aqf2tD5mpf7xTZjBxPDGnjA==", + "version": "0.17.0-dev.7", + "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.17.0-dev.7.tgz", + "integrity": "sha512-dr0S+4Au/sS/PXu0T7Lm1uqwkPVpcWvbMBL9xD7bRv4pfWMratGdP3OpeA356l4bkpSJxkOltz2o2kN3pW3tRQ==", "dependencies": { "@bitgo/blake2b": "^3.2.4", "@holochain/serialization": "^0.1.0-beta-rc.3", diff --git a/package.json b/package.json index 6897542..8d832e8 100644 --- a/package.json +++ b/package.json @@ -9,9 +9,10 @@ "start": "AGENTS=2 BOOTSTRAP_PORT=$(port) SIGNAL_PORT=$(port) npm run network", "dev": "VITE_ADMIN_PORT=$(port) VITE_APP_PORT=$(port) SIGNAL_PORT=$(port) BOOTSTRAP_PORT=$(port) UI_PORT=8888 npm run x", "x": "hc s clean && npm run build:happ && UI_PORT=8888 concurrently \"npm start -w ui\" \"npm run start:happ\" \"hc run-local-services -b $BOOTSTRAP_PORT -s $SIGNAL_PORT\"", + "tool-dev": " UI_PORT=8888 npm run tool-devy", + "tool-devy": "concurrently \"npm start -w ui\" \"sleep 1 && we-dev-cli --agent-idx 1 --dev-config we_dev/config.ts\" \"sleep 10 && we-dev-cli --agent-idx 2 --dev-config we_dev/config.ts\"", + "tool-devx": "BPORT=46263 SPORT=46262; concurrently \"hc run-local-services -b $BPORT -s $SPORT\" \"npm start -w ui\" \"./we_dev/we.AppImage --dev-config we_dev/config.json --agent-num 1 -b http://127.0.0.1:$BPORT -s ws://127.0.0.1:$SPORT\" \"sleep 10 && ./we_dev/we.AppImage --dev-config we_dev/config.json --agent-num 2 -b http://127.0.0.1:$BPORT -s ws://127.0.0.1:$SPORT\"", "network": "hc s clean && npm run build:happ && UI_PORT=8888 concurrently \"npm start -w ui\" \"npm run launch:happ\" \"holochain-playground\"", - "applet-dev": " UI_PORT=8888 npm run applet-devx", - "applet-devx": "BPORT=46263 SPORT=46262; concurrently \"hc run-local-services -b $BPORT -s $SPORT\" \"npm start -w ui\" \"./we_dev/we.AppImage --dev-config we_dev/config.json --agent-num 1 -b http://127.0.0.1:$BPORT -s ws://127.0.0.1:$SPORT\" \"sleep 10 && ./we_dev/we.AppImage --dev-config we_dev/config.json --agent-num 2 -b http://127.0.0.1:$BPORT -s ws://127.0.0.1:$SPORT\"", "test": "npm run build:zomes && hc app pack workdir --recursive && npm t -w tests", "launch:happ": "concurrently \"hc run-local-services --bootstrap-port $BOOTSTRAP_PORT --signal-port $SIGNAL_PORT\" \"echo pass | RUST_LOG=warn hc launch --piped -n $AGENTS workdir/converge.happ --ui-port $UI_PORT network --bootstrap http://127.0.0.1:\"$BOOTSTRAP_PORT\" webrtc ws://127.0.0.1:\"$SIGNAL_PORT\"\"", "launch:spin": "echo \"pass\" | RUST_LOG=warn hc spin -n $AGENTS --ui-port $UI_PORT workdir/converge.happ", diff --git a/ui/package.json b/ui/package.json index 4d6733c..ff27730 100644 --- a/ui/package.json +++ b/ui/package.json @@ -8,8 +8,8 @@ "package": "npm run build && cd dist && bestzip ../dist.zip *" }, "dependencies": { - "@holochain-open-dev/profiles": "^0.17.3", - "@holochain/client": "^0.16.7", + "@holochain-open-dev/profiles": "^0.300.0-dev.0", + "@holochain/client": "^0.17.0-dev.7", "@lightningrodlabs/we-applet": "^0.14.2", "@material/mwc-button": "^0.27.0", "@material/mwc-checkbox": "^0.27.0", diff --git a/ui/src/App.svelte b/ui/src/App.svelte index 4506bfe..ff8ae38 100644 --- a/ui/src/App.svelte +++ b/ui/src/App.svelte @@ -65,15 +65,18 @@ if (!isWeContext()) { console.log("adminPort is", adminPort) if (adminPort) { - const adminWebsocket = await AdminWebsocket.connect(new URL(`ws://localhost:${adminPort}`)) + const url = `ws://localhost:${adminPort}` + console.log("connecting to admin port at:", url) + const adminWebsocket = await AdminWebsocket.connect({url: new URL(url)}) const x = await adminWebsocket.listApps({}) console.log("apps", x) const cellIds = await adminWebsocket.listCellIds() console.log("CELL IDS",cellIds) await adminWebsocket.authorizeSigningCredentials(cellIds[0]) + } console.log("appPort and Id is", appPort, appId) - client = await AppAgentWebsocket.connect(new URL(url), appId) + client = await AppAgentWebsocket.connect(appId,{url: new URL(url)}) profilesClient = new ProfilesClient(client, appId); // client = await AppAgentWebsocket.connect('', 'dcan'); diff --git a/ui/src/dcan.css b/ui/src/dcan.css index 8be8b12..3bc6eb0 100644 --- a/ui/src/dcan.css +++ b/ui/src/dcan.css @@ -263,7 +263,8 @@ h1 { .new-action-button { /* background-color: #1952bb; */ - background-color: #9200a1; + /* background-color: #9200a1; */ + background-color: black; padding: 8px 10px 8px 10px !important; color: white !important; border-radius: 4px; diff --git a/we_dev/config.json b/we_dev/config.json index 8bdf56a..fc339be 100644 --- a/we_dev/config.json +++ b/we_dev/config.json @@ -52,7 +52,7 @@ "description": "Let's do it!", "icon": { "type": "filesystem", - "path": "/home/leo/hApps/converge/we_dev/logo.png" + "path": "/home/leo/hApps/converge/we_dev/converge.svg" }, "source": { "type": "localhost", diff --git a/we_dev/converge.svg b/we_dev/converge.svg new file mode 100644 index 0000000..c9609cd --- /dev/null +++ b/we_dev/converge.svg @@ -0,0 +1,138 @@ + + + + +Created by potrace 1.10, written by Peter Selinger 2001-2011 + + + + + + + + + + + + + + + + +