From dc65fa0fcb6de3f50cda3314aa1b1ec693d9c993 Mon Sep 17 00:00:00 2001 From: Jost Schulte <28270981+jost-s@users.noreply.github.com> Date: Thu, 14 Nov 2024 17:29:30 -0600 Subject: [PATCH] fix!: compatibility with holochain 0.5 (#242) * fix it all * docs * fix string value * rebuild docs --------- Co-authored-by: Jost Schulte --- CHANGELOG.md | 2 + Cargo.lock | 1070 ++++++++++------- Cargo.toml | 4 +- crates/trycp_server/Cargo.toml | 2 +- crates/trycp_server/tests/integration.rs | 10 +- ...yorama.conductoroptions.dpkinetworkseed.md | 15 - docs/tryorama.conductoroptions.md | 40 - docs/tryorama.conductoroptions.nodpki.md | 13 - docs/tryorama.createconductoroptions.md | 2 +- ...a.trycpconductoroptions.dpkinetworkseed.md | 13 - docs/tryorama.trycpconductoroptions.md | 40 - docs/tryorama.trycpconductoroptions.nodpki.md | 15 - .../tryorama.trycpscenario.dpkinetworkseed.md | 11 - docs/tryorama.trycpscenario.md | 34 - docs/tryorama.trycpscenario.nodpki.md | 11 - flake.lock | 32 +- package-lock.json | 9 +- package.json | 2 +- ts/src/local/conductor.ts | 30 +- ts/src/local/scenario.ts | 2 - ts/src/trycp/conductor/conductor.ts | 16 +- ts/src/trycp/conductor/scenario.ts | 14 +- ts/test/fixture/zomes/coordinator/src/lib.rs | 178 +-- ts/test/local/conductor.ts | 144 +-- ts/test/local/scenario.ts | 304 ++--- ts/test/trycp/conductor.ts | 121 +- ts/test/trycp/scenario.ts | 49 +- 27 files changed, 1042 insertions(+), 1141 deletions(-) delete mode 100644 docs/tryorama.conductoroptions.dpkinetworkseed.md delete mode 100644 docs/tryorama.conductoroptions.nodpki.md delete mode 100644 docs/tryorama.trycpconductoroptions.dpkinetworkseed.md delete mode 100644 docs/tryorama.trycpconductoroptions.nodpki.md delete mode 100644 docs/tryorama.trycpscenario.dpkinetworkseed.md delete mode 100644 docs/tryorama.trycpscenario.nodpki.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 87f7fd8a..1e101aba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Removed ### Changed ### Fixed +- Disable unstable DPKI. +- Disable tests with unstable features. ## 2024-10-10: v0.18.0-dev.0 ### Changed diff --git a/Cargo.lock b/Cargo.lock index cf8e261f..0b421e35 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -47,9 +47,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" [[package]] name = "android-tzdata" @@ -77,9 +77,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -92,43 +92,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "approx" @@ -141,9 +141,9 @@ dependencies = [ [[package]] name = "arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" dependencies = [ "derive_arbitrary", ] @@ -166,9 +166,9 @@ version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -297,9 +297,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" [[package]] name = "byteorder" @@ -309,9 +309,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "camino" @@ -342,14 +342,14 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "cc" -version = "1.1.28" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "shlex", ] @@ -404,9 +404,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ "clap_builder", "clap_derive", @@ -414,9 +414,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" dependencies = [ "anstream", "anstyle", @@ -431,22 +431,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck 0.5.0", - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "colored" @@ -506,9 +506,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6" dependencies = [ "libc", ] @@ -594,7 +594,7 @@ checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", "strsim 0.10.0", "syn 1.0.109", @@ -608,10 +608,10 @@ checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", "strsim 0.11.1", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -633,14 +633,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] name = "dary_heap" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca" +checksum = "04d2cd9c18b9f454ed67da600630b021a8a80bf33f8c95896ab33aaf1c26b728" [[package]] name = "dashmap" @@ -678,20 +678,20 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", "syn 1.0.109", ] [[package]] name = "derive_arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -710,9 +710,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" dependencies = [ "darling 0.20.10", - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -722,7 +722,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -732,10 +732,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", "rustc_version", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -760,9 +760,9 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -785,9 +785,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if 1.0.0", ] @@ -841,9 +841,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fastrand" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "filetime" @@ -859,9 +859,9 @@ dependencies = [ [[package]] name = "fixt" -version = "0.4.0-rc.0" +version = "0.5.0-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a61c0fd4010d5d20f6383c16c523159aa7e8513c2fb2fd79d6fb319831af7623" +checksum = "61de34eb56867ef8356aa79111568e10108020b4177971b1729f87cd212e6494" dependencies = [ "holochain_serialized_bytes", "lazy_static", @@ -876,9 +876,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -974,9 +974,9 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -1038,8 +1038,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -1051,7 +1053,7 @@ dependencies = [ "futures", "must_future", "paste", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "tracing-futures", @@ -1100,9 +1102,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" dependencies = [ "allocator-api2", "equivalent", @@ -1146,14 +1148,14 @@ dependencies = [ [[package]] name = "hdi" -version = "0.6.0-dev.0" +version = "0.6.0-dev.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af78e9b24538f22e7b10e9bd933d0ea3f77618a77b1011333aac6947b26b3" +checksum = "07faadf3f9a01463006a0cdab618f3b15349b77f20b26d924ed98fd18e2ff6bb" dependencies = [ "getrandom", "hdk_derive", - "holo_hash 0.5.0-dev.0", - "holochain_integrity_types 0.5.0-dev.0", + "holo_hash", + "holochain_integrity_types", "holochain_wasmer_guest", "paste", "serde", @@ -1164,36 +1166,36 @@ dependencies = [ [[package]] name = "hdk" -version = "0.5.0-dev.0" +version = "0.5.0-dev.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "173945f0aa24fb566921a6b36c9c148217f35e00dd185c98f793e9b1580104d1" +checksum = "adc930d98b193eedb1854095c64bdc53941ae29170035541cda89a6bbd9b13e1" dependencies = [ "getrandom", "hdi", "hdk_derive", - "holo_hash 0.5.0-dev.0", + "holo_hash", "holochain_wasmer_guest", - "holochain_zome_types 0.5.0-dev.0", + "holochain_zome_types", "paste", "serde", "serde_bytes", - "thiserror", + "thiserror 1.0.69", "tracing", "tracing-core", ] [[package]] name = "hdk_derive" -version = "0.5.0-dev.0" +version = "0.5.0-dev.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0f3a32de97f3729ef6d1e47a9f8d589b46820dcdd356581c39fb44820ace1c" +checksum = "7c1de80512ee3489781c48731771e772da4b1efa4411b9828c60dae15c868480" dependencies = [ "darling 0.14.4", "heck 0.5.0", - "holochain_integrity_types 0.5.0-dev.0", + "holochain_integrity_types", "paste", "proc-macro-error", - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", "syn 1.0.109", ] @@ -1242,9 +1244,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.4.0-rc.0" +version = "0.5.0-dev.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190c060ed23f60135e8ba0ff08c77a7ca283af35cc4aadf321433bfade7bcf5b" +checksum = "52b1609ab3426ffbc6b96c0ae917d5281682f6bde22c1799fdc2d2f65d1c716d" dependencies = [ "base64 0.22.1", "blake2b_simd", @@ -1252,71 +1254,55 @@ dependencies = [ "fixt", "futures", "holochain_serialized_bytes", - "holochain_util 0.4.0-rc.0", + "holochain_util", "holochain_wasmer_common", - "kitsune_p2p_dht_arc 0.4.0-rc.0", + "kitsune_p2p_dht_arc", "must_future", "rand", "rusqlite", "serde", "serde_bytes", - "thiserror", -] - -[[package]] -name = "holo_hash" -version = "0.5.0-dev.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5dc048798bbb36c18131b96200a8fc506f11516c9ba3db2b9f1ad0cca3d6ea4" -dependencies = [ - "base64 0.22.1", - "blake2b_simd", - "derive_more", - "holochain_serialized_bytes", - "holochain_util 0.5.0-dev.0", - "holochain_wasmer_common", - "kitsune_p2p_dht_arc 0.5.0-dev.0", - "serde", - "serde_bytes", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "holochain_conductor_api" -version = "0.4.0-rc.0" +version = "0.5.0-dev.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ded20913f3762de61e52e86de769a19da49d55d7ab606f10002cbb44fd67784" +checksum = "138dfb6a34285a9d2f842b4eedb1c54a5db47845557fd2da6493ed928d1562d8" dependencies = [ + "cfg-if 1.0.0", "derive_more", - "holo_hash 0.4.0-rc.0", + "holo_hash", "holochain_keystore", "holochain_serialized_bytes", "holochain_state_types", "holochain_types", - "holochain_zome_types 0.4.0-rc.0", - "kitsune_p2p_bin_data 0.4.0-rc.0", + "holochain_zome_types", + "indexmap 2.6.0", + "kitsune_p2p_bin_data", "kitsune_p2p_types", "nanoid", "serde", "serde_yaml", "shrinkwraprs", - "thiserror", + "thiserror 1.0.69", "tracing", "url2", ] [[package]] name = "holochain_integrity_types" -version = "0.4.0-rc.0" +version = "0.5.0-dev.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55fd6b8aa759be57a51c6af632d81e50e3200ac10d38dd35e094c1ed957591b9" +checksum = "1ad6856a52474f4d99818b3492260e1a53e8d7a766584bce1e8dfd2a3475dfc3" dependencies = [ "derive_builder", - "holo_hash 0.4.0-rc.0", - "holochain_secure_primitive 0.4.0-rc.0", + "holo_hash", + "holochain_secure_primitive", "holochain_serialized_bytes", - "holochain_util 0.4.0-rc.0", - "kitsune_p2p_timestamp 0.4.0-rc.0", + "holochain_util", + "kitsune_p2p_timestamp", "serde", "serde_bytes", "subtle", @@ -1324,37 +1310,20 @@ dependencies = [ "tracing", ] -[[package]] -name = "holochain_integrity_types" -version = "0.5.0-dev.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1a86905cce3b389c6d3424aae96045f62d72cf03ef863603176c883ff2e675" -dependencies = [ - "holo_hash 0.5.0-dev.0", - "holochain_secure_primitive 0.5.0-dev.0", - "holochain_serialized_bytes", - "holochain_util 0.5.0-dev.0", - "kitsune_p2p_timestamp 0.5.0-dev.0", - "serde", - "serde_bytes", - "subtle", - "tracing", -] - [[package]] name = "holochain_keystore" -version = "0.4.0-rc.0" +version = "0.5.0-dev.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5c135edc09905e7732976aa15522b9a868a4cae97f20040bc950173fd39968b" +checksum = "89d0ba47f19341ed3b800281005063cf911ea31cc12bbbe21add55579d1d1661" dependencies = [ "base64 0.22.1", "derive_more", "futures", - "holo_hash 0.4.0-rc.0", - "holochain_secure_primitive 0.4.0-rc.0", + "holo_hash", + "holochain_secure_primitive", "holochain_serialized_bytes", - "holochain_util 0.4.0-rc.0", - "holochain_zome_types 0.4.0-rc.0", + "holochain_util", + "holochain_zome_types", "kitsune_p2p_types", "lair_keystore", "must_future", @@ -1365,22 +1334,11 @@ dependencies = [ "serde_bytes", "shrinkwraprs", "sodoken", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] -[[package]] -name = "holochain_nonce" -version = "0.4.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e9d716254b6d1eba405b5fc0f09dc8d4260482fa06dbe98a4c610b38fd83de" -dependencies = [ - "getrandom", - "holochain_secure_primitive 0.4.0-rc.0", - "kitsune_p2p_timestamp 0.4.0-rc.0", -] - [[package]] name = "holochain_nonce" version = "0.5.0-dev.0" @@ -1388,19 +1346,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ddfd5d439236f7851cafbb50675cc21b4e5bacc97b0940e0afbeb06ffd88e92" dependencies = [ "getrandom", - "holochain_secure_primitive 0.5.0-dev.0", - "kitsune_p2p_timestamp 0.5.0-dev.0", -] - -[[package]] -name = "holochain_secure_primitive" -version = "0.4.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3160015099d36ece72a40d78fe08033837dd5c8ea9cb23f01782986238a66480" -dependencies = [ - "paste", - "serde", - "subtle", + "holochain_secure_primitive", + "kitsune_p2p_timestamp", ] [[package]] @@ -1426,7 +1373,7 @@ dependencies = [ "serde-transcode", "serde_bytes", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1441,9 +1388,9 @@ dependencies = [ [[package]] name = "holochain_sqlite" -version = "0.4.0-rc.0" +version = "0.5.0-dev.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0975cf8f7e57a5b809639655628b6a89dff506b3f21682195709117574eaba9" +checksum = "e286aaa294e4384e3913aafb57ffb4e9feedfab265883ff6ffe71d80cec58583" dependencies = [ "anyhow", "async-trait", @@ -1453,15 +1400,15 @@ dependencies = [ "futures", "getrandom", "hc_r2d2_sqlite", - "holo_hash 0.4.0-rc.0", - "holochain_nonce 0.4.0-rc.0", + "holo_hash", + "holochain_nonce", "holochain_serialized_bytes", - "holochain_util 0.4.0-rc.0", - "holochain_zome_types 0.4.0-rc.0", - "kitsune_p2p_bin_data 0.4.0-rc.0", + "holochain_util", + "holochain_zome_types", + "kitsune_p2p_bin_data", "kitsune_p2p_dht", - "kitsune_p2p_dht_arc 0.4.0-rc.0", - "kitsune_p2p_timestamp 0.4.0-rc.0", + "kitsune_p2p_dht_arc", + "kitsune_p2p_timestamp", "kitsune_p2p_types", "nanoid", "num_cpus", @@ -1479,34 +1426,34 @@ dependencies = [ "sodoken", "sqlformat", "tempfile", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] [[package]] name = "holochain_state_types" -version = "0.4.0-rc.0" +version = "0.5.0-dev.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00c52e0c3b4c108692f376c67158c2d007253500a67b4fe53fe23177e7b632aa" +checksum = "0c76a97edf926319b79483ae226e5d02bf86344b157c8021f8949e06578bead4" dependencies = [ - "holo_hash 0.4.0-rc.0", - "holochain_integrity_types 0.4.0-rc.0", + "holo_hash", + "holochain_integrity_types", "serde", ] [[package]] name = "holochain_trace" -version = "0.4.0-rc.0" +version = "0.5.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bb7147e6ce0542c661706779541bead79ca6bc95540732384d8590a9ee875d" +checksum = "f45c44f5237dc86ae685586c35f9255a7cfb77149c7f99234b575a76a3b8662f" dependencies = [ "chrono", "derive_more", "inferno", "once_cell", "serde_json", - "thiserror", + "thiserror 1.0.69", "tracing", "tracing-core", "tracing-serde", @@ -1515,9 +1462,9 @@ dependencies = [ [[package]] name = "holochain_types" -version = "0.4.0-rc.0" +version = "0.5.0-dev.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9ecef777f7ea1bbdffcbc43e7587406778e60c242d499b0642b7181180cde8" +checksum = "547e0ac56c691964337ebd46b5fbdb9ea36e6d01689079ca4bdc36e52088913e" dependencies = [ "anyhow", "async-trait", @@ -1532,14 +1479,15 @@ dependencies = [ "flate2", "futures", "getrandom", - "holo_hash 0.4.0-rc.0", + "holo_hash", "holochain_keystore", - "holochain_nonce 0.4.0-rc.0", + "holochain_nonce", "holochain_serialized_bytes", "holochain_sqlite", "holochain_trace", - "holochain_util 0.4.0-rc.0", - "holochain_zome_types 0.4.0-rc.0", + "holochain_util", + "holochain_zome_types", + "indexmap 2.6.0", "itertools 0.12.1", "kitsune_p2p_dht", "mr_bundle", @@ -1560,16 +1508,16 @@ dependencies = [ "strum", "strum_macros", "tempfile", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] [[package]] name = "holochain_util" -version = "0.4.0-rc.0" +version = "0.5.0-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b36a8bd9f79cbe6de5fded86b9074c54081a97367660c466d25f5ac6841dc1" +checksum = "915b4b3ecd06e1770fe32d122a1f98dee059be8c5e5a30a97f09d04c35c89298" dependencies = [ "backtrace", "cfg-if 1.0.0", @@ -1582,19 +1530,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "holochain_util" -version = "0.5.0-dev.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b4b3ecd06e1770fe32d122a1f98dee059be8c5e5a30a97f09d04c35c89298" -dependencies = [ - "cfg-if 1.0.0", - "colored", - "dunce", - "futures", - "once_cell", -] - [[package]] name = "holochain_wasmer_common" version = "0.0.96" @@ -1605,7 +1540,7 @@ dependencies = [ "serde", "serde_bytes", "test-fuzz", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1624,20 +1559,20 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.4.0-rc.0" +version = "0.5.0-dev.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "073de2496e0f7d5ed28d2fe20b366a9d0d81c85bc420936de4a4ca4bcfd772a7" +checksum = "50bbfe610c4fb8fb0d10cf1e06ce8bf67616d94b7d58245a3be1d1c26263d61f" dependencies = [ "derive_builder", "derive_more", - "holo_hash 0.4.0-rc.0", - "holochain_integrity_types 0.4.0-rc.0", - "holochain_nonce 0.4.0-rc.0", + "holo_hash", + "holochain_integrity_types", + "holochain_nonce", "holochain_serialized_bytes", "holochain_wasmer_common", - "kitsune_p2p_block 0.4.0-rc.0", + "kitsune_p2p_block", "kitsune_p2p_dht", - "kitsune_p2p_timestamp 0.4.0-rc.0", + "kitsune_p2p_timestamp", "nanoid", "num_enum", "rusqlite", @@ -1646,28 +1581,7 @@ dependencies = [ "serde_yaml", "shrinkwraprs", "subtle", - "thiserror", - "tracing", -] - -[[package]] -name = "holochain_zome_types" -version = "0.5.0-dev.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be88023b8fc223869aa14387f27c41e6846dbf7f659a42a1607a804b3cb8bfc" -dependencies = [ - "derive_more", - "holo_hash 0.5.0-dev.0", - "holochain_integrity_types 0.5.0-dev.0", - "holochain_nonce 0.5.0-dev.0", - "holochain_serialized_bytes", - "holochain_wasmer_common", - "kitsune_p2p_block 0.5.0-dev.0", - "kitsune_p2p_timestamp 0.5.0-dev.0", - "serde", - "serde_bytes", - "subtle", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -1713,9 +1627,9 @@ checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" dependencies = [ "bytes", "futures-channel", @@ -1741,7 +1655,7 @@ dependencies = [ "http", "hyper", "hyper-util", - "rustls 0.23.14", + "rustls 0.23.16", "rustls-native-certs", "rustls-pki-types", "tokio", @@ -1767,9 +1681,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", @@ -1807,6 +1721,124 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2 1.0.89", + "quote 1.0.37", + "syn 2.0.87", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -1815,12 +1847,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] @@ -1841,7 +1884,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.15.0", + "hashbrown 0.15.1", "serde", ] @@ -1852,7 +1895,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "232929e1d75fe899576a3d5c7416ad0d88dbfbb3c3d6aa00873a7408a50ddb88" dependencies = [ "ahash", - "clap 4.5.20", + "clap 4.5.21", "crossbeam-channel", "crossbeam-utils", "dashmap", @@ -1949,38 +1992,23 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.71" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb94a0ffd3f3ee755c20f7d8752f45cac88605a4dcf808abcff72873296ec7b" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] [[package]] name = "kitsune_p2p_bin_data" -version = "0.4.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb7c39b8e0c7c2f37457ab7005903bda9c30d4d2f45d84c61776dc025863559" -dependencies = [ - "base64 0.22.1", - "derive_more", - "holochain_util 0.4.0-rc.0", - "kitsune_p2p_dht_arc 0.4.0-rc.0", - "serde", - "serde_bytes", - "shrinkwraprs", -] - -[[package]] -name = "kitsune_p2p_bin_data" -version = "0.5.0-dev.0" +version = "0.5.0-dev.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b4a76c0998aaa559a3018961e26421a660622a1826d26ac8890f99b4f50195" +checksum = "cdad6312254025109091085d36d39b33fda3bdc76f8e09fb864a857213d8682d" dependencies = [ "base64 0.22.1", "derive_more", - "holochain_util 0.5.0-dev.0", - "kitsune_p2p_dht_arc 0.5.0-dev.0", + "holochain_util", + "kitsune_p2p_dht_arc", "serde", "serde_bytes", "shrinkwraprs", @@ -1988,39 +2016,28 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.4.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d331df99fe02990b7ae8c3767ea9437519a158e353905dea49a022f3511bee8" -dependencies = [ - "kitsune_p2p_bin_data 0.4.0-rc.0", - "kitsune_p2p_timestamp 0.4.0-rc.0", - "serde", -] - -[[package]] -name = "kitsune_p2p_block" -version = "0.5.0-dev.0" +version = "0.5.0-dev.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727bb87a87bfe40cb1b10bc0bfc470bf973792f6778542f3e6b88020489a2db2" +checksum = "21ba383226a21b793adee599c2ff27e5fce2eb4c3a1779dd02b3611fc24b5009" dependencies = [ - "kitsune_p2p_bin_data 0.5.0-dev.0", - "kitsune_p2p_timestamp 0.5.0-dev.0", + "kitsune_p2p_bin_data", + "kitsune_p2p_timestamp", "serde", ] [[package]] name = "kitsune_p2p_dht" -version = "0.4.0-rc.0" +version = "0.5.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8479a92ad1b24df28025370313207a4a55e7f37a5de0ccf3b9cb02a4bc8af2f8" +checksum = "f30d62708218f8afc1c050ffc755ee556234cfe920869f74d9d75cf64cbfe6cc" dependencies = [ "arbitrary", "colored", "derivative", "derive_more", "futures", - "kitsune_p2p_dht_arc 0.4.0-rc.0", - "kitsune_p2p_timestamp 0.4.0-rc.0", + "kitsune_p2p_dht_arc", + "kitsune_p2p_timestamp", "must_future", "num-traits", "proptest", @@ -2028,21 +2045,21 @@ dependencies = [ "rand", "serde", "statrs", - "thiserror", + "thiserror 1.0.69", "tracing", ] [[package]] name = "kitsune_p2p_dht_arc" -version = "0.4.0-rc.0" +version = "0.5.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a821f0daf7ac92fc4bcd59e4b121387756ca8a68fcfe87b7efeac863b5483ab" +checksum = "a9491afd841f355b448c20e6792f3e8c36ead8f7bd0c26ca7ee468718076266b" dependencies = [ "arbitrary", "derive_more", "gcollections", "intervallum", - "kitsune_p2p_timestamp 0.4.0-rc.0", + "kitsune_p2p_timestamp", "num-traits", "proptest", "proptest-derive", @@ -2050,24 +2067,11 @@ dependencies = [ "serde", ] -[[package]] -name = "kitsune_p2p_dht_arc" -version = "0.5.0-dev.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e78ac45360e0652ab126402ce86f48daeda46cda3bd6b85355c2767f7752e0" -dependencies = [ - "derive_more", - "gcollections", - "intervallum", - "num-traits", - "serde", -] - [[package]] name = "kitsune_p2p_timestamp" -version = "0.4.0-rc.0" +version = "0.5.0-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca09ee47fe55fd72e12b2af9fd91bce5e6e0db04ecaa156ca75dd901a019af80" +checksum = "528c144c80b366cf2dd2a8eee0d2f993bee281a1f51fa47a01b59c7ad92861a6" dependencies = [ "arbitrary", "chrono", @@ -2079,31 +2083,21 @@ dependencies = [ "serde", ] -[[package]] -name = "kitsune_p2p_timestamp" -version = "0.5.0-dev.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528c144c80b366cf2dd2a8eee0d2f993bee281a1f51fa47a01b59c7ad92861a6" -dependencies = [ - "chrono", - "serde", -] - [[package]] name = "kitsune_p2p_types" -version = "0.4.0-rc.0" +version = "0.5.0-dev.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fac50e4a0e9fcb1d5d1f88d38427c6fb41f489c738a4800bd1aa5c1665990d56" +checksum = "23ddf3e3d9110d1a1567033c75a592e667cb8813cb095ed23db657489d805327" dependencies = [ "base64 0.22.1", "derive_more", "futures", "ghost_actor", "holochain_trace", - "kitsune_p2p_bin_data 0.4.0-rc.0", + "kitsune_p2p_bin_data", "kitsune_p2p_dht", - "kitsune_p2p_dht_arc 0.4.0-rc.0", - "kitsune_p2p_timestamp 0.4.0-rc.0", + "kitsune_p2p_dht_arc", + "kitsune_p2p_timestamp", "lair_keystore_api", "once_cell", "parking_lot", @@ -2114,7 +2108,7 @@ dependencies = [ "serde_bytes", "serde_json", "sysinfo", - "thiserror", + "thiserror 1.0.69", "tokio", "url", "url2", @@ -2170,9 +2164,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" [[package]] name = "libflate" @@ -2200,9 +2194,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libredox" @@ -2217,9 +2211,9 @@ dependencies = [ [[package]] name = "libsodium-sys-stable" -version = "1.21.2" +version = "1.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42631d334de875c636a1aae7adb515653ac2e771e5a2ce74b1053f5a4412df3a" +checksum = "798a1c6d8c3424c0686ca46f2929d81809b371ef61a68c5d1880570584d32b85" dependencies = [ "cc", "libc", @@ -2249,6 +2243,12 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + [[package]] name = "lock_api" version = "0.4.12" @@ -2277,7 +2277,7 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.15.0", + "hashbrown 0.15.1", ] [[package]] @@ -2346,20 +2346,20 @@ dependencies = [ [[package]] name = "mr_bundle" -version = "0.4.0-rc.0" +version = "0.5.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81e83a39682961bc2532630dfd0cd9a93d0d5231f1963f1f18fae65b5f9147ab" +checksum = "01c855c0256099a4e92e07b2305c14eb94ab7152c545147fe91cf4b034b43a11" dependencies = [ "derive_more", "flate2", "futures", - "holochain_util 0.4.0-rc.0", + "holochain_util", "reqwest", "rmp-serde", "serde", "serde_bytes", "serde_yaml", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2396,7 +2396,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", "syn 1.0.109", ] @@ -2548,9 +2548,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -2582,9 +2582,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags 2.6.0", "cfg-if 1.0.0", @@ -2601,9 +2601,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -2614,18 +2614,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.3.2+3.3.2" +version = "300.4.0+3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b" +checksum = "a709e02f2b4aca747929cca5ed248880847c650233cf8b8cdc48f40aaf4898a6" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -2646,7 +2646,7 @@ dependencies = [ "js-sys", "once_cell", "pin-project-lite", - "thiserror", + "thiserror 1.0.69", "urlencoding", ] @@ -2702,29 +2702,29 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -2765,12 +2765,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.22" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ - "proc-macro2 1.0.87", - "syn 2.0.79", + "proc-macro2 1.0.89", + "syn 2.0.87", ] [[package]] @@ -2789,7 +2789,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", "syn 1.0.109", "version_check", @@ -2801,7 +2801,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", "version_check", ] @@ -2817,9 +2817,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.87" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] @@ -2850,9 +2850,9 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -2872,45 +2872,49 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.23.14", + "rustls 0.23.16", "socket2", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing", ] [[package]] name = "quinn-proto" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" dependencies = [ "bytes", + "getrandom", "rand", "ring 0.17.8", "rustc-hash", - "rustls 0.23.14", + "rustls 0.23.16", + "rustls-pki-types", "slab", - "thiserror", + "thiserror 2.0.3", "tinyvec", "tracing", + "web-time", ] [[package]] name = "quinn-udp" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" +checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da" dependencies = [ + "cfg_aliases", "libc", "once_cell", "socket2", @@ -2933,7 +2937,7 @@ version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", ] [[package]] @@ -3046,13 +3050,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "regex-syntax 0.8.5", ] @@ -3067,9 +3071,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -3090,9 +3094,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.12.8" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "base64 0.22.1", "bytes", @@ -3117,7 +3121,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.14", + "rustls 0.23.16", "rustls-native-certs", "rustls-pemfile", "rustls-pki-types", @@ -3274,9 +3278,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0" dependencies = [ "bitflags 2.6.0", "errno", @@ -3299,9 +3303,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.14" +version = "0.23.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" +checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" dependencies = [ "once_cell", "ring 0.17.8", @@ -3335,9 +3339,12 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" +dependencies = [ + "web-time", +] [[package]] name = "rustls-webpki" @@ -3436,9 +3443,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", @@ -3486,16 +3493,16 @@ version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "indexmap 2.6.0", "itoa", @@ -3550,9 +3557,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" dependencies = [ "darling 0.20.10", - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -3602,7 +3609,7 @@ checksum = "e63e6744142336dfb606fe2b068afa2e1cca1ee6a5d8377277a92945d81fa331" dependencies = [ "bitflags 1.3.2", "itertools 0.8.2", - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", "syn 1.0.109", ] @@ -3666,7 +3673,7 @@ version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", "syn 1.0.109", ] @@ -3718,6 +3725,12 @@ dependencies = [ "unicode_categories", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "statrs" version = "0.16.1" @@ -3796,7 +3809,7 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck 0.3.3", "proc-macro-error", - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", "syn 1.0.109", ] @@ -3814,7 +3827,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" dependencies = [ "heck 0.3.3", - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", "syn 1.0.109", ] @@ -3851,18 +3864,18 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.79" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", "unicode-ident", ] @@ -3876,6 +3889,17 @@ dependencies = [ "futures-core", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2 1.0.89", + "quote 1.0.37", + "syn 2.0.87", +] + [[package]] name = "sysinfo" version = "0.30.13" @@ -3914,9 +3938,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" +checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" dependencies = [ "filetime", "libc", @@ -3925,9 +3949,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if 1.0.0", "fastrand", @@ -3970,9 +3994,9 @@ dependencies = [ "itertools 0.13.0", "once_cell", "prettyplease", - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -3999,22 +4023,42 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" dependencies = [ - "thiserror-impl", + "thiserror-impl 2.0.3", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +dependencies = [ + "proc-macro2 1.0.89", + "quote 1.0.37", + "syn 2.0.87", ] [[package]] @@ -4058,6 +4102,16 @@ dependencies = [ "time-core", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" version = "1.8.0" @@ -4075,9 +4129,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", @@ -4097,9 +4151,9 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -4118,7 +4172,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.14", + "rustls 0.23.16", "rustls-pki-types", "tokio", ] @@ -4205,9 +4259,9 @@ version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -4345,7 +4399,7 @@ dependencies = [ "log", "rand", "sha1", - "thiserror", + "thiserror 1.0.69", "url", "utf-8", ] @@ -4362,27 +4416,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" -[[package]] -name = "unicode-bidi" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" - [[package]] name = "unicode-ident" version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" -[[package]] -name = "unicode-normalization" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" -dependencies = [ - "tinyvec", -] - [[package]] name = "unicode-segmentation" version = "1.12.0" @@ -4439,9 +4478,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.2" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" dependencies = [ "form_urlencoded", "idna", @@ -4471,6 +4510,18 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -4479,9 +4530,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "getrandom", "rand", @@ -4537,9 +4588,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.94" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef073ced962d62984fb38a36e5fdc1a2b23c9e0e1fa0689bb97afa4202ef6887" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -4548,24 +4599,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.94" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4bfab14ef75323f4eb75fa52ee0a3fb59611977fd3240da19b2cf36ff85030e" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.44" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65471f79c1022ffa5291d33520cbbb53b7687b01c2f8e83b57d102eed7ed479d" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -4575,9 +4626,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.94" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7bec9830f60924d9ceb3ef99d55c155be8afa76954edffbb5936ff4509474e7" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote 1.0.37", "wasm-bindgen-macro-support", @@ -4585,28 +4636,38 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.94" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c74f6e152a76a2ad448e223b0fc0b6b5747649c3d769cc6bf45737bf97d0ed6" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.94" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a42f6c679374623f295a8623adfe63d9284091245c3504bde47c17a3ce2777d9" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "web-sys" -version = "0.3.71" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44188d185b5bdcae1052d08bcbcf9091a5524038d4572cc4f4f2bb9d5554ddd9" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -4850,6 +4911,18 @@ dependencies = [ "memchr", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "xattr" version = "1.3.1" @@ -4876,6 +4949,30 @@ dependencies = [ "time", ] +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2 1.0.89", + "quote 1.0.37", + "syn 2.0.87", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -4892,9 +4989,30 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ - "proc-macro2 1.0.87", + "proc-macro2 1.0.89", "quote 1.0.37", - "syn 2.0.79", + "syn 2.0.87", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2 1.0.89", + "quote 1.0.37", + "syn 2.0.87", + "synstructure", ] [[package]] @@ -4903,6 +5021,28 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2 1.0.89", + "quote 1.0.37", + "syn 2.0.87", +] + [[package]] name = "zip" version = "2.2.0" @@ -4916,7 +5056,7 @@ dependencies = [ "flate2", "indexmap 2.6.0", "memchr", - "thiserror", + "thiserror 1.0.69", "zopfli", ] diff --git a/Cargo.toml b/Cargo.toml index 759bd27b..0b43dba9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,8 +10,8 @@ resolver = "2" [workspace.dependencies] futures = "0.3" -hdi = "0.6.0-dev.0" -hdk = "0.5.0-dev.0" +hdi = "0.6.0-dev.3" +hdk = "0.5.0-dev.5" nix = { version = "0.29.0", features = ["signal"] } once_cell = "1.5.0" parking_lot = "0.12" diff --git a/crates/trycp_server/Cargo.toml b/crates/trycp_server/Cargo.toml index 43fa663a..6bda36b9 100644 --- a/crates/trycp_server/Cargo.toml +++ b/crates/trycp_server/Cargo.toml @@ -37,7 +37,7 @@ trycp_api = { workspace = true } url = { workspace = true } [dev-dependencies] -holochain_conductor_api = "0.4.0-rc.0" +holochain_conductor_api = "0.5.0-dev.5" rand = "0.8" serde_yaml = "0.9" trycp_client = { path = "../trycp_client" } diff --git a/crates/trycp_server/tests/integration.rs b/crates/trycp_server/tests/integration.rs index 5bca272a..2975c96e 100644 --- a/crates/trycp_server/tests/integration.rs +++ b/crates/trycp_server/tests/integration.rs @@ -32,9 +32,8 @@ async fn multiple_conductors_on_same_machine_are_assigned_different_admin_ports( id: id_player_1.to_string(), partial_config: "dpki: dna_path: ~ - network_seed: test - allow_throwaway_random_dpki_agent_key: true - no_dpki: false" + network_seed: ~ + no_dpki: true" .to_string(), }, ONE_MIN, @@ -87,9 +86,8 @@ async fn multiple_conductors_on_same_machine_are_assigned_different_admin_ports( id: id_player_2.to_string(), partial_config: "dpki: dna_path: ~ - network_seed: test - allow_throwaway_random_dpki_agent_key: true - no_dpki: false" + network_seed: ~ + no_dpki: true" .to_string(), }, ONE_MIN, diff --git a/docs/tryorama.conductoroptions.dpkinetworkseed.md b/docs/tryorama.conductoroptions.dpkinetworkseed.md deleted file mode 100644 index 3a591195..00000000 --- a/docs/tryorama.conductoroptions.dpkinetworkseed.md +++ /dev/null @@ -1,15 +0,0 @@ - - -[Home](./index.md) > [@holochain/tryorama](./tryorama.md) > [ConductorOptions](./tryorama.conductoroptions.md) > [dpkiNetworkSeed](./tryorama.conductoroptions.dpkinetworkseed.md) - -## ConductorOptions.dpkiNetworkSeed property - -Set a DPKI network seed in the conductor instance. - -Defaults to "deepkey-test". - -**Signature:** - -```typescript -dpkiNetworkSeed?: NetworkSeed; -``` diff --git a/docs/tryorama.conductoroptions.md b/docs/tryorama.conductoroptions.md index e4c5e83d..91b83f8c 100644 --- a/docs/tryorama.conductoroptions.md +++ b/docs/tryorama.conductoroptions.md @@ -52,27 +52,6 @@ URL _(Optional)_ A bootstrap server URL for peers to discover each other. - - - -[dpkiNetworkSeed?](./tryorama.conductoroptions.dpkinetworkseed.md) - - - - - - - -NetworkSeed - - - - -_(Optional)_ Set a DPKI network seed in the conductor instance. - -Defaults to "deepkey-test". - - @@ -92,25 +71,6 @@ Defaults to "deepkey-test". _(Optional)_ The network type the conductor should use. - - - -[noDpki?](./tryorama.conductoroptions.nodpki.md) - - - - - - - -boolean - - - - -_(Optional)_ Disable DPKI in the conductor instance. - - diff --git a/docs/tryorama.conductoroptions.nodpki.md b/docs/tryorama.conductoroptions.nodpki.md deleted file mode 100644 index a6193ea3..00000000 --- a/docs/tryorama.conductoroptions.nodpki.md +++ /dev/null @@ -1,13 +0,0 @@ - - -[Home](./index.md) > [@holochain/tryorama](./tryorama.md) > [ConductorOptions](./tryorama.conductoroptions.md) > [noDpki](./tryorama.conductoroptions.nodpki.md) - -## ConductorOptions.noDpki property - -Disable DPKI in the conductor instance. - -**Signature:** - -```typescript -noDpki?: boolean; -``` diff --git a/docs/tryorama.createconductoroptions.md b/docs/tryorama.createconductoroptions.md index 17640f80..306e913a 100644 --- a/docs/tryorama.createconductoroptions.md +++ b/docs/tryorama.createconductoroptions.md @@ -9,7 +9,7 @@ Options for using the conductor factory. **Signature:** ```typescript -export type CreateConductorOptions = Pick; +export type CreateConductorOptions = Pick; ``` **References:** [ConductorOptions](./tryorama.conductoroptions.md) diff --git a/docs/tryorama.trycpconductoroptions.dpkinetworkseed.md b/docs/tryorama.trycpconductoroptions.dpkinetworkseed.md deleted file mode 100644 index 5247ba26..00000000 --- a/docs/tryorama.trycpconductoroptions.dpkinetworkseed.md +++ /dev/null @@ -1,13 +0,0 @@ - - -[Home](./index.md) > [@holochain/tryorama](./tryorama.md) > [TryCpConductorOptions](./tryorama.trycpconductoroptions.md) > [dpkiNetworkSeed](./tryorama.trycpconductoroptions.dpkinetworkseed.md) - -## TryCpConductorOptions.dpkiNetworkSeed property - -Set a DPKI network seed. - -**Signature:** - -```typescript -dpkiNetworkSeed?: string; -``` diff --git a/docs/tryorama.trycpconductoroptions.md b/docs/tryorama.trycpconductoroptions.md index 358e82df..a4e3e7dd 100644 --- a/docs/tryorama.trycpconductoroptions.md +++ b/docs/tryorama.trycpconductoroptions.md @@ -36,25 +36,6 @@ Description -[dpkiNetworkSeed?](./tryorama.trycpconductoroptions.dpkinetworkseed.md) - - - - - - - -string - - - - -_(Optional)_ Set a DPKI network seed. - - - - - [id?](./tryorama.trycpconductoroptions.id.md) @@ -92,27 +73,6 @@ _(Optional)_ Log level of the conductor (optional). default: "error" - - - -[noDpki?](./tryorama.trycpconductoroptions.nodpki.md) - - - - - - - -boolean - - - - -_(Optional)_ Disable DPKI in the conductor instance. - -default: false // defaults to using DPKI - - diff --git a/docs/tryorama.trycpconductoroptions.nodpki.md b/docs/tryorama.trycpconductoroptions.nodpki.md deleted file mode 100644 index cf1ade24..00000000 --- a/docs/tryorama.trycpconductoroptions.nodpki.md +++ /dev/null @@ -1,15 +0,0 @@ - - -[Home](./index.md) > [@holochain/tryorama](./tryorama.md) > [TryCpConductorOptions](./tryorama.trycpconductoroptions.md) > [noDpki](./tryorama.trycpconductoroptions.nodpki.md) - -## TryCpConductorOptions.noDpki property - -Disable DPKI in the conductor instance. - -default: false // defaults to using DPKI - -**Signature:** - -```typescript -noDpki?: boolean; -``` diff --git a/docs/tryorama.trycpscenario.dpkinetworkseed.md b/docs/tryorama.trycpscenario.dpkinetworkseed.md deleted file mode 100644 index a2f5d7cf..00000000 --- a/docs/tryorama.trycpscenario.dpkinetworkseed.md +++ /dev/null @@ -1,11 +0,0 @@ - - -[Home](./index.md) > [@holochain/tryorama](./tryorama.md) > [TryCpScenario](./tryorama.trycpscenario.md) > [dpkiNetworkSeed](./tryorama.trycpscenario.dpkinetworkseed.md) - -## TryCpScenario.dpkiNetworkSeed property - -**Signature:** - -```typescript -dpkiNetworkSeed: string; -``` diff --git a/docs/tryorama.trycpscenario.md b/docs/tryorama.trycpscenario.md index 8f05a386..c594f221 100644 --- a/docs/tryorama.trycpscenario.md +++ b/docs/tryorama.trycpscenario.md @@ -104,23 +104,6 @@ URL \| undefined - - - -[dpkiNetworkSeed](./tryorama.trycpscenario.dpkinetworkseed.md) - - - - - - - -string - - - - - @@ -138,23 +121,6 @@ string - - - -[noDpki](./tryorama.trycpscenario.nodpki.md) - - - - - - - -boolean - - - - - diff --git a/docs/tryorama.trycpscenario.nodpki.md b/docs/tryorama.trycpscenario.nodpki.md deleted file mode 100644 index fb148834..00000000 --- a/docs/tryorama.trycpscenario.nodpki.md +++ /dev/null @@ -1,11 +0,0 @@ - - -[Home](./index.md) > [@holochain/tryorama](./tryorama.md) > [TryCpScenario](./tryorama.trycpscenario.md) > [noDpki](./tryorama.trycpscenario.nodpki.md) - -## TryCpScenario.noDpki property - -**Signature:** - -```typescript -noDpki: boolean; -``` diff --git a/flake.lock b/flake.lock index e0d8d566..043f86f9 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1727316705, - "narHash": "sha256-/mumx8AQ5xFuCJqxCIOFCHTVlxHkMT21idpbgbm/TIE=", + "lastModified": 1731098351, + "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", "owner": "ipetkov", "repo": "crane", - "rev": "5b03654ce046b5167e7b0bccbd8244cb56c16f0e", + "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", "type": "github" }, "original": { @@ -53,11 +53,11 @@ "hc-scaffold": { "flake": false, "locked": { - "lastModified": 1727375207, - "narHash": "sha256-wGS+cOhvakLWscqPI0LaBZVZ3ryORV3YDvL+bfhI+WA=", + "lastModified": 1730407032, + "narHash": "sha256-NNnow8Cne1KBJ4WvJ6eT1OzcqyJiii35Q2ElVdI0ozA=", "owner": "holochain", "repo": "scaffolding", - "rev": "b218f253a124b6e7b5be0600c3aab7a57344f0f2", + "rev": "f838294a3c4f45b3e8e41297ea36eb91cfedee80", "type": "github" }, "original": { @@ -70,16 +70,16 @@ "holochain": { "flake": false, "locked": { - "lastModified": 1728435929, - "narHash": "sha256-KhZVfzRfJiXswukigC7mteF43WdTlcJR9k8x3yeRbyk=", + "lastModified": 1731460194, + "narHash": "sha256-V+n8L3QgP1VKh+6YvOEbTO2vvuZdTEoBYFJGBT9wrjQ=", "owner": "holochain", "repo": "holochain", - "rev": "f4c1eea0832aae1beb3fb02be92cb28dc639f4bf", + "rev": "a1cebb27e98c58819cda497b083b94b6881f02a4", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.5.0-dev.0", + "ref": "holochain-0.5.0-dev.5", "repo": "holochain", "type": "github" } @@ -100,11 +100,11 @@ ] }, "locked": { - "lastModified": 1728501093, - "narHash": "sha256-V1So3W9hPdaEkQ2fHmrDv4JVtwY4gJ4kYWNmjfCHcX4=", + "lastModified": 1731531789, + "narHash": "sha256-l3hVEJsMEUx84/URf79hMC3/ufL5RpF39X0fJvaB2yw=", "owner": "holochain", "repo": "holonix", - "rev": "6a9de675dfe4f04b6296955f0c4f841c6a8dc72c", + "rev": "9fb30a6a940b2eaf95c635e1c1e4e67d065f08c7", "type": "github" }, "original": { @@ -178,11 +178,11 @@ ] }, "locked": { - "lastModified": 1727404165, - "narHash": "sha256-kZCiYpQJBZ3kL9QymS88mCxpQwqo8KqvZeHk6LATuY8=", + "lastModified": 1731551344, + "narHash": "sha256-wr8OOqgw7M1pWfe4W7WA5lErzOVMg3zvrrxx/dy/nPo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "76f0a61e733259e1034dd6523e039d04932ffefc", + "rev": "27570abfd3461875f11fc07c9b01c141a6332b4f", "type": "github" }, "original": { diff --git a/package-lock.json b/package-lock.json index 769327ba..4a91c9f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.18.0-dev.0", "license": "MIT", "dependencies": { - "@holochain/client": "^0.19.0-dev.0", + "@holochain/client": "^0.19.0-dev.2", "get-port": "^6.1.2", "lodash": "^4.17.21", "uuid": "^8.3.2", @@ -614,10 +614,9 @@ } }, "node_modules/@holochain/client": { - "version": "0.19.0-dev.0", - "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.19.0-dev.0.tgz", - "integrity": "sha512-JEnjr5ehOYbFP1ZGNgymUov9vIbJTzPqJcSsFqv9NnyqD+3FNnYDhnp19iI5Ut+WWYzNEJnEQNR/z4czHMrf6Q==", - "license": "CAL-1.0", + "version": "0.19.0-dev.2", + "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.19.0-dev.2.tgz", + "integrity": "sha512-sMPWQA52YYhrAFpi5AeHE7J4rlEaD4B4yjy5MJ3+bS6MW8YK98bDmu0hJxcvDGfQFzA1p6EXwznGNFubVF9ziQ==", "dependencies": { "@bitgo/blake2b": "^3.2.4", "@holochain/serialization": "^0.1.0-beta-rc.3", diff --git a/package.json b/package.json index b2f2c553..1daeb124 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@holochain/client": "^0.19.0-dev.0", + "@holochain/client": "^0.19.0-dev.2", "get-port": "^6.1.2", "lodash": "^4.17.21", "uuid": "^8.3.2", diff --git a/ts/src/local/conductor.ts b/ts/src/local/conductor.ts index fcbc7de1..ca324898 100644 --- a/ts/src/local/conductor.ts +++ b/ts/src/local/conductor.ts @@ -62,15 +62,19 @@ export interface ConductorOptions { /** * Disable DPKI in the conductor instance. + * + * unstable */ - noDpki?: boolean; + // noDpki?: boolean; /** * Set a DPKI network seed in the conductor instance. * * Defaults to "deepkey-test". + * + * unstable */ - dpkiNetworkSeed?: NetworkSeed; + // dpkiNetworkSeed?: NetworkSeed; /** * Timeout for requests to Admin and App API. @@ -85,11 +89,7 @@ export interface ConductorOptions { */ export type CreateConductorOptions = Pick< ConductorOptions, - | "bootstrapServerUrl" - | "networkType" - | "noDpki" - | "dpkiNetworkSeed" - | "timeout" + "bootstrapServerUrl" | "networkType" | "timeout" >; /** @@ -107,8 +107,8 @@ export const createConductor = async ( const createConductorOptions: CreateConductorOptions = pick(options, [ "bootstrapServerUrl", "networkType", - "noDpki", - "dpkiNetworkSeed", + // "noDpki", + // "dpkiNetworkSeed", "timeout", ]); const conductor = await Conductor.create( @@ -152,12 +152,6 @@ export class Conductor implements IConductor { signalingServerUrl: URL, options?: CreateConductorOptions ) { - if (options?.noDpki && options?.dpkiNetworkSeed) { - throw new Error( - "DPKI network seed can not be set when DPKI is disabled. Enable DPKI or do not provide a DPKI network seed." - ); - } - const networkType = options?.networkType ?? NetworkType.WebRtc; if (options?.bootstrapServerUrl && networkType !== NetworkType.WebRtc) { throw new Error( @@ -166,12 +160,6 @@ export class Conductor implements IConductor { } const args = ["sandbox", "--piped", "create", "--in-process-lair"]; - if (options?.noDpki) { - args.push("--no-dpki"); - } - if (options?.dpkiNetworkSeed) { - args.push("--dpki-network-seed", options.dpkiNetworkSeed); - } args.push("network"); if (options?.bootstrapServerUrl) { args.push("--bootstrap", options.bootstrapServerUrl.href); diff --git a/ts/src/local/scenario.ts b/ts/src/local/scenario.ts index 694a180b..19089d74 100644 --- a/ts/src/local/scenario.ts +++ b/ts/src/local/scenario.ts @@ -74,8 +74,6 @@ export class Scenario { const conductor = await createConductor(this.signalingServerUrl, { timeout: this.timeout, bootstrapServerUrl: this.bootstrapServerUrl, - noDpki: this.noDpki, - dpkiNetworkSeed: this.noDpki ? "" : this.dpkiNetworkSeed, }); this.conductors.push(conductor); return conductor; diff --git a/ts/src/trycp/conductor/conductor.ts b/ts/src/trycp/conductor/conductor.ts index b403502c..d2a3c88a 100644 --- a/ts/src/trycp/conductor/conductor.ts +++ b/ts/src/trycp/conductor/conductor.ts @@ -144,13 +144,17 @@ export interface TryCpConductorOptions { * Disable DPKI in the conductor instance. * * default: false // defaults to using DPKI + * + * unstable */ - noDpki?: boolean; + // noDpki?: boolean; /** * Set a DPKI network seed. + * + * unstable */ - dpkiNetworkSeed?: string; + // dpkiNetworkSeed?: string; /** * Start up conductor after creation. @@ -185,11 +189,7 @@ export const createTryCpConductor = async ( const conductor = new TryCpConductor(tryCpClient, options?.id); if (options?.startup !== false) { // configure and startup conductor by default - await conductor.configure( - options?.partialConfig, - options?.noDpki, - options?.dpkiNetworkSeed - ); + await conductor.configure(options?.partialConfig, true, undefined); await conductor.startUp({ logLevel: options?.logLevel }); } return conductor; @@ -210,7 +210,7 @@ export class TryCpConductor implements IConductor { } static defaultPartialConfig() { - return getPartialConfig(); + return getPartialConfig(true); } /** diff --git a/ts/src/trycp/conductor/scenario.ts b/ts/src/trycp/conductor/scenario.ts index 6ae5187e..7c0e7f60 100644 --- a/ts/src/trycp/conductor/scenario.ts +++ b/ts/src/trycp/conductor/scenario.ts @@ -83,8 +83,8 @@ export interface ClientPlayers { * @public */ export class TryCpScenario { - noDpki: boolean; - dpkiNetworkSeed: string; + private noDpki: boolean; + private dpkiNetworkSeed: string; network_seed: string; servicesProcess: ChildProcessWithoutNullStreams | undefined; bootstrapServerUrl: URL | undefined; @@ -92,7 +92,7 @@ export class TryCpScenario { clients: TryCpClient[]; constructor() { - this.noDpki = false; + this.noDpki = true; this.dpkiNetworkSeed = uuidv4(); this.network_seed = uuidv4(); this.clients = []; @@ -144,9 +144,9 @@ export class TryCpScenario { // Conductors must be created in sequence to avoid identical admin ports being assigned multiple times. const conductor = await client.addConductor({ partialConfig: options?.partialConfig, - noDpki: this.noDpki, + // noDpki: this.noDpki, // Set a common unique DPKI network seed. - dpkiNetworkSeed: this.noDpki ? "" : this.dpkiNetworkSeed, + // dpkiNetworkSeed: this.noDpki ? "" : this.dpkiNetworkSeed, }); const app = options.app; let appOptions; @@ -217,8 +217,8 @@ export class TryCpScenario { ) { const conductor = await tryCpClient.addConductor({ logLevel: options?.logLevel, - noDpki: this.noDpki, - dpkiNetworkSeed: this.dpkiNetworkSeed, + // noDpki: this.noDpki, + // dpkiNetworkSeed: this.dpkiNetworkSeed, }); options = { ...options, diff --git a/ts/test/fixture/zomes/coordinator/src/lib.rs b/ts/test/fixture/zomes/coordinator/src/lib.rs index a674d76c..8e29b18e 100644 --- a/ts/test/fixture/zomes/coordinator/src/lib.rs +++ b/ts/test/fixture/zomes/coordinator/src/lib.rs @@ -1,5 +1,5 @@ use hdk::prelude::*; -use integrity::{Content, EntryTypes, EntryTypesUnit, UpdateInput}; +use integrity::{Content, EntryTypes, UpdateInput}; #[hdk_extern] pub fn create(input: Content) -> ExternResult { @@ -43,91 +43,91 @@ fn signal_loopback(value: LoopBack) -> ExternResult<()> { Ok(()) } -#[hdk_extern] -fn create_two_party_countersigning_session( - with_other: AgentPubKey, -) -> ExternResult { - let my_agent_info = agent_info()?; - - let entry = Content("hello".to_string()); - - let entry_hash = hash_entry(EntryTypes::Content(entry.clone()))?; - - let session_times = session_times_from_millis(10_000)?; - let request = PreflightRequest::try_new( - entry_hash, - vec![ - (my_agent_info.agent_initial_pubkey, vec![]), - (with_other.clone(), vec![]), - ], - Vec::with_capacity(0), - 0, - true, - session_times, - ActionBase::Create(CreateBase::new(EntryTypesUnit::Content.try_into()?)), - PreflightBytes(vec![]), - ) - .map_err(|e| { - wasm_error!(WasmErrorInner::Guest(format!( - "Failed to create countersigning request: {:?}", - e - ))) - })?; - - // Accept ours now and then Holochain should wait for the other party to join the session - let my_acceptance = accept_countersigning_preflight_request(request.clone())?; - - let response = match &my_acceptance { - PreflightRequestAcceptance::Accepted(response) => response.clone(), - e => { - return Err(wasm_error!(WasmErrorInner::Guest(format!( - "Unexpected response: {:?}", - e - )))) - } - }; - - Ok(response) -} - -#[hdk_extern] -fn accept_two_party(request: PreflightRequest) -> ExternResult { - let my_accept = accept_countersigning_preflight_request(request)?; - match my_accept { - PreflightRequestAcceptance::Accepted(response) => Ok(response), - e => Err(wasm_error!(WasmErrorInner::Guest(format!( - "Unexpected response: {:?}", - e - )))), - } -} - -#[hdk_extern] -fn commit_two_party(responses: Vec) -> ExternResult<()> { - let inner = Content("hello".to_string()); - - let entry = Entry::CounterSign( - Box::new( - CounterSigningSessionData::try_from_responses(responses, vec![]).map_err( - |countersigning_error| { - wasm_error!(WasmErrorInner::Guest(countersigning_error.to_string())) - }, - )?, - ), - inner.clone().try_into()?, - ); - - let agreement = EntryTypes::Content(inner); - let entry_def_index = ScopedEntryDefIndex::try_from(&agreement)?; - let visibility = EntryVisibility::from(&agreement); - - hdk::prelude::create(CreateInput::new( - entry_def_index, - visibility, - entry, - // Countersigned entries MUST have strict ordering. - ChainTopOrdering::Strict, - ))?; - - Ok(()) -} +// #[hdk_extern] +// fn create_two_party_countersigning_session( +// with_other: AgentPubKey, +// ) -> ExternResult { +// let my_agent_info = agent_info()?; + +// let entry = Content("hello".to_string()); + +// let entry_hash = hash_entry(EntryTypes::Content(entry.clone()))?; + +// let session_times = session_times_from_millis(10_000)?; +// let request = PreflightRequest::try_new( +// entry_hash, +// vec![ +// (my_agent_info.agent_initial_pubkey, vec![]), +// (with_other.clone(), vec![]), +// ], +// Vec::with_capacity(0), +// 0, +// true, +// session_times, +// ActionBase::Create(CreateBase::new(EntryTypesUnit::Content.try_into()?)), +// PreflightBytes(vec![]), +// ) +// .map_err(|e| { +// wasm_error!(WasmErrorInner::Guest(format!( +// "Failed to create countersigning request: {:?}", +// e +// ))) +// })?; + +// // Accept ours now and then Holochain should wait for the other party to join the session +// let my_acceptance = accept_countersigning_preflight_request(request.clone())?; + +// let response = match &my_acceptance { +// PreflightRequestAcceptance::Accepted(response) => response.clone(), +// e => { +// return Err(wasm_error!(WasmErrorInner::Guest(format!( +// "Unexpected response: {:?}", +// e +// )))) +// } +// }; + +// Ok(response) +// } + +// #[hdk_extern] +// fn accept_two_party(request: PreflightRequest) -> ExternResult { +// let my_accept = accept_countersigning_preflight_request(request)?; +// match my_accept { +// PreflightRequestAcceptance::Accepted(response) => Ok(response), +// e => Err(wasm_error!(WasmErrorInner::Guest(format!( +// "Unexpected response: {:?}", +// e +// )))), +// } +// } + +// #[hdk_extern] +// fn commit_two_party(responses: Vec) -> ExternResult<()> { +// let inner = Content("hello".to_string()); + +// let entry = Entry::CounterSign( +// Box::new( +// CounterSigningSessionData::try_from_responses(responses, vec![]).map_err( +// |countersigning_error| { +// wasm_error!(WasmErrorInner::Guest(countersigning_error.to_string())) +// }, +// )?, +// ), +// inner.clone().try_into()?, +// ); + +// let agreement = EntryTypes::Content(inner); +// let entry_def_index = ScopedEntryDefIndex::try_from(&agreement)?; +// let visibility = EntryVisibility::from(&agreement); + +// hdk::prelude::create(CreateInput::new( +// entry_def_index, +// visibility, +// entry, +// // Countersigned entries MUST have strict ordering. +// ChainTopOrdering::Strict, +// ))?; + +// Ok(()) +// } diff --git a/ts/test/local/conductor.ts b/ts/test/local/conductor.ts index 87eab785..292418aa 100644 --- a/ts/test/local/conductor.ts +++ b/ts/test/local/conductor.ts @@ -54,7 +54,7 @@ test("Local Conductor - spawn a conductor with mem network", async (t) => { const conductorConfig = readFileSync( tmpDirPath + "/conductor-config.yaml" ).toString(); - t.ok(conductorConfig.includes("transport_pool: []")); + t.ok(conductorConfig.includes("transport_pool:\n - type: mem")); await stopLocalServices(servicesProcess); await cleanAllConductors(); @@ -71,7 +71,6 @@ test("Local Conductor - spawn a conductor with a bootstrap service", async (t) = const conductorConfig = readFileSync( tmpDirPath + "/conductor-config.yaml" ).toString(); - t.ok(conductorConfig.includes("network_type: quic_bootstrap")); t.ok(conductorConfig.includes(`bootstrap_service: ${bootstrapUrl.href}`)); await stopLocalServices(servicesProcess); @@ -88,76 +87,77 @@ test("Local Conductor - spawn a conductor and check for admin ws", async (t) => await cleanAllConductors(); }); -test("Local Conductor - default conductor has DPKI enabled", async (t) => { - const { servicesProcess, signalingServerUrl } = await runLocalServices(); - const conductor = await createConductor(signalingServerUrl); - const tmpDirPath = conductor.getTmpDirectory(); - const conductorConfig = readFileSync( - tmpDirPath + "/conductor-config.yaml" - ).toString(); - t.assert( - conductorConfig.includes("no_dpki: false"), - "DPKI enabled in conductor config" - ); - - await conductor.shutDown(); - await stopLocalServices(servicesProcess); - await cleanAllConductors(); -}); - -test("Local Conductor - spawn a conductor without DPKI enabled", async (t) => { - const { servicesProcess, signalingServerUrl } = await runLocalServices(); - const conductor = await createConductor(signalingServerUrl, { noDpki: true }); - const tmpDirPath = conductor.getTmpDirectory(); - const conductorConfig = readFileSync( - tmpDirPath + "/conductor-config.yaml" - ).toString(); - t.assert( - conductorConfig.includes("no_dpki: true"), - "DPKI disabled in conductor config" - ); - - await conductor.shutDown(); - await stopLocalServices(servicesProcess); - await cleanAllConductors(); -}); - -test("Local Conductor - default conductor has test DPKI network seed", async (t) => { - const { servicesProcess, signalingServerUrl } = await runLocalServices(); - const conductor = await createConductor(signalingServerUrl); - const tmpDirPath = conductor.getTmpDirectory(); - const conductorConfig = readFileSync( - tmpDirPath + "/conductor-config.yaml" - ).toString(); - t.assert( - conductorConfig.includes("network_seed: deepkey-test"), - "default DPKI network seed set in conductor config" - ); - - await conductor.shutDown(); - await stopLocalServices(servicesProcess); - await cleanAllConductors(); -}); - -test("Local Conductor - set a DPKI network seed", async (t) => { - const { servicesProcess, signalingServerUrl } = await runLocalServices(); - const networkSeed = "tryorama-test-dpki"; - const conductor = await createConductor(signalingServerUrl, { - dpkiNetworkSeed: networkSeed, - }); - const tmpDirPath = conductor.getTmpDirectory(); - const conductorConfig = readFileSync( - tmpDirPath + "/conductor-config.yaml" - ).toString(); - t.assert( - conductorConfig.includes(`network_seed: ${networkSeed}`), - "DPKI network seed set in conductor config" - ); - - await conductor.shutDown(); - await stopLocalServices(servicesProcess); - await cleanAllConductors(); -}); +// unstable-dpki +// test("Local Conductor - default conductor has DPKI enabled", async (t) => { +// const { servicesProcess, signalingServerUrl } = await runLocalServices(); +// const conductor = await createConductor(signalingServerUrl); +// const tmpDirPath = conductor.getTmpDirectory(); +// const conductorConfig = readFileSync( +// tmpDirPath + "/conductor-config.yaml" +// ).toString(); +// t.assert( +// conductorConfig.includes("no_dpki: false"), +// "DPKI enabled in conductor config" +// ); + +// await conductor.shutDown(); +// await stopLocalServices(servicesProcess); +// await cleanAllConductors(); +// }); + +// test("Local Conductor - spawn a conductor without DPKI enabled", async (t) => { +// const { servicesProcess, signalingServerUrl } = await runLocalServices(); +// const conductor = await createConductor(signalingServerUrl, { noDpki: true }); +// const tmpDirPath = conductor.getTmpDirectory(); +// const conductorConfig = readFileSync( +// tmpDirPath + "/conductor-config.yaml" +// ).toString(); +// t.assert( +// conductorConfig.includes("no_dpki: true"), +// "DPKI disabled in conductor config" +// ); + +// await conductor.shutDown(); +// await stopLocalServices(servicesProcess); +// await cleanAllConductors(); +// }); + +// test("Local Conductor - default conductor has test DPKI network seed", async (t) => { +// const { servicesProcess, signalingServerUrl } = await runLocalServices(); +// const conductor = await createConductor(signalingServerUrl); +// const tmpDirPath = conductor.getTmpDirectory(); +// const conductorConfig = readFileSync( +// tmpDirPath + "/conductor-config.yaml" +// ).toString(); +// t.assert( +// conductorConfig.includes("network_seed: deepkey-test"), +// "default DPKI network seed set in conductor config" +// ); + +// await conductor.shutDown(); +// await stopLocalServices(servicesProcess); +// await cleanAllConductors(); +// }); + +// test("Local Conductor - set a DPKI network seed", async (t) => { +// const { servicesProcess, signalingServerUrl } = await runLocalServices(); +// const networkSeed = "tryorama-test-dpki"; +// const conductor = await createConductor(signalingServerUrl, { +// dpkiNetworkSeed: networkSeed, +// }); +// const tmpDirPath = conductor.getTmpDirectory(); +// const conductorConfig = readFileSync( +// tmpDirPath + "/conductor-config.yaml" +// ).toString(); +// t.assert( +// conductorConfig.includes(`network_seed: ${networkSeed}`), +// "DPKI network seed set in conductor config" +// ); + +// await conductor.shutDown(); +// await stopLocalServices(servicesProcess); +// await cleanAllConductors(); +// }); test("Local Conductor - revoke agent key", async (t) => { const { servicesProcess, signalingServerUrl } = await runLocalServices(); diff --git a/ts/test/local/scenario.ts b/ts/test/local/scenario.ts index 910624b2..59384d88 100644 --- a/ts/test/local/scenario.ts +++ b/ts/test/local/scenario.ts @@ -113,87 +113,88 @@ test("Local Scenario - Add players with hApp bundles", async (t) => { await scenario.cleanUp(); }); -test("Local Scenario - All players have DPKI enabled", async (t) => { - const scenario = new Scenario(); - await scenario.addPlayersWithApps([ - { appBundleSource: { path: FIXTURE_HAPP_URL.pathname } }, - { appBundleSource: { path: FIXTURE_HAPP_URL.pathname } }, - ]); - scenario.conductors.every((conductor) => { - const tmpDirPath = conductor.getTmpDirectory(); - const conductorConfig = readFileSync( - tmpDirPath + "/conductor-config.yaml" - ).toString(); - t.assert( - conductorConfig.includes("no_dpki: false"), - "DPKI enabled in conductor config" - ); - }); - - await scenario.cleanUp(); -}); - -test("Local Scenario - All players have DPKI disabled", async (t) => { - const scenario = new Scenario(); - scenario.noDpki = true; - await scenario.addPlayersWithApps([ - { appBundleSource: { path: FIXTURE_HAPP_URL.pathname } }, - { appBundleSource: { path: FIXTURE_HAPP_URL.pathname } }, - ]); - scenario.conductors.every((conductor) => { - const tmpDirPath = conductor.getTmpDirectory(); - const conductorConfig = readFileSync( - tmpDirPath + "/conductor-config.yaml" - ).toString(); - t.assert( - conductorConfig.includes("no_dpki: true"), - "DPKI disabled in conductor config" - ); - }); - - await scenario.cleanUp(); -}); - -test("Local Scenario - All players have a custom DPKI network seed", async (t) => { - const scenario = new Scenario(); - scenario.dpkiNetworkSeed = "tryorama-dpki-test"; - await scenario.addPlayersWithApps([ - { appBundleSource: { path: FIXTURE_HAPP_URL.pathname } }, - { appBundleSource: { path: FIXTURE_HAPP_URL.pathname } }, - ]); - scenario.conductors.every((conductor) => { - const tmpDirPath = conductor.getTmpDirectory(); - const conductorConfig = readFileSync( - tmpDirPath + "/conductor-config.yaml" - ).toString(); - t.assert( - conductorConfig.includes(`network_seed: ${scenario.dpkiNetworkSeed}`), - "default DPKI network seed set in conductor config" - ); - }); - - await scenario.cleanUp(); -}); - -test("Local Scenario - All players have a random DPKI network seed", async (t) => { - const scenario = new Scenario(); - await scenario.addPlayersWithApps([ - { appBundleSource: { path: FIXTURE_HAPP_URL.pathname } }, - { appBundleSource: { path: FIXTURE_HAPP_URL.pathname } }, - ]); - scenario.conductors.every((conductor) => { - const tmpDirPath = conductor.getTmpDirectory(); - const conductorConfig = readFileSync( - tmpDirPath + "/conductor-config.yaml" - ).toString(); - t.assert( - conductorConfig.includes(`network_seed: ${scenario.dpkiNetworkSeed}`), - "DPKI network seed set in conductor config" - ); - }); - - await scenario.cleanUp(); -}); +// unstable-dpki +// test("Local Scenario - All players have DPKI enabled", async (t) => { +// const scenario = new Scenario(); +// await scenario.addPlayersWithApps([ +// { appBundleSource: { path: FIXTURE_HAPP_URL.pathname } }, +// { appBundleSource: { path: FIXTURE_HAPP_URL.pathname } }, +// ]); +// scenario.conductors.every((conductor) => { +// const tmpDirPath = conductor.getTmpDirectory(); +// const conductorConfig = readFileSync( +// tmpDirPath + "/conductor-config.yaml" +// ).toString(); +// t.assert( +// conductorConfig.includes("no_dpki: false"), +// "DPKI enabled in conductor config" +// ); +// }); + +// await scenario.cleanUp(); +// }); + +// test("Local Scenario - All players have DPKI disabled", async (t) => { +// const scenario = new Scenario(); +// scenario.noDpki = true; +// await scenario.addPlayersWithApps([ +// { appBundleSource: { path: FIXTURE_HAPP_URL.pathname } }, +// { appBundleSource: { path: FIXTURE_HAPP_URL.pathname } }, +// ]); +// scenario.conductors.every((conductor) => { +// const tmpDirPath = conductor.getTmpDirectory(); +// const conductorConfig = readFileSync( +// tmpDirPath + "/conductor-config.yaml" +// ).toString(); +// t.assert( +// conductorConfig.includes("no_dpki: true"), +// "DPKI disabled in conductor config" +// ); +// }); + +// await scenario.cleanUp(); +// }); + +// test("Local Scenario - All players have a custom DPKI network seed", async (t) => { +// const scenario = new Scenario(); +// scenario.dpkiNetworkSeed = "tryorama-dpki-test"; +// await scenario.addPlayersWithApps([ +// { appBundleSource: { path: FIXTURE_HAPP_URL.pathname } }, +// { appBundleSource: { path: FIXTURE_HAPP_URL.pathname } }, +// ]); +// scenario.conductors.every((conductor) => { +// const tmpDirPath = conductor.getTmpDirectory(); +// const conductorConfig = readFileSync( +// tmpDirPath + "/conductor-config.yaml" +// ).toString(); +// t.assert( +// conductorConfig.includes(`network_seed: ${scenario.dpkiNetworkSeed}`), +// "default DPKI network seed set in conductor config" +// ); +// }); + +// await scenario.cleanUp(); +// }); + +// test("Local Scenario - All players have a random DPKI network seed", async (t) => { +// const scenario = new Scenario(); +// await scenario.addPlayersWithApps([ +// { appBundleSource: { path: FIXTURE_HAPP_URL.pathname } }, +// { appBundleSource: { path: FIXTURE_HAPP_URL.pathname } }, +// ]); +// scenario.conductors.every((conductor) => { +// const tmpDirPath = conductor.getTmpDirectory(); +// const conductorConfig = readFileSync( +// tmpDirPath + "/conductor-config.yaml" +// ).toString(); +// t.assert( +// conductorConfig.includes(`network_seed: ${scenario.dpkiNetworkSeed}`), +// "DPKI network seed set in conductor config" +// ); +// }); + +// await scenario.cleanUp(); +// }); test("Local Scenario - Create and read an entry, 2 conductors", async (t) => { // The wrapper takes care of creating a scenario and shutting down or deleting @@ -384,73 +385,74 @@ test("Local Scenario - runScenario - call zome by role name", async (t) => { }); }); -test("Local Scenario - countersigning", async (t) => { - await runScenario(async (scenario: Scenario) => { - const appBundleSource: AppBundleSource = { - path: FIXTURE_HAPP_URL.pathname, - }; - const [alice, bob] = await scenario.addPlayersWithApps([ - { appBundleSource }, - { appBundleSource }, - ]); - - const result = new Promise((resolve, reject) => { - const timeout = setTimeout( - () => reject("timeout waiting for signal"), - 60000 - ); - (alice.appWs as AppWebsocket).on("signal", (signal) => { - clearTimeout(timeout); - resolve(signal); - }); - }); - - // Make sure init has been called - await alice.appWs.callZome({ - role_name: "test", - zome_name: "coordinator", - fn_name: "create", - payload: "hello", - }); - - await bob.appWs.callZome({ - role_name: "test", - zome_name: "coordinator", - fn_name: "create", - payload: "hello", - }); - - const response1: PreflightResponse = await alice.appWs.callZome({ - role_name: "test", - zome_name: "coordinator", - fn_name: "create_two_party_countersigning_session", - payload: bob.agentPubKey, - }); - - const response2: PreflightResponse = await bob.appWs.callZome({ - role_name: "test", - zome_name: "coordinator", - fn_name: "accept_two_party", - payload: response1.request, - }); - - await alice.appWs.callZome({ - role_name: "test", - zome_name: "coordinator", - fn_name: "commit_two_party", - payload: [response1, response2], - }); - - await bob.appWs.callZome({ - role_name: "test", - zome_name: "coordinator", - fn_name: "commit_two_party", - payload: [response1, response2], - }); - - const completionSignal = await result; - assert(SignalType.System in completionSignal); - const systemSignal = completionSignal[SignalType.System]; - t.assert("SuccessfulCountersigning" in systemSignal); - }); -}); +// unstable-countersigning +// test("Local Scenario - countersigning", async (t) => { +// await runScenario(async (scenario: Scenario) => { +// const appBundleSource: AppBundleSource = { +// path: FIXTURE_HAPP_URL.pathname, +// }; +// const [alice, bob] = await scenario.addPlayersWithApps([ +// { appBundleSource }, +// { appBundleSource }, +// ]); + +// const result = new Promise((resolve, reject) => { +// const timeout = setTimeout( +// () => reject("timeout waiting for signal"), +// 60000 +// ); +// (alice.appWs as AppWebsocket).on("signal", (signal) => { +// clearTimeout(timeout); +// resolve(signal); +// }); +// }); + +// // Make sure init has been called +// await alice.appWs.callZome({ +// role_name: "test", +// zome_name: "coordinator", +// fn_name: "create", +// payload: "hello", +// }); + +// await bob.appWs.callZome({ +// role_name: "test", +// zome_name: "coordinator", +// fn_name: "create", +// payload: "hello", +// }); + +// const response1: PreflightResponse = await alice.appWs.callZome({ +// role_name: "test", +// zome_name: "coordinator", +// fn_name: "create_two_party_countersigning_session", +// payload: bob.agentPubKey, +// }); + +// const response2: PreflightResponse = await bob.appWs.callZome({ +// role_name: "test", +// zome_name: "coordinator", +// fn_name: "accept_two_party", +// payload: response1.request, +// }); + +// await alice.appWs.callZome({ +// role_name: "test", +// zome_name: "coordinator", +// fn_name: "commit_two_party", +// payload: [response1, response2], +// }); + +// await bob.appWs.callZome({ +// role_name: "test", +// zome_name: "coordinator", +// fn_name: "commit_two_party", +// payload: [response1, response2], +// }); + +// const completionSignal = await result; +// assert(SignalType.System in completionSignal); +// const systemSignal = completionSignal[SignalType.System]; +// t.assert("SuccessfulCountersigning" in systemSignal); +// }); +// }); diff --git a/ts/test/trycp/conductor.ts b/ts/test/trycp/conductor.ts index 466a4d3d..d4fcbc9e 100644 --- a/ts/test/trycp/conductor.ts +++ b/ts/test/trycp/conductor.ts @@ -30,51 +30,52 @@ import { FIXTURE_DNA_URL, FIXTURE_HAPP_URL } from "../fixture"; const SERVER_URL = new URL(`ws://${TRYCP_SERVER_HOST}:${TRYCP_SERVER_PORT}`); const ROLE_NAME = "test"; -test("TryCP Conductor - default conductor has DPKI enabled", async (t) => { - const localTryCpServer = await TryCpServer.start(); - const { servicesProcess, signalingServerUrl } = await runLocalServices(); - const client = await TryCpClient.create(SERVER_URL); - client.signalingServerUrl = signalingServerUrl; - const conductor = await createTryCpConductor(client); - const agent_key = await conductor.adminWs().generateAgentPubKey(); - const appInfo = await conductor.adminWs().installApp({ - path: FIXTURE_HAPP_URL.pathname, - agent_key, - membrane_proofs: {}, - }); - await conductor - .adminWs() - .enableApp({ installed_app_id: appInfo.installed_app_id }); - const cellIds = await conductor.adminWs().listCellIds(); - t.equal(cellIds.length, 2, "Conductor includes DPKI cell id"); - - await stopLocalServices(servicesProcess); - await client.cleanUp(); - await localTryCpServer.stop(); -}); - -test("TryCP Conductor - startup DPKI disabled conductor", async (t) => { - const localTryCpServer = await TryCpServer.start(); - const { servicesProcess, signalingServerUrl } = await runLocalServices(); - const client = await TryCpClient.create(SERVER_URL); - client.signalingServerUrl = signalingServerUrl; - const conductor = await createTryCpConductor(client, { noDpki: true }); - const agent_key = await conductor.adminWs().generateAgentPubKey(); - const appInfo = await conductor.adminWs().installApp({ - path: FIXTURE_HAPP_URL.pathname, - agent_key, - membrane_proofs: {}, - }); - await conductor - .adminWs() - .enableApp({ installed_app_id: appInfo.installed_app_id }); - const cellIds = await conductor.adminWs().listCellIds(); - t.equal(cellIds.length, 1, "Conductor contains only the app cell"); - - await stopLocalServices(servicesProcess); - await client.cleanUp(); - await localTryCpServer.stop(); -}); +// unstable-dpki +// test("TryCP Conductor - default conductor has DPKI enabled", async (t) => { +// const localTryCpServer = await TryCpServer.start(); +// const { servicesProcess, signalingServerUrl } = await runLocalServices(); +// const client = await TryCpClient.create(SERVER_URL); +// client.signalingServerUrl = signalingServerUrl; +// const conductor = await createTryCpConductor(client); +// const agent_key = await conductor.adminWs().generateAgentPubKey(); +// const appInfo = await conductor.adminWs().installApp({ +// path: FIXTURE_HAPP_URL.pathname, +// agent_key, +// membrane_proofs: {}, +// }); +// await conductor +// .adminWs() +// .enableApp({ installed_app_id: appInfo.installed_app_id }); +// const cellIds = await conductor.adminWs().listCellIds(); +// t.equal(cellIds.length, 2, "Conductor includes DPKI cell id"); + +// await stopLocalServices(servicesProcess); +// await client.cleanUp(); +// await localTryCpServer.stop(); +// }); + +// test("TryCP Conductor - startup DPKI disabled conductor", async (t) => { +// const localTryCpServer = await TryCpServer.start(); +// const { servicesProcess, signalingServerUrl } = await runLocalServices(); +// const client = await TryCpClient.create(SERVER_URL); +// client.signalingServerUrl = signalingServerUrl; +// const conductor = await createTryCpConductor(client, { noDpki: true }); +// const agent_key = await conductor.adminWs().generateAgentPubKey(); +// const appInfo = await conductor.adminWs().installApp({ +// path: FIXTURE_HAPP_URL.pathname, +// agent_key, +// membrane_proofs: {}, +// }); +// await conductor +// .adminWs() +// .enableApp({ installed_app_id: appInfo.installed_app_id }); +// const cellIds = await conductor.adminWs().listCellIds(); +// t.equal(cellIds.length, 1, "Conductor contains only the app cell"); + +// await stopLocalServices(servicesProcess); +// await client.cleanUp(); +// await localTryCpServer.stop(); +// }); test("TryCP Conductor - revoke agent key", async (t) => { const localTryCpServer = await TryCpServer.start(); @@ -646,36 +647,6 @@ test("TryCP Conductor - create and read an entry using the entry zome", async (t await localTryCpServer.stop(); }); -test("TryCP Conductor - reading a non-existent entry returns null", async (t) => { - const localTryCpServer = await TryCpServer.start(); - const { servicesProcess, signalingServerUrl } = await runLocalServices(); - const client = await TryCpClient.create(SERVER_URL); - client.signalingServerUrl = signalingServerUrl; - const conductor = await createTryCpConductor(client); - const app = { path: FIXTURE_HAPP_URL.pathname }; - const aliceApp = await conductor.installApp(app); - const adminWs = conductor.adminWs(); - const { port } = await adminWs.attachAppInterface(); - const issued = await adminWs.issueAppAuthenticationToken({ - installed_app_id: aliceApp.installed_app_id, - }); - await conductor.connectAppInterface(issued.token, port); - const appWs = await conductor.connectAppWs(issued.token, port); - const alice = await enableAndGetAgentApp(adminWs, appWs, aliceApp); - - const actual = await alice.cells[0].callZome({ - zome_name: "coordinator", - fn_name: "read", - provenance: alice.agentPubKey, - payload: Buffer.from("hCkk", "base64"), - }); - t.equal(actual, null, "read a non-existing entry returns null"); - - await stopLocalServices(servicesProcess); - await client.cleanUp(); - await localTryCpServer.stop(); -}); - test("TryCP Conductor - create and read an entry using the entry zome, 1 conductor, 2 cells, 2 agents", async (t) => { const localTryCpServer = await TryCpServer.start(); const { servicesProcess, signalingServerUrl } = await runLocalServices(); diff --git a/ts/test/trycp/scenario.ts b/ts/test/trycp/scenario.ts index 0b6eb875..9d496e68 100644 --- a/ts/test/trycp/scenario.ts +++ b/ts/test/trycp/scenario.ts @@ -17,26 +17,27 @@ import { FIXTURE_HAPP_URL } from "../fixture/index.js"; const SERVER_URL = new URL(`ws://${TRYCP_SERVER_HOST}:${TRYCP_SERVER_PORT}`); -test("TryCP Scenario - default player has DPKI enabled", async (t) => { - const tryCpServer = await TryCpServer.start(); - - const scenario = new TryCpScenario(); - ({ - servicesProcess: scenario.servicesProcess, - signalingServerUrl: scenario.signalingServerUrl, - } = await runLocalServices()); - const client = await scenario.addClient(SERVER_URL); - t.ok(client, "client set up"); - - const player = await scenario.addPlayerWithApp(client, { - path: FIXTURE_HAPP_URL.pathname, - }); - const cellIds = await player.conductor.adminWs().listCellIds(); - t.equal(cellIds.length, 2, "conductor has 1 app cell and 1 DPKI cell"); - - await scenario.cleanUp(); - await tryCpServer.stop(); -}); +// unstable-dpki +// test("TryCP Scenario - default player has DPKI enabled", async (t) => { +// const tryCpServer = await TryCpServer.start(); + +// const scenario = new TryCpScenario(); +// ({ +// servicesProcess: scenario.servicesProcess, +// signalingServerUrl: scenario.signalingServerUrl, +// } = await runLocalServices()); +// const client = await scenario.addClient(SERVER_URL); +// t.ok(client, "client set up"); + +// const player = await scenario.addPlayerWithApp(client, { +// path: FIXTURE_HAPP_URL.pathname, +// }); +// const cellIds = await player.conductor.adminWs().listCellIds(); +// t.equal(cellIds.length, 2, "conductor has 1 app cell and 1 DPKI cell"); + +// await scenario.cleanUp(); +// await tryCpServer.stop(); +// }); test("TryCP Scenario - can create player without DPKI", async (t) => { const tryCpServer = await TryCpServer.start(); @@ -49,7 +50,6 @@ test("TryCP Scenario - can create player without DPKI", async (t) => { const client = await scenario.addClient(SERVER_URL); t.ok(client, "client set up"); - scenario.noDpki = true; const player = await scenario.addPlayerWithApp(client, { path: FIXTURE_HAPP_URL.pathname, }); @@ -179,11 +179,7 @@ test("TryCP Scenario - list everything", async (t) => { ); const listCellIds = await alice.conductor.adminWs().listCellIds(); - t.equal( - listCellIds.length, - 2, - "alice's conductor lists 2 cell ids including DPKI" - ); + t.equal(listCellIds.length, 1, "alice's conductor lists 1 cell id"); const listedDnas = await alice.conductor.adminWs().listDnas(); t.equal(listedDnas.length, 1, "alice's conductor lists 1 DNA"); @@ -412,7 +408,6 @@ test("TryCP Scenario - connect to multiple clients without DPKI", async (t) => { } const scenario = new TryCpScenario(); - scenario.noDpki = true; ({ servicesProcess: scenario.servicesProcess, signalingServerUrl: scenario.signalingServerUrl,