diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e907492a..acdc185b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -47,6 +47,12 @@ jobs: - name: Install JS packages run: nix develop -c $SHELL -c "npm ci" + - name: Clippy + run: nix develop -c $SHELL -c "npm run cargo:clippy" + + - name: Check rust formatting + run: nix develop -c $SHELL -c "npm run cargo:fmt:check" + - name: Build Happ run: nix develop -c $SHELL -c "npm run build:happ" @@ -59,10 +65,4 @@ jobs: key: ${{ runner.os }}-build-${{ hashFiles('Cargo.lock') }} - name: Test with tryorama - run: nix develop -c $SHELL -c "npm test" - - - name: Clippy - run: nix develop -c $SHELL -c "npm run cargo:clippy" - - - name: Check rust formatting - run: nix develop -c $SHELL -c "npm run cargo:fmt:check" + run: nix develop -c $SHELL -c "npm run test" diff --git a/CHANGELOG.md b/CHANGELOG.md index f6c58cf9..ae5a2a13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Added ### Changed +- **BREAKING CHANGE**: upgrade Holochain to v0.3.0-beta-dev.8 +- **BREAKING CHANGE**: upgrade JS client to v0.15.0 +- **BREAKING CHANGE**: upgrade Tryorama to v0.15.0-rc.1 ### Fixed ### Removed diff --git a/Cargo.lock b/Cargo.lock index 21c80b14..0b0f92c9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,11 +4,11 @@ version = 3 [[package]] name = "addr2line" -version = "0.17.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ - "gimli", + "gimli 0.27.3", ] [[package]] @@ -49,13 +49,19 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.18" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -65,11 +71,20 @@ 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.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -77,6 +92,17 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + [[package]] name = "autocfg" version = "1.1.0" @@ -85,16 +111,16 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", "cfg-if", "libc", "miniz_oxide", - "object 0.29.0", + "object 0.31.1", "rustc-demangle", ] @@ -134,6 +160,18 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + [[package]] name = "blake2b_simd" version = "0.5.11" @@ -147,38 +185,39 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] [[package]] name = "bumpalo" -version = "3.11.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytecheck" -version = "0.6.9" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11cac2c12b5adc6570dad2ee1b87eff4955dac476fe12d81e5fdd352e52406f" +checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" dependencies = [ "bytecheck_derive", "ptr_meta", + "simdutf8", ] [[package]] name = "bytecheck_derive" -version = "0.6.9" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf" +checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] @@ -189,9 +228,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "camino" -version = "1.1.2" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055" +checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" dependencies = [ "serde", ] @@ -207,13 +246,13 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.15.2" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982a0cf6a99c350d7246035613882e376d58cebe571785abc5da4f648d53ac0a" +checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.13", + "semver 1.0.17", "serde", "serde_json", "thiserror", @@ -221,9 +260,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.73" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-if" @@ -233,12 +272,12 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", - "num-integer", "num-traits", "serde", "time", @@ -246,13 +285,14 @@ dependencies = [ ] [[package]] -name = "codespan-reporting" -version = "0.11.1" +name = "colored" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" dependencies = [ - "termcolor", - "unicode-width", + "atty", + "lazy_static", + "winapi", ] [[package]] @@ -269,9 +309,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "corosensei" @@ -288,9 +328,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -314,7 +354,7 @@ dependencies = [ "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", - "gimli", + "gimli 0.26.2", "log", "regalloc", "smallvec", @@ -365,9 +405,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -375,9 +415,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -386,26 +426,24 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.10" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset", - "once_cell", + "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", - "once_cell", ] [[package]] @@ -418,117 +456,84 @@ dependencies = [ "typenum", ] -[[package]] -name = "cxx" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 1.0.99", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.99", -] - [[package]] name = "darling" -version = "0.13.4" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ - "darling_core 0.13.4", - "darling_macro 0.13.4", + "darling_core 0.14.4", + "darling_macro 0.14.4", ] [[package]] name = "darling" -version = "0.14.1" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4529658bdda7fd6769b8614be250cdcfc3aeb0ee72fe66f9e41e5e5eb73eac02" +checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" dependencies = [ - "darling_core 0.14.1", - "darling_macro 0.14.1", + "darling_core 0.20.1", + "darling_macro 0.20.1", ] [[package]] name = "darling_core" -version = "0.13.4" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "syn 1.0.99", + "strsim", + "syn 1.0.109", ] [[package]] name = "darling_core" -version = "0.14.1" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "649c91bc01e8b1eac09fb91e8dbc7d517684ca6be8ebc75bb9cafc894f9fdb6f" +checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim", - "syn 1.0.99", + "syn 2.0.25", ] [[package]] name = "darling_macro" -version = "0.13.4" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ - "darling_core 0.13.4", + "darling_core 0.14.4", "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] name = "darling_macro" -version = "0.14.1" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc69c5bfcbd2fc09a0f38451d2daf0e372e367986a83906d1b0dbc88134fb5" +checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ - "darling_core 0.14.1", + "darling_core 0.20.1", "quote", - "syn 1.0.99", + "syn 2.0.25", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -541,14 +546,14 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", @@ -556,9 +561,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "enum-iterator" @@ -577,28 +582,55 @@ checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] name = "enumset" -version = "1.0.11" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4799cdb24d48f1f8a7a98d06b7fde65a85a2d1e42b25a889f5406aa1fbefe074" +checksum = "e875f1719c16de097dee81ed675e2d9bb63096823ed3f0ca827b7dea3028bbbb" dependencies = [ "enumset_derive", ] [[package]] name = "enumset_derive" -version = "0.6.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea83a3fbdc1d999ccfbcbee717eab36f8edf2d71693a23ce0d7cca19e085304c" +checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" dependencies = [ - "darling 0.13.4", + "darling 0.20.1", "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.25", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", ] [[package]] @@ -609,9 +641,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] @@ -652,6 +684,101 @@ dependencies = [ "serde", ] +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.25", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + [[package]] name = "gcollections" version = "1.5.0" @@ -666,9 +793,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -676,9 +803,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -692,10 +819,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" dependencies = [ "fallible-iterator", - "indexmap", + "indexmap 1.9.3", "stable_deref_trait", ] +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + [[package]] name = "hashbrown" version = "0.11.2" @@ -714,6 +847,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + [[package]] name = "hc_call_utils" version = "0.0.1" @@ -732,9 +871,8 @@ dependencies = [ [[package]] name = "hc_zome_profiles_coordinator" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2b9c2e4338199e0dc7b8a4254b1af9e55581a0a5f8f3c0756cc43e3f33ccd19" +version = "0.2.0" +source = "git+https://github.com/holochain-open-dev/profiles?branch=build/upgrade-0.2.1#c8945544363853fdf7f22f998ef34dfa7596a0a3" dependencies = [ "derive_more", "hc_zome_profiles_integrity", @@ -744,9 +882,8 @@ dependencies = [ [[package]] name = "hc_zome_profiles_integrity" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7749c3ce685dd07fc55efab8abd24ebba82460ff3e499c098cb224de39177ceb" +version = "0.2.0" +source = "git+https://github.com/holochain-open-dev/profiles?branch=build/upgrade-0.2.1#c8945544363853fdf7f22f998ef34dfa7596a0a3" dependencies = [ "derive_more", "hdi", @@ -755,9 +892,9 @@ dependencies = [ [[package]] name = "hdi" -version = "0.2.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9f6105d20d9c8dcac3b967bef3de5c811d43de3079c60f05ddebb86421f362" +checksum = "6115e6d52f5da0fe55ec9608ff93e5e61211a66a3628f97e0cbbfd4131787cf6" dependencies = [ "hdk_derive", "holo_hash", @@ -772,9 +909,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a354d9b29d879b8e05c2e1e5f5a9657dac2a1f4be6732ecc4d72273cf6d30bbd" +checksum = "8f5690ef906744725fcd16ae3d13b0e2ba22f046f4a9be2dc21ec2e4b3cf049a" dependencies = [ "getrandom", "hdi", @@ -792,25 +929,25 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b42de4f722e215382845ca26d6b71d557f843c674dfd9463cb517873c6cade8" +checksum = "d220ca3a6c5992600052e025f0c3f2342d6a4cf7fe52687135acda9128a62eae" dependencies = [ - "darling 0.14.1", + "darling 0.14.4", "heck", "holochain_integrity_types", "paste", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -821,6 +958,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + [[package]] name = "hex" version = "0.4.3" @@ -829,14 +972,15 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d8076a1021ca8bf729d4224c4facd24f06c3aebd3fd335080d1460495538dfd" +checksum = "a39f740985893adf2be5ad75987456ed2ce2f1d6d53cdf534e4fbe96ebae0940" dependencies = [ "base64", "blake2b_simd", "derive_more", "holochain_serialized_bytes", + "holochain_wasmer_common", "kitsune_p2p_dht_arc", "serde", "serde_bytes", @@ -845,12 +989,13 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5755ca3e4d8d3121c8294b8ac21a1da072350519309381336ff9e0aaee80e1b5" +checksum = "f92876d5a2fa142858efe38fe4f6b9f25ae1be9441bf90cb516ed613df77f50d" dependencies = [ "holo_hash", "holochain_serialized_bytes", + "kitsune_p2p_dht", "kitsune_p2p_timestamp", "paste", "serde", @@ -881,14 +1026,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1077232d0c427d64feb9e138fa22800e447eafb1810682d6c13beb95333cb32c" dependencies = [ "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] name = "holochain_wasmer_common" -version = "0.0.83" +version = "0.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce2c50cfaf43ccfaf9c584eae3864dffb3f010f140dad6e52368f0969ce680d7" +checksum = "223daec7ca62d4e36841a99d8799b29cc616f5976ad0e2975e6ca6810de8f14f" dependencies = [ "holochain_serialized_bytes", "serde", @@ -901,9 +1046,9 @@ dependencies = [ [[package]] name = "holochain_wasmer_guest" -version = "0.0.83" +version = "0.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5539ab71791a3f9d0febbd2822ba398ef34e18f55f86eafc4918a776d12d7db" +checksum = "92b2026e44595cb16108464973622577936605582aa22932933a5130ad32ce42" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", @@ -915,14 +1060,17 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd45986999baf8590ff444442cdbbd460ae26e8ecaa7494a69f081c897bbe714" +checksum = "a5017d60431ed65bdb25974fdd98a267fccf0436725952cdd8ac0cce660c6c79" dependencies = [ "holo_hash", "holochain_integrity_types", "holochain_serialized_bytes", "holochain_wasmer_common", + "kitsune_p2p_bin_data", + "kitsune_p2p_block", + "kitsune_p2p_dht", "kitsune_p2p_timestamp", "paste", "serde", @@ -934,35 +1082,34 @@ dependencies = [ [[package]] name = "home" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -979,15 +1126,25 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", "serde", ] +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + [[package]] name = "instant" version = "0.1.12" @@ -1010,26 +1167,96 @@ dependencies = [ "trilean", ] +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.2", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "itertools" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" +dependencies = [ + "either", +] + [[package]] name = "itoa" -version = "1.0.3" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" [[package]] name = "js-sys" -version = "0.3.59" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] +[[package]] +name = "kitsune_p2p_bin_data" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9845f57ef9189f403609ada819b26ca87e96ccf95fef02bebcdf83faa65b1924" +dependencies = [ + "base64", + "derive_more", + "kitsune_p2p_dht_arc", + "serde", + "serde_bytes", + "shrinkwraprs", +] + +[[package]] +name = "kitsune_p2p_block" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a29e6b5eeb78b37d9d0040855603f3a00c6c7055d933a6e5b6b31aa9529b326" +dependencies = [ + "kitsune_p2p_bin_data", + "kitsune_p2p_timestamp", + "serde", + "serde_bytes", +] + +[[package]] +name = "kitsune_p2p_dht" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb834fef2af5271ec002e2726b2be7755e9d7b7b666a5dcfa3847b3a3a89cfd" +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.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0344da4e6309dfa0d7471e4b868e7dc829f109a99b3fd552abfd4d9850593cbf" +checksum = "ee2d4d68c154cdc5391ea986eb278f5b34707908cf63674d9fe8e7142d49c449" dependencies = [ "derive_more", "gcollections", @@ -1040,9 +1267,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89399225067e17ab204a3d496622dd7ab51959690676eee35c45c6ad9a725165" +checksum = "b46a356525779ac9b2b4956cee7ea523c8723f1955596d5e070faac2723a0b65" dependencies = [ "chrono", "derive_more", @@ -1063,20 +1290,26 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.132" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libloading" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if", "winapi", ] +[[package]] +name = "libm" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" + [[package]] name = "likes" version = "0.0.1" @@ -1097,19 +1330,16 @@ dependencies = [ ] [[package]] -name = "link-cplusplus" -version = "1.0.8" +name = "linux-raw-sys" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "lock_api" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -1117,12 +1347,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "loupe" @@ -1130,7 +1357,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b6a72dfa44fe15b5e76b94307eeb2ff995a8c5b283b55008940c02e0c5b634d" dependencies = [ - "indexmap", + "indexmap 1.9.3", "loupe-derive", "rustversion", ] @@ -1142,7 +1369,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0fbfc88337168279f2e9ae06e157cfed4efd3316e14dc96ed074d4f2e6c5952" dependencies = [ "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] @@ -1154,6 +1381,16 @@ dependencies = [ "libc", ] +[[package]] +name = "matrixmultiply" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" +dependencies = [ + "autocfg", + "rawpointer", +] + [[package]] name = "memchr" version = "2.5.0" @@ -1162,9 +1399,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.5.7" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95af15f345b17af2efc8ead6080fb8bc376f8cec1b35277b935637595fe77498" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" dependencies = [ "libc", ] @@ -1178,6 +1415,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + [[package]] name = "mews" version = "0.0.1" @@ -1217,9 +1463,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.5.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] @@ -1230,6 +1476,54 @@ 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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +dependencies = [ + "num-traits", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -1240,6 +1534,17 @@ dependencies = [ "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.15" @@ -1247,15 +1552,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", + "libm", ] [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.2", "libc", ] @@ -1267,24 +1573,24 @@ checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" dependencies = [ "crc32fast", "hashbrown 0.11.2", - "indexmap", + "indexmap 1.9.3", "memchr", ] [[package]] name = "object" -version = "0.29.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.13.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "parking_lot" @@ -1298,28 +1604,28 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.5" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys 0.42.0", + "windows-targets", ] [[package]] name = "paste" -version = "1.0.5" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" +checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" [[package]] name = "pest" -version = "2.4.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a" +checksum = "f73935e4d55e2abf7f130186537b19e7a4abc886a0252380b59248af473a3fc9" dependencies = [ "thiserror", "ucd-trie", @@ -1327,9 +1633,15 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" + +[[package]] +name = "pin-utils" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "ping" @@ -1347,8 +1659,8 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "prefix_index" -version = "0.4.0" -source = "git+https://github.com/mattyg/holochain-prefix-index.git?tag=0.5.0#eefc87bf625113f4842a8a7f0c03ed32f987e888" +version = "0.5.0" +source = "git+https://github.com/holochain-open-dev/holochain-prefix-index?tag=0.6.0#1659caae0f61f6d57ea461ada4e0a2cdc3b67891" dependencies = [ "hdk", "holochain_integrity_types", @@ -1365,7 +1677,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", "version_check", ] @@ -1382,9 +1694,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" dependencies = [ "unicode-ident", ] @@ -1425,18 +1737,24 @@ checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + [[package]] name = "rand" version = "0.8.5" @@ -1467,23 +1785,37 @@ 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.5.3" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -1493,9 +1825,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags", ] @@ -1513,9 +1845,21 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" dependencies = [ "aho-corasick", "memchr", @@ -1524,9 +1868,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "region" @@ -1540,47 +1884,41 @@ dependencies = [ "winapi", ] -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - [[package]] name = "rend" -version = "0.3.6" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79af64b4b6362ffba04eef3a4e10829718a4896dac19daa741851c86781edf95" +checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab" dependencies = [ "bytecheck", ] [[package]] name = "rkyv" -version = "0.7.39" +version = "0.7.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cec2b3485b07d96ddfd3134767b8a447b45ea4eb91448d0a35180ec0ffd5ed15" +checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" dependencies = [ + "bitvec", "bytecheck", "hashbrown 0.12.3", "ptr_meta", "rend", "rkyv_derive", "seahash", + "tinyvec", + "uuid", ] [[package]] name = "rkyv_derive" -version = "0.7.39" +version = "0.7.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eaedadc88b53e36dd32d940ed21ae4d850d5916f2581526921f553a72ac34c4" +checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] @@ -1607,9 +1945,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -1623,20 +1961,34 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.13", + "semver 1.0.17", +] + +[[package]] +name = "rustix" +version = "0.37.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", ] [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" [[package]] name = "same-file" @@ -1653,12 +2005,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "scratch" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" - [[package]] name = "seahash" version = "4.1.0" @@ -1676,9 +2022,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.13" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" dependencies = [ "serde", ] @@ -1694,9 +2040,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.160" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] @@ -1712,31 +2058,31 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.7" +version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" +checksum = "5a16be4fe5320ade08736447e3198294a5ea9a6d44dde6f35f0a5e06859c427a" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.25", ] [[package]] name = "serde_json" -version = "1.0.85" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" +checksum = "b5062a995d481b2308b6064e9af76011f2921c35f97b0468811ed9f6cd91dfed" dependencies = [ - "indexmap", + "indexmap 2.0.0", "itoa", "ryu", "serde", @@ -1753,11 +2099,51 @@ dependencies = [ "digest", ] +[[package]] +name = "shrinkwraprs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e63e6744142336dfb606fe2b068afa2e1cca1ee6a5d8377277a92945d81fa331" +dependencies = [ + "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + [[package]] name = "smallvec" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "stable_deref_trait" @@ -1765,6 +2151,19 @@ 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" @@ -1781,7 +2180,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] @@ -1796,15 +2195,15 @@ dependencies = [ [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "1.0.99" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -1813,42 +2212,39 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "target-lexicon" -version = "0.12.4" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1" +checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" [[package]] name = "tempfile" -version = "3.3.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" dependencies = [ + "autocfg", "cfg-if", "fastrand", - "libc", "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", + "rustix", + "windows-sys 0.48.0", ] [[package]] @@ -1882,13 +2278,13 @@ version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "856bbca0314c328004691b9c0639fb198ca764d1ce0e20d4dd8b78f2697c2a6f" dependencies = [ - "darling 0.14.1", + "darling 0.14.4", "if_chain", "lazy_static", "proc-macro2", "quote", "subprocess", - "syn 1.0.99", + "syn 1.0.109", "test-fuzz-internal", "toolchain_find", "unzip-n", @@ -1910,22 +2306,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.32" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.32" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.25", ] [[package]] @@ -1939,6 +2335,21 @@ dependencies = [ "winapi", ] +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + [[package]] name = "toolchain_find" version = "0.2.0" @@ -1954,9 +2365,9 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.36" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "log", @@ -1967,20 +2378,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.22" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.25", ] [[package]] name = "tracing-core" -version = "0.1.29" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", @@ -2000,21 +2411,21 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "unicode-ident" -version = "1.0.3" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unzip-n" @@ -2024,9 +2435,15 @@ checksum = "c2e7e85a0596447f0f2ac090e16bc4c516c6fe91771fb0c0ccf7fa3dae896b9c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", ] +[[package]] +name = "uuid" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" + [[package]] name = "valuable" version = "0.1.0" @@ -2041,12 +2458,11 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -2064,9 +2480,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.82" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2074,24 +2490,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.82" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.25", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.82" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2099,28 +2515,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.82" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.25", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.82" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-encoder" -version = "0.16.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d443c5a7daae71697d97ec12ad70b4fe8766d3a0f4db16158ac8b781365892f7" +checksum = "b2f8e9778e04cbf44f58acc301372577375a666b966c50b03ef46144f80436a8" dependencies = [ "leb128", ] @@ -2132,7 +2548,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea8d8361c9d006ea3d7797de7bd6b1492ffd0f91a22430cfda6c1658ad57bedf" dependencies = [ "cfg-if", - "indexmap", + "indexmap 1.9.3", "js-sys", "loupe", "more-asserts", @@ -2192,7 +2608,7 @@ dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "gimli", + "gimli 0.26.2", "loupe", "more-asserts", "rayon", @@ -2212,7 +2628,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] @@ -2320,7 +2736,7 @@ checksum = "39df01ea05dc0a9bab67e054c7cb01521e53b35a7bb90bd02eca564ed0b2667f" dependencies = [ "backtrace", "enum-iterator", - "indexmap", + "indexmap 1.9.3", "loupe", "more-asserts", "rkyv", @@ -2339,12 +2755,12 @@ dependencies = [ "cfg-if", "corosensei", "enum-iterator", - "indexmap", + "indexmap 1.9.3", "lazy_static", "libc", "loupe", "mach", - "memoffset", + "memoffset 0.6.5", "more-asserts", "region", "rkyv", @@ -2364,9 +2780,9 @@ checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" [[package]] name = "wast" -version = "46.0.0" +version = "61.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0ab19660e3ea6891bba69167b9be40fad00fb1fe3dd39c5eebcee15607131b" +checksum = "dc6b347851b52fd500657d301155c79e8c67595501d179cef87b6f04ebd25ac4" dependencies = [ "leb128", "memchr", @@ -2376,22 +2792,22 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.48" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f775282def4d5bffd94d60d6ecd57bfe6faa46171cdbf8d32bd5458842b1e3e" +checksum = "459e764d27c3ab7beba1ebd617cc025c7e76dea6e7c5ce3189989a970aea3491" dependencies = [ "wast", ] [[package]] name = "which" -version = "4.2.5" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", - "lazy_static", "libc", + "once_cell", ] [[package]] @@ -2425,6 +2841,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-sys" version = "0.33.0" @@ -2440,24 +2865,33 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" @@ -2467,9 +2901,9 @@ checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" @@ -2479,9 +2913,9 @@ checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" @@ -2491,9 +2925,9 @@ checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" @@ -2503,15 +2937,15 @@ checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" @@ -2521,6 +2955,15 @@ checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "wyz" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] diff --git a/Cargo.toml b/Cargo.toml index c48b3898..122d6416 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,10 +3,11 @@ members = ["dnas/*/zomes/coordinator/*", "dnas/*/zomes/integrity/*", "crates/*"] resolver = "2" [workspace.dependencies] -hdi = "=0.2.2" -hdk = "=0.1.2" -holochain_integrity_types = "=0.1.2" +hdi = "=0.3.1" +hdk = "=0.2.1" +holochain_integrity_types = "=0.2.1" serde = "1" +paste = "1.0" [workspace.dependencies.agent_pins] path = "dnas/mewsfeed/zomes/coordinator/agent_pins" diff --git a/dnas/mewsfeed/zomes/coordinator/agent_pins/src/pinner_to_hashes.rs b/dnas/mewsfeed/zomes/coordinator/agent_pins/src/pinner_to_hashes.rs index 1dfb31ea..96af87c2 100644 --- a/dnas/mewsfeed/zomes/coordinator/agent_pins/src/pinner_to_hashes.rs +++ b/dnas/mewsfeed/zomes/coordinator/agent_pins/src/pinner_to_hashes.rs @@ -39,7 +39,8 @@ pub fn get_pinners_for_hash(hash: AnyLinkableHash) -> ExternResult = links .into_iter() - .map(|link| AgentPubKey::from(EntryHash::from(link.target))) + .filter_map(|link| EntryHash::try_from(link.target).ok()) + .map(AgentPubKey::from) .collect(); Ok(agents) diff --git a/dnas/mewsfeed/zomes/coordinator/follows/src/follower_to_creators.rs b/dnas/mewsfeed/zomes/coordinator/follows/src/follower_to_creators.rs index 8210dd93..54af1af9 100644 --- a/dnas/mewsfeed/zomes/coordinator/follows/src/follower_to_creators.rs +++ b/dnas/mewsfeed/zomes/coordinator/follows/src/follower_to_creators.rs @@ -30,7 +30,8 @@ pub fn get_creators_for_follower( let agents: Vec = links_page .into_iter() - .map(|link| AgentPubKey::from(EntryHash::from(link.target))) + .filter_map(|link| EntryHash::try_from(link.target).ok()) + .map(AgentPubKey::from) .collect(); Ok(agents) @@ -44,7 +45,8 @@ pub fn get_followers_for_creator( let agents: Vec = links .into_iter() - .map(|link| AgentPubKey::from(EntryHash::from(link.target))) + .filter_map(|link| EntryHash::try_from(link.target).ok()) + .map(AgentPubKey::from) .collect(); Ok(agents) @@ -77,7 +79,9 @@ pub fn remove_creator_for_follower(input: RemoveCreatorForFollowerInput) -> Exte )?; for link in links { - if AgentPubKey::from(EntryHash::from(link.target.clone())).eq(&input.target_creator) { + let entry_hash = + EntryHash::try_from(link.target.clone()).map_err(|err| wasm_error!(err))?; + if AgentPubKey::from(entry_hash).eq(&input.target_creator) { delete_link(link.create_link_hash)?; } } @@ -89,7 +93,9 @@ pub fn remove_creator_for_follower(input: RemoveCreatorForFollowerInput) -> Exte )?; for link in links { - if AgentPubKey::from(EntryHash::from(link.target.clone())).eq(&input.base_follower) { + let entry_hash = + EntryHash::try_from(link.target.clone()).map_err(|err| wasm_error!(err))?; + if AgentPubKey::from(entry_hash).eq(&input.base_follower) { delete_link(link.create_link_hash)?; } } diff --git a/dnas/mewsfeed/zomes/coordinator/likes/src/liker_to_hashes.rs b/dnas/mewsfeed/zomes/coordinator/likes/src/liker_to_hashes.rs index cb81e4a7..2c10f3a2 100644 --- a/dnas/mewsfeed/zomes/coordinator/likes/src/liker_to_hashes.rs +++ b/dnas/mewsfeed/zomes/coordinator/likes/src/liker_to_hashes.rs @@ -38,7 +38,8 @@ pub fn get_likers_for_hash(hash: AnyLinkableHash) -> ExternResult = links .into_iter() - .map(|link| AgentPubKey::from(EntryHash::from(link.target))) + .filter_map(|link| EntryHash::try_from(link.target).ok()) + .map(AgentPubKey::from) .collect(); Ok(agents) @@ -75,7 +76,9 @@ pub fn remove_hash_for_liker(input: RemoveHashForLikerInput) -> ExternResult<()> let links = get_links(input.target_hash.clone(), LinkTypes::HashToLikers, None)?; for link in links { - if AgentPubKey::from(EntryHash::from(link.target.clone())).eq(&input.base_liker) { + let entry_hash = + EntryHash::try_from(link.target.clone()).map_err(|err| wasm_error!(err))?; + if AgentPubKey::from(entry_hash).eq(&input.base_liker) { delete_link(link.create_link_hash)?; } } diff --git a/dnas/mewsfeed/zomes/coordinator/mews/Cargo.toml b/dnas/mewsfeed/zomes/coordinator/mews/Cargo.toml index 27a71c25..1a6df74a 100644 --- a/dnas/mewsfeed/zomes/coordinator/mews/Cargo.toml +++ b/dnas/mewsfeed/zomes/coordinator/mews/Cargo.toml @@ -12,7 +12,7 @@ hdk = { workspace = true } serde = { workspace = true } regex = "1" mews_integrity = { workspace = true } -prefix_index = { git = "https://github.com/mattyg/holochain-prefix-index.git", tag = "0.5.0", module = "prefix_index"} +prefix_index = { git = "https://github.com/holochain-open-dev/holochain-prefix-index", tag = "0.6.0", module = "lib/prefix_index" } profiles_integrity = { workspace = true } mews_types = { workspace = true } rand = "0.8.5" diff --git a/dnas/mewsfeed/zomes/coordinator/mews/src/agent_mews.rs b/dnas/mewsfeed/zomes/coordinator/mews/src/agent_mews.rs index 21994ec9..648181f5 100644 --- a/dnas/mewsfeed/zomes/coordinator/mews/src/agent_mews.rs +++ b/dnas/mewsfeed/zomes/coordinator/mews/src/agent_mews.rs @@ -33,7 +33,7 @@ fn get_agent_mew_hashes(input: GetAgentMewsInput) -> ExternResult = links_slice .into_iter() - .map(|link| ActionHash::from(link.target)) + .filter_map(|link| ActionHash::try_from(link.target).ok()) .collect(); Ok(hashes) diff --git a/dnas/mewsfeed/zomes/coordinator/mews/src/agent_to_notifications.rs b/dnas/mewsfeed/zomes/coordinator/mews/src/agent_to_notifications.rs index a569acff..7cbe7f20 100644 --- a/dnas/mewsfeed/zomes/coordinator/mews/src/agent_to_notifications.rs +++ b/dnas/mewsfeed/zomes/coordinator/mews/src/agent_to_notifications.rs @@ -145,7 +145,10 @@ fn make_notifications( match (create.zome_index, create.link_type) { // MentionToMews (ZomeIndex(1), LinkType(6)) => { - let feed_mew_hash = Some(ActionHash::from(create.target_address.clone())); + let feed_mew_hash = Some( + ActionHash::try_from(create.target_address.clone()) + .map_err(|err| wasm_error!(err))?, + ); make_notifications_for_createlinks( vec![create], @@ -174,7 +177,10 @@ fn make_notifications( // MewToResponses (ZomeIndex(1), LinkType(5)) => { - let feed_mew_hash = Some(ActionHash::from(create.target_address.clone())); + let feed_mew_hash = Some( + ActionHash::try_from(create.target_address.clone()) + .map_err(|err| wasm_error!(err))?, + ); make_notifications_for_createlinks( vec![create], @@ -185,7 +191,10 @@ fn make_notifications( // HashToLikers (ZomeIndex(3), LinkType(1)) => { - let feed_mew_hash = Some(ActionHash::from(create.base_address.clone())); + let feed_mew_hash = Some( + ActionHash::try_from(create.base_address.clone()) + .map_err(|err| wasm_error!(err))?, + ); let mut all_notifications = make_notifications_for_createlinks( vec![create], @@ -205,7 +214,10 @@ fn make_notifications( // HashToPinners (ZomeIndex(4), LinkType(1)) => { - let feed_mew_hash = Some(ActionHash::from(create.base_address.clone())); + let feed_mew_hash = Some( + ActionHash::try_from(create.base_address.clone()) + .map_err(|err| wasm_error!(err))?, + ); let mut all_notifications = make_notifications_for_createlinks( vec![create], diff --git a/dnas/mewsfeed/zomes/coordinator/mews/src/all_mews.rs b/dnas/mewsfeed/zomes/coordinator/mews/src/all_mews.rs index fd0fe0f6..d9808d62 100644 --- a/dnas/mewsfeed/zomes/coordinator/mews/src/all_mews.rs +++ b/dnas/mewsfeed/zomes/coordinator/mews/src/all_mews.rs @@ -7,7 +7,7 @@ pub fn get_all_mew_hashes() -> ExternResult> { links.sort_by_key(|a| a.timestamp); let hashes: Vec = links .into_iter() - .map(|link| ActionHash::from(link.target)) + .filter_map(|link| ActionHash::try_from(link.target).ok()) .collect(); Ok(hashes) diff --git a/dnas/mewsfeed/zomes/coordinator/mews/src/cashtag_to_mews.rs b/dnas/mewsfeed/zomes/coordinator/mews/src/cashtag_to_mews.rs index 0c9a12c7..4bd60185 100644 --- a/dnas/mewsfeed/zomes/coordinator/mews/src/cashtag_to_mews.rs +++ b/dnas/mewsfeed/zomes/coordinator/mews/src/cashtag_to_mews.rs @@ -43,7 +43,9 @@ pub fn remove_cashtag_for_mew(input: RemoveCashtagForMewInput) -> ExternResult<( Some(LinkTag(input.base_cashtag.as_bytes().to_vec())), )?; for link in links { - if ActionHash::from(link.target.clone()).eq(&input.target_mew_hash) { + let action_hash = + ActionHash::try_from(link.target.clone()).map_err(|err| wasm_error!(err))?; + if action_hash.eq(&input.target_mew_hash) { delete_link(link.create_link_hash)?; } } diff --git a/dnas/mewsfeed/zomes/coordinator/mews/src/followed_creators_mews.rs b/dnas/mewsfeed/zomes/coordinator/mews/src/followed_creators_mews.rs index 7085c5d4..c8e984b3 100644 --- a/dnas/mewsfeed/zomes/coordinator/mews/src/followed_creators_mews.rs +++ b/dnas/mewsfeed/zomes/coordinator/mews/src/followed_creators_mews.rs @@ -59,7 +59,7 @@ fn get_followed_creators_mew_hashes( let hashes: Vec = links_page .into_iter() - .map(|link| ActionHash::from(link.target)) + .filter_map(|link| ActionHash::try_from(link.target).ok()) .collect(); Ok(hashes) diff --git a/dnas/mewsfeed/zomes/coordinator/mews/src/hashtag_to_mews.rs b/dnas/mewsfeed/zomes/coordinator/mews/src/hashtag_to_mews.rs index f7d657c3..4b89b733 100644 --- a/dnas/mewsfeed/zomes/coordinator/mews/src/hashtag_to_mews.rs +++ b/dnas/mewsfeed/zomes/coordinator/mews/src/hashtag_to_mews.rs @@ -43,7 +43,9 @@ pub fn remove_hashtag_for_mew(input: RemoveHashtagForMewInput) -> ExternResult<( Some(LinkTag(input.base_hashtag.as_bytes().to_vec())), )?; for link in links { - if ActionHash::from(link.target.clone()).eq(&input.target_mew_hash) { + let action_hash = + ActionHash::try_from(link.target.clone()).map_err(|err| wasm_error!(err))?; + if action_hash.eq(&input.target_mew_hash) { delete_link(link.create_link_hash)?; } } diff --git a/dnas/mewsfeed/zomes/coordinator/mews/src/mention_to_mews.rs b/dnas/mewsfeed/zomes/coordinator/mews/src/mention_to_mews.rs index cc6c5136..978bde4c 100644 --- a/dnas/mewsfeed/zomes/coordinator/mews/src/mention_to_mews.rs +++ b/dnas/mewsfeed/zomes/coordinator/mews/src/mention_to_mews.rs @@ -66,7 +66,7 @@ fn get_mew_hashes_for_mention( let hashes: Vec = links_page .into_iter() - .map(|link| ActionHash::from(link.target)) + .filter_map(|link| ActionHash::try_from(link.target).ok()) .collect(); Ok(hashes) @@ -82,7 +82,9 @@ pub fn remove_mention_for_mew(input: RemoveMentionForMewInput) -> ExternResult<( let links = get_links(input.base_mention.clone(), LinkTypes::MentionToMews, None)?; for link in links { - if ActionHash::from(link.target.clone()).eq(&input.target_mew_hash) { + let action_hash = + ActionHash::try_from(link.target.clone()).map_err(|err| wasm_error!(err))?; + if action_hash.eq(&input.target_mew_hash) { delete_link(link.create_link_hash)?; } } diff --git a/dnas/mewsfeed/zomes/coordinator/mews/src/mew.rs b/dnas/mewsfeed/zomes/coordinator/mews/src/mew.rs index f32fba0d..91e07572 100644 --- a/dnas/mewsfeed/zomes/coordinator/mews/src/mew.rs +++ b/dnas/mewsfeed/zomes/coordinator/mews/src/mew.rs @@ -77,7 +77,9 @@ pub fn delete_mew(original_mew_hash: ActionHash) -> ExternResult { let path_hash = Path::from("all_mews").path_entry_hash()?; let links = get_links(path_hash, LinkTypes::AllMews, None)?; for link in links { - if ActionHash::from(link.target.clone()).eq(&original_mew_hash) { + let action_hash = + ActionHash::try_from(link.target.clone()).map_err(|err| wasm_error!(err))?; + if action_hash.eq(&original_mew_hash) { delete_link(link.create_link_hash)?; } } @@ -85,14 +87,18 @@ pub fn delete_mew(original_mew_hash: ActionHash) -> ExternResult { let my_agent_pub_key = agent_info()?.agent_latest_pubkey; let links = get_links(my_agent_pub_key, LinkTypes::AgentMews, None)?; for link in links { - if ActionHash::from(link.target.clone()).eq(&original_mew_hash) { + let action_hash = + ActionHash::try_from(link.target.clone()).map_err(|err| wasm_error!(err))?; + if action_hash.eq(&original_mew_hash) { delete_link(link.create_link_hash)?; } } let links = get_links(original_mew_hash.clone(), LinkTypes::MewToResponses, None)?; for link in links { - if ActionHash::from(link.target.clone()).eq(&original_mew_hash) { + let action_hash = + ActionHash::try_from(link.target.clone()).map_err(|err| wasm_error!(err))?; + if action_hash.eq(&original_mew_hash) { delete_link(link.create_link_hash)?; } } diff --git a/dnas/mewsfeed/zomes/coordinator/mews/src/mew_to_responses.rs b/dnas/mewsfeed/zomes/coordinator/mews/src/mew_to_responses.rs index 1c6c4809..c73c4799 100644 --- a/dnas/mewsfeed/zomes/coordinator/mews/src/mew_to_responses.rs +++ b/dnas/mewsfeed/zomes/coordinator/mews/src/mew_to_responses.rs @@ -52,7 +52,7 @@ pub fn get_response_hashes_for_mew( let links_page = paginate_by_hash(links, input.page)?; let hashes: Vec = links_page .into_iter() - .map(|link| ActionHash::from(link.target)) + .filter_map(|link| ActionHash::try_from(link.target).ok()) .collect(); Ok(hashes) @@ -86,7 +86,9 @@ pub fn remove_response_for_mew(input: RemoveResponseForMewInput) -> ExternResult None, )?; for link in links { - if ActionHash::from(link.target.clone()).eq(&input.target_response_mew_hash) { + let action_hash = + ActionHash::try_from(link.target.clone()).map_err(|err| wasm_error!(err))?; + if action_hash.eq(&input.target_response_mew_hash) { delete_link(link.create_link_hash)?; } } diff --git a/dnas/mewsfeed/zomes/coordinator/mews/src/mew_with_context.rs b/dnas/mewsfeed/zomes/coordinator/mews/src/mew_with_context.rs index afd26092..601debc5 100644 --- a/dnas/mewsfeed/zomes/coordinator/mews/src/mew_with_context.rs +++ b/dnas/mewsfeed/zomes/coordinator/mews/src/mew_with_context.rs @@ -28,8 +28,8 @@ pub fn get_mew_with_context(original_mew_hash: ActionHash) -> ExternResult = get_links(my_pubkey.clone(), LinkTypes::AgentMews, None)? .into_iter() - .map(|l| ActionHash::from(l.target)) - .collect(); + .map(|l| ActionHash::try_from(l.target).map_err(|e| wasm_error!(e))) + .collect::>>()?; let replies = get_response_hashes_for_mew(GetResponsesForMewInput { original_mew_hash: original_mew_hash.clone(), diff --git a/dnas/mewsfeed/zomes/coordinator/mews/src/pinner_to_mews.rs b/dnas/mewsfeed/zomes/coordinator/mews/src/pinner_to_mews.rs index 3e7c7fa4..e594e19c 100644 --- a/dnas/mewsfeed/zomes/coordinator/mews/src/pinner_to_mews.rs +++ b/dnas/mewsfeed/zomes/coordinator/mews/src/pinner_to_mews.rs @@ -16,7 +16,7 @@ pub fn get_mews_for_pinner_with_context(agent: AgentPubKey) -> ExternResult = pinned_hashes .iter() - .map(|h| ActionHash::from(h.clone())) + .filter_map(|h| ActionHash::try_from(h.clone()).ok()) .collect(); get_batch_mews_with_context(pinned_action_hashes) diff --git a/dnas/mewsfeed/zomes/coordinator/mews/src/tag_to_mews.rs b/dnas/mewsfeed/zomes/coordinator/mews/src/tag_to_mews.rs index 501aa482..62b45e6e 100644 --- a/dnas/mewsfeed/zomes/coordinator/mews/src/tag_to_mews.rs +++ b/dnas/mewsfeed/zomes/coordinator/mews/src/tag_to_mews.rs @@ -16,7 +16,7 @@ pub fn get_mew_hashes_for_tag( let links_page = paginate_by_hash(links, page)?; let hashes: Vec = links_page .iter() - .map(|l| ActionHash::from(l.target.clone())) + .filter_map(|l| ActionHash::try_from(l.target.clone()).ok()) .collect(); Ok(hashes) diff --git a/dnas/mewsfeed/zomes/coordinator/profiles/Cargo.toml b/dnas/mewsfeed/zomes/coordinator/profiles/Cargo.toml index 213de3ac..fd869a58 100644 --- a/dnas/mewsfeed/zomes/coordinator/profiles/Cargo.toml +++ b/dnas/mewsfeed/zomes/coordinator/profiles/Cargo.toml @@ -13,4 +13,4 @@ hdk = { workspace = true } serde = { workspace = true } profiles_integrity = { workspace = true } -hc_zome_profiles_coordinator = "0.1.2" +hc_zome_profiles_coordinator = { git = "https://github.com/holochain-open-dev/profiles", branch = "build/upgrade-0.2.1", module = "crates/coordinator" } diff --git a/dnas/mewsfeed/zomes/integrity/mews/Cargo.toml b/dnas/mewsfeed/zomes/integrity/mews/Cargo.toml index af2ce2dc..f5d00d75 100644 --- a/dnas/mewsfeed/zomes/integrity/mews/Cargo.toml +++ b/dnas/mewsfeed/zomes/integrity/mews/Cargo.toml @@ -11,5 +11,5 @@ name = "mews_integrity" hdi = { workspace = true } hdk = { workspace = true } serde = { workspace = true } -prefix_index = { git = "https://github.com/mattyg/holochain-prefix-index.git", tag = "0.5.0", module = "prefix_index"} +prefix_index = { git = "https://github.com/holochain-open-dev/holochain-prefix-index", tag = "0.6.0", module = "lib/prefix_index" } mews_types = { workspace = true } \ No newline at end of file diff --git a/dnas/mewsfeed/zomes/integrity/mews/src/agent_mews.rs b/dnas/mewsfeed/zomes/integrity/mews/src/agent_mews.rs index eccb13c0..f05fd8e2 100644 --- a/dnas/mewsfeed/zomes/integrity/mews/src/agent_mews.rs +++ b/dnas/mewsfeed/zomes/integrity/mews/src/agent_mews.rs @@ -6,7 +6,7 @@ pub fn validate_create_link_agent_mews( target_address: AnyLinkableHash, _tag: LinkTag, ) -> ExternResult { - let action_hash = ActionHash::from(target_address); + let action_hash = ActionHash::try_from(target_address).map_err(|err| wasm_error!(err))?; let record: Record = must_get_valid_record(action_hash)?; let _mew: crate::Mew = record .entry() diff --git a/dnas/mewsfeed/zomes/integrity/mews/src/all_mews.rs b/dnas/mewsfeed/zomes/integrity/mews/src/all_mews.rs index 53955c72..b70fc7c0 100644 --- a/dnas/mewsfeed/zomes/integrity/mews/src/all_mews.rs +++ b/dnas/mewsfeed/zomes/integrity/mews/src/all_mews.rs @@ -7,7 +7,7 @@ pub fn validate_create_link_all_mews( target_address: AnyLinkableHash, _tag: LinkTag, ) -> ExternResult { - let action_hash = ActionHash::from(target_address); + let action_hash = ActionHash::try_from(target_address).map_err(|err| wasm_error!(err))?; let record = must_get_valid_record(action_hash)?; let _mew: crate::Mew = record .entry() @@ -18,7 +18,9 @@ pub fn validate_create_link_all_mews( ))))?; let expected_base_address = Path::from("all_mews").path_entry_hash()?; - if EntryHash::from(base_address) != expected_base_address { + let base_address_entry_hash = + EntryHash::try_from(base_address).map_err(|err| wasm_error!(err))?; + if base_address_entry_hash != expected_base_address { return Ok(ValidateCallbackResult::Invalid( "AllMews link must use 'all_mews' Path as its base".into(), )); diff --git a/dnas/mewsfeed/zomes/integrity/mews/src/cashtag_to_mews.rs b/dnas/mewsfeed/zomes/integrity/mews/src/cashtag_to_mews.rs index 03511bd9..d6c9eaf2 100644 --- a/dnas/mewsfeed/zomes/integrity/mews/src/cashtag_to_mews.rs +++ b/dnas/mewsfeed/zomes/integrity/mews/src/cashtag_to_mews.rs @@ -6,7 +6,7 @@ pub fn validate_create_link_cashtag_to_mews( target_address: AnyLinkableHash, _tag: LinkTag, ) -> ExternResult { - let action_hash = ActionHash::from(target_address); + let action_hash = ActionHash::try_from(target_address).map_err(|err| wasm_error!(err))?; let record = must_get_valid_record(action_hash)?; let _mew: crate::Mew = record .entry() diff --git a/dnas/mewsfeed/zomes/integrity/mews/src/dna_properties.rs b/dnas/mewsfeed/zomes/integrity/mews/src/dna_properties.rs index 3d356a0e..7d3bc161 100644 --- a/dnas/mewsfeed/zomes/integrity/mews/src/dna_properties.rs +++ b/dnas/mewsfeed/zomes/integrity/mews/src/dna_properties.rs @@ -8,6 +8,6 @@ pub struct DnaProperties { #[hdk_extern] pub fn get_dna_properties(_: ()) -> ExternResult { - DnaProperties::try_from(dna_info()?.properties) + DnaProperties::try_from(dna_info()?.modifiers.properties) .map_err(|e| wasm_error!(WasmErrorInner::Guest(e.into()))) } diff --git a/dnas/mewsfeed/zomes/integrity/mews/src/hashtag_to_mews.rs b/dnas/mewsfeed/zomes/integrity/mews/src/hashtag_to_mews.rs index 2d5eacbd..39327b27 100644 --- a/dnas/mewsfeed/zomes/integrity/mews/src/hashtag_to_mews.rs +++ b/dnas/mewsfeed/zomes/integrity/mews/src/hashtag_to_mews.rs @@ -6,7 +6,7 @@ pub fn validate_create_link_hashtag_to_mews( target_address: AnyLinkableHash, _tag: LinkTag, ) -> ExternResult { - let action_hash = ActionHash::from(target_address); + let action_hash = ActionHash::try_from(target_address).map_err(|err| wasm_error!(err))?; let record = must_get_valid_record(action_hash)?; let _mew: crate::Mew = record .entry() diff --git a/dnas/mewsfeed/zomes/integrity/mews/src/mention_to_mews.rs b/dnas/mewsfeed/zomes/integrity/mews/src/mention_to_mews.rs index 130a390d..e455b4df 100644 --- a/dnas/mewsfeed/zomes/integrity/mews/src/mention_to_mews.rs +++ b/dnas/mewsfeed/zomes/integrity/mews/src/mention_to_mews.rs @@ -7,7 +7,7 @@ pub fn validate_create_link_mention_to_mews( _tag: LinkTag, ) -> ExternResult { // Check the entry type for the given action hash - let action_hash = ActionHash::from(target_address); + let action_hash = ActionHash::try_from(target_address).map_err(|err| wasm_error!(err))?; let record = must_get_valid_record(action_hash)?; let _mew: crate::Mew = record .entry() @@ -17,7 +17,9 @@ pub fn validate_create_link_mention_to_mews( "Linked action must reference an entry" ))))?; - if AgentPubKey::try_from(EntryHash::from(base_address)).is_err() { + let base_address_entry_hash = + EntryHash::try_from(base_address).map_err(|err| wasm_error!(err))?; + if AgentPubKey::try_from(base_address_entry_hash).is_err() { return Ok(ValidateCallbackResult::Invalid( "Base addesss of MentionToMew link must be an AgentPubKey".into(), )); diff --git a/dnas/mewsfeed/zomes/integrity/mews/src/mew_to_responses.rs b/dnas/mewsfeed/zomes/integrity/mews/src/mew_to_responses.rs index db1c4822..9f403ef8 100644 --- a/dnas/mewsfeed/zomes/integrity/mews/src/mew_to_responses.rs +++ b/dnas/mewsfeed/zomes/integrity/mews/src/mew_to_responses.rs @@ -7,7 +7,7 @@ pub fn validate_create_link_mew_to_responses( target_address: AnyLinkableHash, _tag: LinkTag, ) -> ExternResult { - let base_ah = ActionHash::from(base_address); + let base_ah = ActionHash::try_from(base_address).map_err(|err| wasm_error!(err))?; let record = must_get_valid_record(base_ah.clone())?; let _mew: crate::Mew = record .entry() @@ -16,7 +16,7 @@ pub fn validate_create_link_mew_to_responses( .ok_or(wasm_error!(WasmErrorInner::Guest(String::from( "Linked action must reference an entry" ))))?; - let target_ah = ActionHash::from(target_address); + let target_ah = ActionHash::try_from(target_address).map_err(|err| wasm_error!(err))?; let record = must_get_valid_record(target_ah)?; let response_mew: crate::Mew = record .entry() @@ -62,7 +62,7 @@ pub fn validate_create_link_response_to_mews( target_address: AnyLinkableHash, _tag: LinkTag, ) -> ExternResult { - let action_hash = ActionHash::from(base_address); + let action_hash = ActionHash::try_from(base_address).map_err(|err| wasm_error!(err))?; let record = must_get_valid_record(action_hash)?; let _mew: crate::Mew = record .entry() @@ -71,7 +71,7 @@ pub fn validate_create_link_response_to_mews( .ok_or(wasm_error!(WasmErrorInner::Guest(String::from( "Linked action must reference an entry" ))))?; - let action_hash = ActionHash::from(target_address); + let action_hash = ActionHash::try_from(target_address).map_err(|err| wasm_error!(err))?; let record = must_get_valid_record(action_hash)?; let _mew: crate::Mew = record .entry() diff --git a/dnas/mewsfeed/zomes/integrity/mews/src/prefix_index_to_cashtags.rs b/dnas/mewsfeed/zomes/integrity/mews/src/prefix_index_to_cashtags.rs index 0a5a34ef..33c734c6 100644 --- a/dnas/mewsfeed/zomes/integrity/mews/src/prefix_index_to_cashtags.rs +++ b/dnas/mewsfeed/zomes/integrity/mews/src/prefix_index_to_cashtags.rs @@ -9,7 +9,7 @@ pub fn validate_create_link_prefix_index_to_cashtags( tag_prefix_index: PrefixIndex, ) -> ExternResult { // Target should be a Mew - let action_hash = ActionHash::from(target_address); + let action_hash = ActionHash::try_from(target_address).map_err(|err| wasm_error!(err))?; let record = must_get_valid_record(action_hash)?; let _mew: crate::Mew = record .entry() @@ -31,7 +31,9 @@ pub fn validate_create_link_prefix_index_to_cashtags( .make_result_path(tag_string, None)? .path_entry_hash()?; - if EntryHash::from(base_address) != prefix_path_hash { + let base_address_entry_hash = + EntryHash::try_from(base_address).map_err(|err| wasm_error!(err))?; + if base_address_entry_hash != prefix_path_hash { return Ok(ValidateCallbackResult::Invalid(format!( "PrefixIndexToHashtag base address should be '{:?}'", prefix_path_hash diff --git a/dnas/mewsfeed/zomes/integrity/mews/src/prefix_index_to_hashtags.rs b/dnas/mewsfeed/zomes/integrity/mews/src/prefix_index_to_hashtags.rs index 51f0b3db..8f7711e0 100644 --- a/dnas/mewsfeed/zomes/integrity/mews/src/prefix_index_to_hashtags.rs +++ b/dnas/mewsfeed/zomes/integrity/mews/src/prefix_index_to_hashtags.rs @@ -9,7 +9,7 @@ pub fn validate_create_link_prefix_index_to_hashtags( tag_prefix_index: PrefixIndex, ) -> ExternResult { // Target should be a Mew - let action_hash = ActionHash::from(target_address); + let action_hash = ActionHash::try_from(target_address).map_err(|err| wasm_error!(err))?; let record = must_get_valid_record(action_hash)?; let _mew: crate::Mew = record .entry() @@ -30,8 +30,10 @@ pub fn validate_create_link_prefix_index_to_hashtags( let prefix_path_hash = tag_prefix_index .make_result_path(tag_string, None)? .path_entry_hash()?; + let base_address_entry_hash = + EntryHash::try_from(base_address).map_err(|err| wasm_error!(err))?; - if EntryHash::from(base_address) != prefix_path_hash { + if base_address_entry_hash != prefix_path_hash { return Ok(ValidateCallbackResult::Invalid(format!( "PrefixIndexToHashtag base address should be '{:?}'", prefix_path_hash diff --git a/dnas/mewsfeed/zomes/integrity/profiles/Cargo.toml b/dnas/mewsfeed/zomes/integrity/profiles/Cargo.toml index e04a2ffd..8a7ffb09 100644 --- a/dnas/mewsfeed/zomes/integrity/profiles/Cargo.toml +++ b/dnas/mewsfeed/zomes/integrity/profiles/Cargo.toml @@ -8,7 +8,8 @@ crate-type = ["cdylib", "rlib"] name = "profiles_integrity" [dependencies] -hc_zome_profiles_integrity = "0.1.0" +hc_zome_profiles_integrity = { git = "https://github.com/holochain-open-dev/profiles", branch = "build/upgrade-0.2.1", module = "crates/integrity" } + hdi = { workspace = true } serde = { workspace = true } diff --git a/flake.lock b/flake.lock index a4dde60a..c7df83c1 100644 --- a/flake.lock +++ b/flake.lock @@ -17,6 +17,23 @@ "type": "github" } }, + "cargo-chef_2": { + "flake": false, + "locked": { + "lastModified": 1672901199, + "narHash": "sha256-MHTuR4aQ1rQaBKx1vWDy2wbvcT0ZAzpkVB2zylSC+k0=", + "owner": "LukeMathWalker", + "repo": "cargo-chef", + "rev": "5c9f11578a2e0783cce27666737d50f84510b8b5", + "type": "github" + }, + "original": { + "owner": "LukeMathWalker", + "ref": "main", + "repo": "cargo-chef", + "type": "github" + } + }, "cargo-rdme": { "flake": false, "locked": { @@ -34,6 +51,23 @@ "type": "github" } }, + "cargo-rdme_2": { + "flake": false, + "locked": { + "lastModified": 1675118998, + "narHash": "sha256-lrYWqu3h88fr8gG3Yo5GbFGYaq5/1Os7UtM+Af0Bg4k=", + "owner": "orium", + "repo": "cargo-rdme", + "rev": "f9dbb6bccc078f4869f45ae270a2890ac9a75877", + "type": "github" + }, + "original": { + "owner": "orium", + "ref": "v1.1.0", + "repo": "cargo-rdme", + "type": "github" + } + }, "crane": { "inputs": { "flake-compat": "flake-compat", @@ -58,6 +92,31 @@ "type": "github" } }, + "crane_2": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "holonix", + "holochain", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1675475924, + "narHash": "sha256-KWdfV9a6+zG6Ij/7PZYLnomjBZZUu8gdRy+hfjGrrJQ=", + "owner": "ipetkov", + "repo": "crane", + "rev": "1bde9c762ebf26de9f8ecf502357c92105bc4577", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "crate2nix": { "flake": false, "locked": { @@ -74,6 +133,22 @@ "type": "github" } }, + "crate2nix_2": { + "flake": false, + "locked": { + "lastModified": 1675642992, + "narHash": "sha256-uDBDZuiq7qyg82Udp82/r4zg5HKfIzBQqgl2U9THiQM=", + "owner": "kolloch", + "repo": "crate2nix", + "rev": "45fc83132c8c91c77a1cd61fe0c945411d1edba8", + "type": "github" + }, + "original": { + "owner": "kolloch", + "repo": "crate2nix", + "type": "github" + } + }, "empty": { "flake": false, "locked": { @@ -90,6 +165,22 @@ "type": "github" } }, + "empty_2": { + "flake": false, + "locked": { + "lastModified": 1683792623, + "narHash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=", + "owner": "steveej", + "repo": "empty", + "rev": "8e328e450e4cd32e072eba9e99fe92cf2a1ef5cf", + "type": "github" + }, + "original": { + "owner": "steveej", + "repo": "empty", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -122,6 +213,38 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -139,6 +262,23 @@ "type": "indirect" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1675295133, + "narHash": "sha256-dU8fuLL98WFXG0VnRgM00bqKX6CEPBLybhiIDIgO45o=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "bf53492df08f3178ce85e0c9df8ed8d03c030c9f", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -155,6 +295,21 @@ } }, "flake-utils_2": { + "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_3": { "inputs": { "systems": "systems" }, @@ -172,7 +327,75 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "holochain": { + "inputs": { + "cargo-chef": "cargo-chef_2", + "cargo-rdme": "cargo-rdme_2", + "crane": "crane_2", + "crate2nix": "crate2nix_2", + "empty": "empty_2", + "flake-compat": "flake-compat_4", + "flake-parts": "flake-parts_2", + "holochain": [ + "holonix", + "holochain", + "empty" + ], + "lair": [ + "holonix", + "holochain", + "empty" + ], + "launcher": [ + "holonix", + "holochain", + "empty" + ], + "nix-filter": "nix-filter", + "nixpkgs": "nixpkgs", + "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "rust-overlay": "rust-overlay_3", + "scaffolding": [ + "holonix", + "holochain", + "empty" + ], + "versions": "versions" + }, + "locked": { + "lastModified": 1690227710, + "narHash": "sha256-HRVEz5Ldg2+pqciOpZ9fNdMfU93r/3LmUsbTA9jfDIY=", + "owner": "holochain", + "repo": "holochain", + "rev": "3f594f1a5cef41e896b99b6b46d336d54da3299d", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.2.1", + "repo": "holochain", + "type": "github" + } + }, + "holochain_2": { "flake": false, "locked": { "lastModified": 1686257124, @@ -189,6 +412,23 @@ "type": "github" } }, + "holochain_3": { + "flake": false, + "locked": { + "lastModified": 1684139928, + "narHash": "sha256-uno5MTiBwf9RiEiX6iKzJsB+3srJFKwV/1ReXzaZVVw=", + "owner": "holochain", + "repo": "holochain", + "rev": "a91b262e87653f5f2e3a50c06eaac2bb81fb88d3", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.2.1-beta-dev.0", + "repo": "holochain", + "type": "github" + } + }, "holonix": { "inputs": { "cargo-chef": "cargo-chef", @@ -198,10 +438,7 @@ "empty": "empty", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "holochain": [ - "holonix", - "empty" - ], + "holochain": "holochain", "lair": [ "holonix", "empty" @@ -210,10 +447,10 @@ "holonix", "empty" ], - "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs", - "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_2", + "nix-filter": "nix-filter_2", + "nixpkgs": "nixpkgs_2", + "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", + "rust-overlay": "rust-overlay_4", "scaffolding": [ "holonix", "empty" @@ -223,11 +460,11 @@ ] }, "locked": { - "lastModified": 1688106293, - "narHash": "sha256-JWgy8r+x0gY5N7gZslHl5sc371EXKGbsmOUvTUVXKU8=", + "lastModified": 1689402119, + "narHash": "sha256-1WsUSfFlTv5J3ysZilepYLE74NM/qC30XhVRJBz4DrU=", "owner": "holochain", "repo": "holochain", - "rev": "aa71951e17c32a32d4e5a7a700ceb9532709d0bf", + "rev": "be613888ca56cb8ecde15a1dbc39f2f7d07fb8c8", "type": "github" }, "original": { @@ -253,6 +490,23 @@ "type": "github" } }, + "lair_2": { + "flake": false, + "locked": { + "lastModified": 1682356264, + "narHash": "sha256-5ZYJ1gyyL3hLR8hCjcN5yremg8cSV6w1iKCOrpJvCmc=", + "owner": "holochain", + "repo": "lair", + "rev": "43be404da0fd9d57bf4429c44def405bd6490f61", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "lair_keystore-v0.2.4", + "repo": "lair", + "type": "github" + } + }, "launcher": { "flake": false, "locked": { @@ -270,6 +524,23 @@ "type": "github" } }, + "launcher_2": { + "flake": false, + "locked": { + "lastModified": 1684183666, + "narHash": "sha256-rOE/W/BBYyZKOyypKb8X9Vpc4ty1TNRoI/fV5+01JPw=", + "owner": "holochain", + "repo": "launcher", + "rev": "75ecdd0aa191ed830cc209a984a6030e656042ff", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.2", + "repo": "launcher", + "type": "github" + } + }, "nix-filter": { "locked": { "lastModified": 1675361037, @@ -285,6 +556,21 @@ "type": "github" } }, + "nix-filter_2": { + "locked": { + "lastModified": 1675361037, + "narHash": "sha256-CTbDuDxFD3U3g/dWUB+r+B/snIe+qqP1R+1myuFGe2I=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "e1b2f96c2a31415f362268bc48c3fccf47dff6eb", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1686869522, @@ -318,6 +604,39 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "dir": "lib", + "lastModified": 1675183161, + "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1686869522, + "narHash": "sha256-tbJ9B8WLCTnVP/LwESRlg0dII6Zyg2LmUU/mB9Lu98E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7c67f006ea0e7d0265f16d7df07cc076fdffd91f", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "pre-commit-hooks-nix": { "flake": false, "locked": { @@ -334,6 +653,22 @@ "type": "github" } }, + "pre-commit-hooks-nix_2": { + "flake": false, + "locked": { + "lastModified": 1676513100, + "narHash": "sha256-MK39nQV86L2ag4TmcK5/+r1ULpzRLPbbfvWbPvIoYJE=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "5f0cba88ac4d6dd8cad5c6f6f1540b3d6a21a798", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "holonix": "holonix", @@ -341,7 +676,7 @@ "holonix", "nixpkgs" ], - "versions": "versions" + "versions": "versions_2" } }, "rust-overlay": { @@ -373,18 +708,70 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": [ + "holonix", + "holochain", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "holonix", + "holochain", + "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_3": { + "inputs": { + "flake-utils": "flake-utils_3", "nixpkgs": [ "holonix", + "holochain", "nixpkgs" ] }, "locked": { - "lastModified": 1688092301, - "narHash": "sha256-NTgT955DzXWVjHsuBn1t2K0x4hUghY7uE1jG2nGL5R4=", + "lastModified": 1688438033, + "narHash": "sha256-wOmpZis06pVKTR+5meGwhrW10/buf98lnA26uQLaqek=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4c31223801dd0f28ac15d60f2e5ddbd4d51ce17a", + "rev": "c3e43223dece545cfe06ddd92fd782adc73d56c3", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "holonix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1689388484, + "narHash": "sha256-cR8W4LZTk1SFGhDUGG4RF7qPZP7d9qFmltk7nFi7WMo=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "15027511818ee595ca2ae6ec4b5f8f0e96c0fe47", "type": "github" }, "original": { @@ -410,6 +797,23 @@ "type": "github" } }, + "scaffolding_2": { + "flake": false, + "locked": { + "lastModified": 1683890859, + "narHash": "sha256-/nG2TGU4Q7zy0KGS/opcW1836LZ7FJhA+/OEh5gNj34=", + "owner": "holochain", + "repo": "scaffolding", + "rev": "1ca1092ad5d147bd23a75444874830cc033aa9cf", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.2", + "repo": "scaffolding", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -425,24 +829,59 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "versions": { "inputs": { - "holochain": "holochain", + "holochain": "holochain_2", "lair": "lair", "launcher": "launcher", "scaffolding": "scaffolding" }, "locked": { + "lastModified": 1686618210, + "narHash": "sha256-lXY9ob0WAekcoEgWcFL3cJiPkwoKlsR2OMqG0S3vXzA=", + "path": "./versions/0_1", + "type": "path" + }, + "original": { "dir": "versions/0_1", - "lastModified": 1688106293, - "narHash": "sha256-JWgy8r+x0gY5N7gZslHl5sc371EXKGbsmOUvTUVXKU8=", "owner": "holochain", "repo": "holochain", - "rev": "aa71951e17c32a32d4e5a7a700ceb9532709d0bf", + "type": "github" + } + }, + "versions_2": { + "inputs": { + "holochain": "holochain_3", + "lair": "lair_2", + "launcher": "launcher_2", + "scaffolding": "scaffolding_2" + }, + "locked": { + "dir": "versions/0_2", + "lastModified": 1689402119, + "narHash": "sha256-1WsUSfFlTv5J3ysZilepYLE74NM/qC30XhVRJBz4DrU=", + "owner": "holochain", + "repo": "holochain", + "rev": "be613888ca56cb8ecde15a1dbc39f2f7d07fb8c8", "type": "github" }, "original": { - "dir": "versions/0_1", + "dir": "versions/0_2", "owner": "holochain", "repo": "holochain", "type": "github" diff --git a/flake.nix b/flake.nix index 47700dbd..6a03a6c6 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,11 @@ { inputs = { - versions.url = "github:holochain/holochain?dir=versions/0_1"; + nixpkgs.follows = "holonix/nixpkgs"; + + versions.url = "github:holochain/holochain?dir=versions/0_2"; holonix.url = "github:holochain/holochain"; holonix.inputs.versions.follows = "versions"; - - nixpkgs.follows = "holonix/nixpkgs"; + holonix.inputs.holochain.url = "github:holochain/holochain/holochain-0.2.1"; }; outputs = inputs@{ holonix, ... }: @@ -18,7 +19,6 @@ inputsFrom = [ holonix.devShells.${system}.holonix ]; packages = with pkgs; [ # add further packages from nixpkgs - cargo-watch nodejs ]; }; diff --git a/package-lock.json b/package-lock.json index f87d6af7..fbd593e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -833,11 +833,11 @@ "integrity": "sha512-DJx4V2KXHVLciyOGjOYKTM/JLBpBEZ3RsPIRCgf7qmwhQdxXvhi2p+oFFRD51yUT5uC1/MzIVeJCl/R60PwFbw==" }, "node_modules/@holochain/tryorama": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/@holochain/tryorama/-/tryorama-0.11.2.tgz", - "integrity": "sha512-RCi7QtGejpzfGIx1EKyTX+QnkooGaUAY0TiFHDc5uamCvNNX1Ya6Esgvyrt2zpO5YBUUrSbdbB1gBB3a8bwr7A==", + "version": "0.15.0-rc.1", + "resolved": "https://registry.npmjs.org/@holochain/tryorama/-/tryorama-0.15.0-rc.1.tgz", + "integrity": "sha512-R7MyojYcfzVePyXSWtVSFW2G7LUpErb/krLN12MIvNxGd9355Lb/mLl6phEdsnpAJx6fUejM0KXQvbHUnzXjeA==", "dependencies": { - "@holochain/client": "^0.12.0", + "@holochain/client": "^0.14.1", "get-port": "^6.1.2", "lodash": "^4.17.21", "uuid": "^8.3.2", @@ -845,7 +845,26 @@ "ws": "^8.11.0" }, "engines": { - "node": "^14.13.1 || >=16.0.0 || >=18.0.0" + "node": ">=16.0.0 || >=18.0.0" + } + }, + "node_modules/@holochain/tryorama/node_modules/@holochain/client": { + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.14.1.tgz", + "integrity": "sha512-5rWPIRdxhvV+SpKHegKsPSw7AcN1JjtLS5RhAlLT7dsXvn70BcMWsImhBs1sqw69QsbEMKlhqaOH+sOS5LkDBQ==", + "dependencies": { + "@holochain/serialization": "^0.1.0-beta-rc.3", + "@msgpack/msgpack": "^2.7.2", + "@noble/ed25519": "^2.0.0", + "@tauri-apps/api": "^1.2.0", + "emittery": "^1.0.1", + "isomorphic-ws": "^5.0.0", + "js-base64": "^3.7.3", + "lodash-es": "^4.17.21", + "ws": "^8.13.0" + }, + "engines": { + "node": ">=16.0.0 || >=18.0.0" } }, "node_modules/@humanwhocodes/config-array": { @@ -6589,17 +6608,17 @@ }, "tests": { "dependencies": { - "@holochain/client": "^0.14.1", - "@holochain/tryorama": "^0.11.2", + "@holochain/client": "^0.15.0", + "@holochain/tryorama": "0.15.0-rc.1", "@msgpack/msgpack": "^2.8.0", "typescript": "^4.9.4", "vitest": "^0.28.5" } }, "tests/node_modules/@holochain/client": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.14.1.tgz", - "integrity": "sha512-5rWPIRdxhvV+SpKHegKsPSw7AcN1JjtLS5RhAlLT7dsXvn70BcMWsImhBs1sqw69QsbEMKlhqaOH+sOS5LkDBQ==", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.15.0.tgz", + "integrity": "sha512-4cZXSXEOf3XbYzq17Min5bymK/w4Ev3+S6doPj+1VQcZnn35JsP6eUdyKfRvSRopxykplXAM1xw0+8/j7DlHsA==", "dependencies": { "@holochain/serialization": "^0.1.0-beta-rc.3", "@msgpack/msgpack": "^2.7.2", @@ -6636,7 +6655,7 @@ "@fontsource/syne": "^5.0.3", "@headlessui/vue": "^1.7.14", "@holochain-open-dev/profiles": "^0.14.1", - "@holochain/client": "^0.14.1", + "@holochain/client": "^0.15.0", "@shoelace-style/shoelace": "^2.4.0", "@tanstack/query-persist-client-core": "^4.29.11", "@tanstack/query-sync-storage-persister": "^4.29.11", @@ -6678,9 +6697,9 @@ } }, "ui/node_modules/@holochain/client": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.14.1.tgz", - "integrity": "sha512-5rWPIRdxhvV+SpKHegKsPSw7AcN1JjtLS5RhAlLT7dsXvn70BcMWsImhBs1sqw69QsbEMKlhqaOH+sOS5LkDBQ==", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.15.0.tgz", + "integrity": "sha512-4cZXSXEOf3XbYzq17Min5bymK/w4Ev3+S6doPj+1VQcZnn35JsP6eUdyKfRvSRopxykplXAM1xw0+8/j7DlHsA==", "dependencies": { "@holochain/serialization": "^0.1.0-beta-rc.3", "@msgpack/msgpack": "^2.7.2", diff --git a/package.json b/package.json index f45310ac..7396d586 100644 --- a/package.json +++ b/package.json @@ -8,12 +8,13 @@ ], "scripts": { "start": "npm run network", - "network": "npm run build:happ && UI_PORT=8888 concurrently \"npm run playground\" \"npm run start:agent\" \"npm run start:agent\"", + "local-services": "hc run-local-services -b 54000 -s 55000", + "network": "npm run build:happ && UI_PORT=8888 concurrently \"npm run playground\" \"npm run local-services\" \"npm run start:agent\" \"npm run start:agent\"", "start:agent": "HC_PORT=$(port) HC_ADMIN_PORT=$(port) concurrently \"npm run launch:happ\" \"npm run start:browser -w ui\"", - "launch:happ": "hc s clean && echo pass | RUST_LOG=warn hc s --piped -f=$HC_ADMIN_PORT generate ./workdir/mewsfeed.happ --run=$HC_PORT -a mewsfeed network mdns", + "launch:happ": "hc s clean && echo pass | RUST_LOG=warn hc s --piped -f=$HC_ADMIN_PORT generate ./workdir/mewsfeed.happ --run=$HC_PORT -a mewsfeed network -b http://127.0.0.1:54000 webrtc ws://127.0.0.1:55000", "start:launcher": "AGENTS=2 npm run network:launcher", - "network:launcher": "hc s clean && npm run build:happ && UI_PORT=8888 concurrently \"npm start -w ui\" \"npm run launch:happ:launcher\" \"holochain-playground\"", - "launch:happ:launcher": "echo \"pass\" | RUST_LOG=warn hc launch --piped -n $AGENTS workdir/mewsfeed.happ --ui-port $UI_PORT network mdns", + "network:launcher": "hc s clean && npm run build:happ && UI_PORT=8888 concurrently \"npm run local-services\" \"npm start -w ui\" \"npm run launch:happ:launcher\" \"holochain-playground\"", + "launch:happ:launcher": "echo \"pass\" | RUST_LOG=warn hc launch --piped -n $AGENTS workdir/mewsfeed.happ --ui-port $UI_PORT network -b http://127.0.0.1:54000 webrtc ws://127.0.0.1:55000", "test": "npm run build:happ && npm t -w tests", "test:watch": "cargo watch --clear -- npm test", "package": "npm run build:happ && npm run package:ui && hc web-app pack workdir", diff --git a/tests/package.json b/tests/package.json index d3c8afd5..904b64a7 100644 --- a/tests/package.json +++ b/tests/package.json @@ -5,8 +5,8 @@ "test": "vitest run" }, "dependencies": { - "@holochain/client": "^0.14.1", - "@holochain/tryorama": "^0.11.2", + "@holochain/client": "^0.15.0", + "@holochain/tryorama": "0.15.0-rc.1", "@msgpack/msgpack": "^2.8.0", "typescript": "^4.9.4", "vitest": "^0.28.5" diff --git a/tests/src/mewsfeed/agent_pins/pinner-to-hashes.test.ts b/tests/src/mewsfeed/agent_pins/pinner-to-hashes.test.ts index c3d24b4d..843a4246 100644 --- a/tests/src/mewsfeed/agent_pins/pinner-to-hashes.test.ts +++ b/tests/src/mewsfeed/agent_pins/pinner-to-hashes.test.ts @@ -1,6 +1,6 @@ import { assert, test } from "vitest"; -import { runScenario, pause } from "@holochain/tryorama"; +import { runScenario, dhtSync } from "@holochain/tryorama"; import { AgentPubKey, HoloHash, fakeActionHash } from "@holochain/client"; test("link a Pinner to a Hash", async () => { @@ -42,7 +42,7 @@ test("link a Pinner to a Hash", async () => { payload: targetHash, }); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Bob gets the links again linksOutput = await bob.cells[0].callZome({ @@ -67,7 +67,7 @@ test("link a Pinner to a Hash", async () => { payload: targetHash, }); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Bob gets the links again linksOutput = await bob.cells[0].callZome({ @@ -87,6 +87,6 @@ test("link a Pinner to a Hash", async () => { assert.equal(linksOutput.length, 0); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); diff --git a/tests/src/mewsfeed/follows/follower-to-creators.test.ts b/tests/src/mewsfeed/follows/follower-to-creators.test.ts index b99ace20..b5326afb 100644 --- a/tests/src/mewsfeed/follows/follower-to-creators.test.ts +++ b/tests/src/mewsfeed/follows/follower-to-creators.test.ts @@ -1,5 +1,5 @@ import { assert, test, expect } from "vitest"; -import { runScenario, pause } from "@holochain/tryorama"; +import { runScenario, dhtSync } from "@holochain/tryorama"; import { AgentPubKey, Record } from "@holochain/client"; import { mewsfeedAppBundleSource } from "../../common"; @@ -43,7 +43,7 @@ test("link a Follower to a Creator", async () => { }, }); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Bob gets the links again linksOutput = await bob.cells[0].callZome({ @@ -74,7 +74,7 @@ test("link a Follower to a Creator", async () => { }, }); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Bob gets the links again linksOutput = await bob.cells[0].callZome({ @@ -97,7 +97,7 @@ test("link a Follower to a Creator", async () => { assert.equal(linksOutput.length, 0); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -127,11 +127,10 @@ test("Agent cannot follow themselves", async () => { ); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); - test("Agent can only change their own follows", async () => { await runScenario( async (scenario) => { @@ -159,7 +158,7 @@ test("Agent can only change their own follows", async () => { payload: targetAddress, }); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Bob tries to remove alices' follow const response = bob.cells[0].callZome({ @@ -182,7 +181,7 @@ test("Agent can only change their own follows", async () => { payload: targetAddress, }); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Bob tries to add a follow for allice const response2 = bob.cells[0].callZome({ @@ -199,7 +198,7 @@ test("Agent can only change their own follows", async () => { ); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -269,7 +268,7 @@ test( }, }); - await pause(1000); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); const page1: AgentPubKey[] = await alice.cells[0].callZome({ zome_name: "follows", @@ -399,7 +398,10 @@ test( }, }); - await pause(1000); + await dhtSync( + [alice, bob, carol, john, steve, mary], + alice.cells[0].cell_id[0] + ); const page1: AgentPubKey[] = await alice.cells[0].callZome({ zome_name: "follows", diff --git a/tests/src/mewsfeed/likes/liker-to-hashes.test.ts b/tests/src/mewsfeed/likes/liker-to-hashes.test.ts index 662cd565..6cea47fb 100644 --- a/tests/src/mewsfeed/likes/liker-to-hashes.test.ts +++ b/tests/src/mewsfeed/likes/liker-to-hashes.test.ts @@ -1,5 +1,5 @@ import { assert, expect, test } from "vitest"; -import { runScenario, pause } from "@holochain/tryorama"; +import { runScenario, dhtSync } from "@holochain/tryorama"; import { Record, fakeActionHash } from "@holochain/client"; import { mewsfeedAppBundleSource } from "../../common"; @@ -41,7 +41,7 @@ test("link a Liker to a Hash", async () => { }, }); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Bob gets the links again linksOutput = await bob.cells[0].callZome({ @@ -68,7 +68,7 @@ test("link a Liker to a Hash", async () => { }, }); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Bob gets the links again linksOutput = await bob.cells[0].callZome({ @@ -87,7 +87,7 @@ test("link a Liker to a Hash", async () => { assert.equal(linksOutput.length, 0); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -117,7 +117,7 @@ test("Agent can only change their own likes", async () => { payload: targetAddress, }); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Bob tries to remove alices' like const response = bob.cells[0].callZome({ @@ -140,7 +140,7 @@ test("Agent can only change their own likes", async () => { payload: targetAddress, }); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Bob tries to add a like for allice const response2 = bob.cells[0].callZome({ @@ -157,6 +157,6 @@ test("Agent can only change their own likes", async () => { ); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); diff --git a/tests/src/mewsfeed/mews/agent-mews.test.ts b/tests/src/mewsfeed/mews/agent-mews.test.ts index ec59764d..e09914cb 100644 --- a/tests/src/mewsfeed/mews/agent-mews.test.ts +++ b/tests/src/mewsfeed/mews/agent-mews.test.ts @@ -1,10 +1,9 @@ +import { ActionHash } from "@holochain/client"; +import { dhtSync, runScenario } from "@holochain/tryorama"; import { assert, expect, test } from "vitest"; -import { runScenario, pause } from "@holochain/tryorama"; -import { ActionHash, Record } from "@holochain/client"; -import { decode } from "@msgpack/msgpack"; -import { createMew } from "./common"; import { FeedMew, Mew, MewTypeName } from "../../../../ui/src/types/types"; import { mewsfeedAppBundleSource } from "../../common"; +import { createMew } from "./common"; test("create a Mew and get agent mews", async () => { await runScenario( @@ -37,7 +36,7 @@ test("create a Mew and get agent mews", async () => { const actionHash: ActionHash = await createMew(alice.cells[0]); assert.ok(actionHash); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Bob gets agent mews again collectionOutput = await bob.cells[0].callZome({ @@ -51,7 +50,7 @@ test("create a Mew and get agent mews", async () => { assert.deepEqual(actionHash, collectionOutput[0].action_hash); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -153,8 +152,6 @@ test("Agent mews list are time-paginated", async () => { payload: createMewInput7, }); - await pause(1000); - const page1: FeedMew[] = await alice.cells[0].callZome({ zome_name: "mews", fn_name: "get_agent_mews_with_context", @@ -250,6 +247,6 @@ test("Agent mews list are time-paginated", async () => { assert.lengthOf(page5, 0); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); diff --git a/tests/src/mewsfeed/mews/agent-to-notifications.test.ts b/tests/src/mewsfeed/mews/agent-to-notifications.test.ts index 1551b5ce..27cd3e62 100644 --- a/tests/src/mewsfeed/mews/agent-to-notifications.test.ts +++ b/tests/src/mewsfeed/mews/agent-to-notifications.test.ts @@ -1,7 +1,6 @@ -import { assert, expect, test } from "vitest"; -import { runScenario, pause } from "@holochain/tryorama"; import { ActionHash } from "@holochain/client"; -import { createMew } from "./common"; +import { dhtSync, runScenario } from "@holochain/tryorama"; +import { assert, expect, test } from "vitest"; import { FeedMew, Mew, @@ -10,6 +9,7 @@ import { PaginationDirectionName, } from "../../../../ui/src/types/types"; import { mewsfeedAppBundleSource } from "../../common"; +import { createMew } from "./common"; test("notifications include my agent follows & unfollows", async () => { await runScenario( @@ -48,7 +48,7 @@ test("notifications include my agent follows & unfollows", async () => { }, }); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Alice gets notifications const notifications = await alice.cells[0].callZome({ @@ -68,7 +68,7 @@ test("notifications include my agent follows & unfollows", async () => { }); }, true, - { timeout: 150000 } + { timeout: 500000 } ); }); @@ -98,7 +98,7 @@ test("notifications include my mews' likes & unlikes", async () => { payload: actionHash, }); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Bob likes Alice's Mew await bob.cells[0].callZome({ @@ -120,7 +120,7 @@ test("notifications include my mews' likes & unlikes", async () => { }, }); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Alice gets notifications const notifications = await alice.cells[0].callZome({ @@ -141,7 +141,7 @@ test("notifications include my mews' likes & unlikes", async () => { }); }, true, - { timeout: 150000 } + { timeout: 500000 } ); }); @@ -171,7 +171,7 @@ test("notifications include my mews' pins & unpins", async () => { payload: actionHash, }); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Bob likes Alice's Mew await bob.cells[0].callZome({ @@ -193,7 +193,7 @@ test("notifications include my mews' pins & unpins", async () => { }, }); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Alice gets notifications const notifications = await alice.cells[0].callZome({ @@ -214,7 +214,7 @@ test("notifications include my mews' pins & unpins", async () => { }); }, true, - { timeout: 150000 } + { timeout: 500000 } ); }); @@ -239,7 +239,7 @@ test("notifications include my mews' replies, quotes, mewmews", async () => { const actionHash: ActionHash = await createMew(alice.cells[0]); assert.ok(actionHash); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Bob replies to Alice's mew const replyInput: Mew = { @@ -292,7 +292,7 @@ test("notifications include my mews' replies, quotes, mewmews", async () => { payload: quoteActionHash, }); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Alice gets notifications const notifications = await alice.cells[0].callZome({ @@ -318,7 +318,7 @@ test("notifications include my mews' replies, quotes, mewmews", async () => { }); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -344,7 +344,7 @@ test("notifications include replies, quotes, mewmews to mews that I also respond const actionHash: ActionHash = await createMew(carol.cells[0]); assert.ok(actionHash); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Alice reply's to Carol's mew await alice.cells[0].callZome({ @@ -408,7 +408,7 @@ test("notifications include replies, quotes, mewmews to mews that I also respond payload: quoteActionHash, }); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Alice gets notifications const notifications = await alice.cells[0].callZome({ @@ -440,7 +440,7 @@ test("notifications include replies, quotes, mewmews to mews that I also respond }); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -465,7 +465,7 @@ test("notifications list is time-paginated", async () => { const actionHash: ActionHash = await createMew(alice.cells[0]); assert.ok(actionHash); - await pause(1200); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Bob replies to Alice's mew const replyInput: Mew = { @@ -586,7 +586,7 @@ test("notifications list is time-paginated", async () => { payload: replyActionHash7, }); - await pause(1000); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Alice gets notifications const page1 = await alice.cells[0].callZome({ @@ -710,6 +710,6 @@ test("notifications list is time-paginated", async () => { assert.lengthOf(page5, 0); }, true, - { timeout: 150000 } + { timeout: 500000 } ); }); diff --git a/tests/src/mewsfeed/mews/dna-properties.test.ts b/tests/src/mewsfeed/mews/dna-properties.test.ts index 7d2ce22c..ffcc9369 100644 --- a/tests/src/mewsfeed/mews/dna-properties.test.ts +++ b/tests/src/mewsfeed/mews/dna-properties.test.ts @@ -1,6 +1,6 @@ -import { Record } from "@holochain/client"; -import { getZomeCaller, runScenario } from "@holochain/tryorama"; -import { assert, test, expect } from "vitest"; +import { ActionHash } from "@holochain/client"; +import { runScenario } from "@holochain/tryorama"; +import { assert, expect, test } from "vitest"; import { Mew, MewTypeName } from "../../../../ui/src/types/types.js"; import { mewsfeedAppBundleSource, @@ -53,7 +53,7 @@ test("Mew must not be longer than DNA property mew_characters_max chars", async } }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -103,7 +103,7 @@ test("Mew must not be shorter than DNA property mew_characters_min chars", async } }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -158,7 +158,7 @@ test("Mew can be any length if DNA property mew_characters_min and mew_character ); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -185,6 +185,6 @@ test("Can get deserialized DNA Properties", async () => { expect(properties).toHaveProperty("mew_characters_max", 200); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); diff --git a/tests/src/mewsfeed/mews/followed-creators-mews.test.ts b/tests/src/mewsfeed/mews/followed-creators-mews.test.ts index 0cc2476e..073e25ad 100644 --- a/tests/src/mewsfeed/mews/followed-creators-mews.test.ts +++ b/tests/src/mewsfeed/mews/followed-creators-mews.test.ts @@ -1,6 +1,6 @@ import { assert, expect, test } from "vitest"; -import { runScenario, pause } from "@holochain/tryorama"; -import { ActionHash, Record } from "@holochain/client"; +import { runScenario, dhtSync } from "@holochain/tryorama"; +import { ActionHash } from "@holochain/client"; import { createMew } from "./common"; import { FeedMew, Mew, MewTypeName } from "../../../../ui/src/types/types"; import { mewsfeedAppBundleSource } from "../../common"; @@ -41,7 +41,7 @@ test("create a Mew and get followed creators mews", async () => { const actionHash: ActionHash = await createMew(alice.cells[0]); assert.ok(actionHash); - await pause(2500); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Bob gets followed creators mews again collectionOutput = await bob.cells[0].callZome({ @@ -54,7 +54,7 @@ test("create a Mew and get followed creators mews", async () => { assert.deepEqual(actionHash, collectionOutput[0].action_hash); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -116,7 +116,7 @@ test("Followed creators mews should include mews of followed creator", async () ); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -172,7 +172,7 @@ test("Followed creators mews should include own mews", async () => { ); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -223,7 +223,7 @@ test("Followed creators mews should not include mews of non-followed creator", a fn_name: "follow", payload: alice.agentPubKey, }); - await pause(2500); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); const bobMewsFeed: FeedMew[] = await bob.cells[0].callZome({ zome_name: "mews", @@ -238,7 +238,7 @@ test("Followed creators mews should not include mews of non-followed creator", a ); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -276,7 +276,7 @@ test("Unfollowing should exclude creators mews from feed", async () => { fn_name: "follow", payload: alice.agentPubKey, }); - await pause(2500); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); const bobMewsFeedWhenFollowing: FeedMew[] = await bob.cells[0].callZome({ zome_name: "mews", @@ -307,7 +307,7 @@ test("Unfollowing should exclude creators mews from feed", async () => { assert.ok(bobMewsFeed.length === 0, "bob's mews feed is empty"); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -388,7 +388,7 @@ test("Followed creators mews should be ordered by timestamp in descending order" payload: carol.agentPubKey, }); - await pause(2500); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); const aliceMewsFeed: FeedMew[] = await alice.cells[0].callZome({ zome_name: "mews", @@ -421,7 +421,7 @@ test("Followed creators mews should be ordered by timestamp in descending order" ); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -532,7 +532,7 @@ test("Followed creators mews list are time-paginated", async () => { payload: alice.agentPubKey, }); - await pause(2500); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); const page1: FeedMew[] = await bob.cells[0].callZome({ zome_name: "mews", @@ -613,6 +613,6 @@ test("Followed creators mews list are time-paginated", async () => { assert.lengthOf(page5, 0); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); diff --git a/tests/src/mewsfeed/mews/mention-to-mews.test.ts b/tests/src/mewsfeed/mews/mention-to-mews.test.ts index 3780f245..79eba740 100644 --- a/tests/src/mewsfeed/mews/mention-to-mews.test.ts +++ b/tests/src/mewsfeed/mews/mention-to-mews.test.ts @@ -1,4 +1,4 @@ -import { pause, runScenario } from "@holochain/tryorama"; +import { dhtSync, runScenario } from "@holochain/tryorama"; import { assert, expect, test } from "vitest"; import { FeedMew, @@ -45,7 +45,7 @@ test("mention in mews", async () => { mew_type: { Original: null }, }); - await pause(1000); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); const mentionedMewsBob: FeedMew[] = await alice.cells[0].callZome({ zome_name: "mews", @@ -68,7 +68,7 @@ test("mention in mews", async () => { assert.deepEqual(mentionedMewsAlice[0].action_hash, actionHash3); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -170,8 +170,6 @@ test("Mentions list are time-paginated", async () => { payload: createMewInput7, }); - await pause(1000); - const page1: FeedMew[] = await alice.cells[0].callZome({ zome_name: "mews", fn_name: "get_mews_for_mention_with_context", @@ -267,6 +265,6 @@ test("Mentions list are time-paginated", async () => { assert.lengthOf(page5, 0); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); diff --git a/tests/src/mewsfeed/mews/mew-to-responses.test.ts b/tests/src/mewsfeed/mews/mew-to-responses.test.ts index 6b65def1..498baaae 100644 --- a/tests/src/mewsfeed/mews/mew-to-responses.test.ts +++ b/tests/src/mewsfeed/mews/mew-to-responses.test.ts @@ -72,7 +72,7 @@ test("Agent can reply to a mew", async () => { ); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -154,7 +154,7 @@ test("Agent can mewmew a mew, only once", async () => { ); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -224,6 +224,6 @@ test("Agent can quote a mew", async () => { ); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); diff --git a/tests/src/mewsfeed/mews/pinner-to-mews.test.ts b/tests/src/mewsfeed/mews/pinner-to-mews.test.ts index 5e5bbefe..c784031c 100644 --- a/tests/src/mewsfeed/mews/pinner-to-mews.test.ts +++ b/tests/src/mewsfeed/mews/pinner-to-mews.test.ts @@ -1,8 +1,8 @@ +import { ActionHash } from "@holochain/client"; +import { dhtSync, runScenario } from "@holochain/tryorama"; import { assert, test } from "vitest"; -import { runScenario, pause } from "@holochain/tryorama"; -import { ActionHash, Record } from "@holochain/client"; -import { createMew } from "./common.js"; import { FeedMew } from "../../../../ui/src/types/types.js"; +import { createMew } from "./common.js"; test("link a Pinner to a Mew", async () => { await runScenario( @@ -43,7 +43,7 @@ test("link a Pinner to a Mew", async () => { payload: targetActionHash, }); - await pause(2500); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Bob gets the links again linksOutput = await bob.cells[0].callZome({ @@ -60,7 +60,7 @@ test("link a Pinner to a Mew", async () => { payload: targetActionHash, }); - await pause(2500); + await dhtSync([alice, bob], alice.cells[0].cell_id[0]); // Bob gets the links again linksOutput = await bob.cells[0].callZome({ @@ -71,6 +71,6 @@ test("link a Pinner to a Mew", async () => { assert.equal(linksOutput.length, 0); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); diff --git a/tests/src/mewsfeed/mews/tags-to-mews.test.ts b/tests/src/mewsfeed/mews/tags-to-mews.test.ts index 728f586a..7d4e2133 100644 --- a/tests/src/mewsfeed/mews/tags-to-mews.test.ts +++ b/tests/src/mewsfeed/mews/tags-to-mews.test.ts @@ -43,8 +43,6 @@ test("Hashtag, cashtag and mention", async () => { "alice created a valid mew" ); - await pause(1000); - const hashtaggedMews: FeedMew[] = await alice.cells[0].callZome({ zome_name: "mews", fn_name: "get_mews_for_hashtag_with_context", @@ -105,7 +103,7 @@ test("Hashtag, cashtag and mention", async () => { assert.ok(mentionedMews.length === 1, "one mew with mention"); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -142,8 +140,6 @@ test("Prefix index should return hashtags and cashtags", async () => { "alice created a valid mew" ); - await pause(1000); - const hashtags: string[] = await alice.cells[0].callZome({ zome_name: "mews", fn_name: "search_tags", @@ -193,7 +189,7 @@ test("Prefix index should return hashtags and cashtags", async () => { assert.equal(cashtags[0], "$cashtag", "hashtag search result matches"); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -295,8 +291,6 @@ test("Hashtags list are time-paginated", async () => { payload: createMewInput7, }); - await pause(1000); - const page1: FeedMew[] = await alice.cells[0].callZome({ zome_name: "mews", fn_name: "get_mews_for_hashtag_with_context", @@ -394,7 +388,7 @@ test("Hashtags list are time-paginated", async () => { assert.lengthOf(page5, 0); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); @@ -496,8 +490,6 @@ test("Cashtags list are time-paginated", async () => { payload: createMewInput7, }); - await pause(1000); - const page1: FeedMew[] = await alice.cells[0].callZome({ zome_name: "mews", fn_name: "get_mews_for_cashtag_with_context", @@ -601,6 +593,6 @@ test("Cashtags list are time-paginated", async () => { assert.lengthOf(page5, 0); }, true, - { timeout: 100000 } + { timeout: 500000 } ); }); diff --git a/tests/vitest.config.ts b/tests/vitest.config.ts index 2657d47e..e81c748a 100644 --- a/tests/vitest.config.ts +++ b/tests/vitest.config.ts @@ -3,7 +3,7 @@ import { defineConfig } from "vitest/config"; export default defineConfig({ test: { threads: false, - testTimeout: 60 * 1000 * 3, // 3 mins + testTimeout: 60 * 1000 * 10, // 10 mins outputDiffLines: 100, outputDiffMaxSize: 100000, }, diff --git a/ui/package.json b/ui/package.json index f75937fe..0f50adb0 100644 --- a/ui/package.json +++ b/ui/package.json @@ -17,7 +17,7 @@ "@fontsource/syne": "^5.0.3", "@headlessui/vue": "^1.7.14", "@holochain-open-dev/profiles": "^0.14.1", - "@holochain/client": "^0.14.1", + "@holochain/client": "^0.15.0", "@shoelace-style/shoelace": "^2.4.0", "@tanstack/query-persist-client-core": "^4.29.11", "@tanstack/query-sync-storage-persister": "^4.29.11", diff --git a/ui/src/components/BaseMewContent.vue b/ui/src/components/BaseMewContent.vue index cd91ede3..35a6d7c6 100644 --- a/ui/src/components/BaseMewContent.vue +++ b/ui/src/components/BaseMewContent.vue @@ -21,7 +21,7 @@