diff --git a/Cargo.lock b/Cargo.lock index 8fb7f5bc..18081a13 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,18 +14,18 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ - "gimli 0.29.0", + "gimli 0.31.1", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "adler32" @@ -74,9 +74,9 @@ dependencies = [ [[package]] name = "aitia" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df16ceb7a48cd5b32ff6f5229ea89fad2e61b5f702a603d1ee4a2f2d2d3c6b3b" +checksum = "0c8d0d87e1228df0569cc160bb52542afaa7def9fcd248d1405febb400619126" dependencies = [ "anyhow", "derive_more", @@ -179,9 +179,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "app_dirs2" @@ -215,15 +215,15 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "async-attributes" @@ -260,14 +260,14 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.0", - "futures-lite 2.3.0", + "fastrand", + "futures-lite", "slab", ] @@ -279,59 +279,30 @@ checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ "async-channel 2.3.1", "async-executor", - "async-io 2.3.3", - "async-lock 3.4.0", + "async-io", + "async-lock", "blocking", - "futures-lite 2.3.0", + "futures-lite", "once_cell", ] [[package]] name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg 1.3.0", - "cfg-if 1.0.0", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ - "async-lock 3.4.0", + "async-lock", "cfg-if 1.0.0", "concurrent-queue", "futures-io", - "futures-lite 2.3.0", + "futures-lite", "parking", - "polling 3.7.2", - "rustix 0.38.34", + "polling", + "rustix", "slab", "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", + "windows-sys 0.59.0", ] [[package]] @@ -347,25 +318,27 @@ dependencies = [ [[package]] name = "async-once-cell" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" +checksum = "4288f83726785267c6f2ef073a3d83dc3f9b81464e9f99898240cced85fce35a" [[package]] name = "async-process" -version = "1.8.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-channel 2.3.1", + "async-io", + "async-lock", "async-signal", + "async-task", "blocking", "cfg-if 1.0.0", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.34", - "windows-sys 0.48.0", + "event-listener 5.3.1", + "futures-lite", + "rustix", + "tracing", ] [[package]] @@ -376,44 +349,44 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] name = "async-signal" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.3.3", - "async-lock 3.4.0", + "async-io", + "async-lock", "atomic-waker", "cfg-if 1.0.0", "futures-core", "futures-io", - "rustix 0.38.34", + "rustix", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "async-std" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615" dependencies = [ "async-attributes", "async-channel 1.9.0", "async-global-executor", - "async-io 1.13.0", - "async-lock 2.8.0", + "async-io", + "async-lock", "async-process", "crossbeam-utils", "futures-channel", "futures-core", "futures-io", - "futures-lite 1.13.0", + "futures-lite", "gloo-timers", "kv-log-macro", "log", @@ -454,13 +427,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -486,14 +459,14 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "automap" @@ -513,7 +486,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d67782c3f868daa71d3533538e98a8e13713231969def7536e8039606fc46bf0" dependencies = [ - "fastrand 2.1.0", + "fastrand", "futures-core", "pin-project", "tokio", @@ -521,17 +494,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -650,7 +623,7 @@ dependencies = [ "async-channel 2.3.1", "async-task", "futures-io", - "futures-lite 2.3.0", + "futures-lite", "piper", ] @@ -695,9 +668,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.16.3" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" [[package]] name = "byteorder" @@ -707,9 +680,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" dependencies = [ "serde", ] @@ -731,9 +704,9 @@ checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b" [[package]] name = "camino" -version = "1.1.7" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] @@ -763,9 +736,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.7" +version = "1.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" +checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" +dependencies = [ + "shlex", +] [[package]] name = "cesu8" @@ -800,6 +776,33 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + [[package]] name = "clap" version = "2.34.0" @@ -817,9 +820,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.13" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -827,9 +830,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.13" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", @@ -839,14 +842,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -901,9 +904,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "contrafact" @@ -939,9 +942,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core2" @@ -958,7 +961,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "cfg-if 1.0.0", "libc", "scopeguard", @@ -967,9 +970,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -1181,7 +1184,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -1203,7 +1206,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -1237,9 +1240,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "6.0.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1284,7 +1287,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -1298,11 +1301,11 @@ dependencies = [ [[package]] name = "derive_builder" -version = "0.20.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" dependencies = [ - "derive_builder_macro 0.20.0", + "derive_builder_macro 0.20.2", ] [[package]] @@ -1319,14 +1322,14 @@ dependencies = [ [[package]] name = "derive_builder_core" -version = "0.20.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -1341,12 +1344,12 @@ dependencies = [ [[package]] name = "derive_builder_macro" -version = "0.20.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ - "derive_builder_core 0.20.0", - "syn 2.0.72", + "derive_builder_core 0.20.2", + "syn 2.0.79", ] [[package]] @@ -1359,7 +1362,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -1413,7 +1416,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -1506,7 +1509,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -1578,17 +1581,6 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - [[package]] name = "event-listener" version = "5.3.1" @@ -1630,29 +1622,20 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] @@ -1663,9 +1646,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "fixt" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00a24e34fdd8f793f4eb4e507c8dde88f6c560c19ad337c2fb1f82bb11613cd" +checksum = "ed8befecee7e4e63c317ab8acbc953c4aceb55e12a3a28b51b40dbb627562ae6" dependencies = [ "holochain_serialized_bytes", "lazy_static", @@ -1680,9 +1663,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.31" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -1703,6 +1686,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -1747,9 +1736,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1762,9 +1751,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1772,15 +1761,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1789,24 +1778,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -1814,7 +1788,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.0", + "fastrand", "futures-core", "futures-io", "parking", @@ -1823,26 +1797,26 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-timer" @@ -1852,9 +1826,9 @@ checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1980,15 +1954,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "gloo-timers" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" dependencies = [ "futures-channel", "futures-core", @@ -2025,7 +1999,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.3.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -2034,9 +2008,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", "bytes", @@ -2044,7 +2018,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.3.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -2053,9 +2027,13 @@ dependencies = [ [[package]] name = "half" -version = "1.8.3" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if 1.0.0", + "crunchy", +] [[package]] name = "hashbrown" @@ -2064,7 +2042,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" dependencies = [ "ahash 0.3.8", - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] @@ -2086,6 +2064,17 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + [[package]] name = "hashlink" version = "0.9.1" @@ -2123,9 +2112,9 @@ dependencies = [ [[package]] name = "hc_sleuth" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89308367812f00b6de1b0682129d23e2fcc3a6d1ae7877d68744c4a63957a627" +checksum = "60d2cec326f6b4fd869e86d79a698589a7e0898b16d7b2675f2733770d28acad" dependencies = [ "aitia", "anyhow", @@ -2146,9 +2135,9 @@ dependencies = [ [[package]] name = "hdi" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece9b147d5e9ebc0a1f47a180a31436f4390a060ad46aa325d1fb851321ec3c7" +checksum = "f6a494d33e1082b380b8163ace83d53ca39ca053d0f45f6997d13a8fca008a35" dependencies = [ "getrandom 0.2.15", "hdk_derive", @@ -2164,9 +2153,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ba518e916e7eb29cf4a3b4c0d853fefab76bffc19939f8e0e5925581c67da7" +checksum = "26d6fef9a03facd811accc5a1bb1e22a577e4875190b53337ff01b4746463c78" dependencies = [ "getrandom 0.2.15", "hdi", @@ -2184,9 +2173,9 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93b26f45db67e2619836cd70a880bcf46d40ef844cd838d99ef6008e0f84e86c" +checksum = "4d00472129b62df85a0c853e7ce8cbd4a868e8cf2a30896c470176500d887795" dependencies = [ "darling 0.14.4", "heck 0.5.0", @@ -2272,9 +2261,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acfa694a0138aafda54ce76033168cf182158b7628f7e70b12af0ea0ad20d896" +checksum = "f68f60591ed381388f46c59351a6e2c3d77cb1409a94200dbfd423a6bb8a3622" dependencies = [ "arbitrary", "base64 0.22.1", @@ -2298,9 +2287,9 @@ dependencies = [ [[package]] name = "holochain" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1eb75811baa0598d13a0b01d0b0becc54e26efda9effc20a03e9557367e3d0c" +checksum = "94681f4ca30845b27f44cb751a8db6a0cef266dc45c8a44ba0c3af95550403d4" dependencies = [ "aitia", "anyhow", @@ -2396,9 +2385,9 @@ dependencies = [ [[package]] name = "holochain_cascade" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3119db52d092b333947dacf9aec95d99a7eadc8eda1a2bc97730e77bafe034ae" +checksum = "30641ba03a9abb8d7793690f07d3b626ddf4c963d1fb1ad6ab3be213cb6d76bf" dependencies = [ "async-trait", "fixt", @@ -2423,9 +2412,9 @@ dependencies = [ [[package]] name = "holochain_conductor_api" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "172baa045723827a37d066b2c564e231689abf4570fe512f07778dc0c78d7c8a" +checksum = "2beb2ef85e53cb2567ad6cd555bb0566394b34ffbc4b090715bbebbb167d20cc" dependencies = [ "derive_more", "holo_hash", @@ -2446,9 +2435,9 @@ dependencies = [ [[package]] name = "holochain_conductor_services" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "734cf4cd51642e97e3a7b4085e969a09aa6f6236b3a72b964a8df30b71704793" +checksum = "dfea6be130982205a5421648245a678d429724aaeaf1a61157f3652ccc823355" dependencies = [ "anyhow", "async-trait", @@ -2462,12 +2451,12 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc3c84cd0ee02fa15e037df4fd81c170cb956792732823416c61b0f4e3d2e177" +checksum = "dbb39eaaff334d30de7c7ff547e9f68490098fe379e747852367e508ac485cb3" dependencies = [ "arbitrary", - "derive_builder 0.20.0", + "derive_builder 0.20.2", "holo_hash", "holochain_secure_primitive", "holochain_serialized_bytes", @@ -2484,9 +2473,9 @@ dependencies = [ [[package]] name = "holochain_keystore" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "571f76a5f5d229ce854f9f7757f42db4767ed3248ac886396776450970300979" +checksum = "d15bc60dc779fbfd3a99dc3e37f2c5e9eb9c10d3109f70237d6b3d5f69c1c82b" dependencies = [ "base64 0.22.1", "derive_more", @@ -2513,9 +2502,9 @@ dependencies = [ [[package]] name = "holochain_metrics" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6811d3b83553ef9e3369b79e67955d978af0b7503d2393805c220342bf3b985" +checksum = "a74d7492154a24290d96edfd7548dd895d6f66d9b80a2b9f9a256ef7a8e9b37f" dependencies = [ "opentelemetry_api", "tracing", @@ -2523,9 +2512,9 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbbb63a7658f55a0640a04ad675d7dc6979b7eb7f0a889882efa6e9ac95fd606" +checksum = "7342ca1e823909779cba6f7c0338c82f150957a10ef9931befaf7d75454c6bb7" dependencies = [ "getrandom 0.2.15", "holochain_secure_primitive", @@ -2534,9 +2523,9 @@ dependencies = [ [[package]] name = "holochain_p2p" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bfde1589d00397861464f9234b8877b2e821f8f5fa6c0217070a0fee77e7bf7" +checksum = "e0c0bbefdccba24a52dc3d25355f7280cf4a15c21bf5bb592b7d5acadaffafb5" dependencies = [ "aitia", "async-trait", @@ -2566,9 +2555,9 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2495193fe4700ccd3fda02acc7f982890938b28deb264c9212df3868efd9e0e" +checksum = "023dd96581cb629abc8089a6a583ad4fd47336c2600f8f1bad0035229b35e260" dependencies = [ "paste", "serde", @@ -2605,9 +2594,9 @@ dependencies = [ [[package]] name = "holochain_sqlite" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8b43b7ffd327ded81ff3b5851bbe24757d2822fe288d5b018516ce371a86a4" +checksum = "f986b3437bf22037f9372ac9db9e74e571bd4b7957b0a26cc4a339de3866f8af" dependencies = [ "anyhow", "async-trait", @@ -2648,9 +2637,9 @@ dependencies = [ [[package]] name = "holochain_state" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4bbe822026fb0afda545a22b4e1aa98b7470072806b47af71bafc716f6ea39" +checksum = "6ef99f9cfb8a0821b921d6be151797cb6fcec9ad5e27120f6d7b8b65a6d2c7ec" dependencies = [ "aitia", "async-recursion", @@ -2684,9 +2673,9 @@ dependencies = [ [[package]] name = "holochain_state_types" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f876726313c8373f2c0934eb1f9fd1cff99f94c51281898779daa1ba22ba4a4" +checksum = "7ea98b0b2e8f51a83d617e194d1a73271e348a52b2f3f371cf860ec9e05e8746" dependencies = [ "holo_hash", "holochain_integrity_types", @@ -2695,9 +2684,9 @@ dependencies = [ [[package]] name = "holochain_test_wasm_common" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3e521892e6aa14cb856f373e0b2a9deaca5923e1f06de3b92fc89e9b1c44fb" +checksum = "82276c8e0305deabd77c5f3405bef0aa99448a3f6e5f60f84e7069dee73c953b" dependencies = [ "hdk", "serde", @@ -2705,9 +2694,9 @@ dependencies = [ [[package]] name = "holochain_trace" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a1fa6e79b0774ef51faf34213abd620dc80caa9da0e4f3ff4e64b85be7a9416" +checksum = "91445161ac030d586669207807cb165e6943e7e56aeda485476fc020ffa99f62" dependencies = [ "chrono", "derive_more", @@ -2723,9 +2712,9 @@ dependencies = [ [[package]] name = "holochain_types" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cd76009a50e6155adc650741b8188188abe4d3daff8666864ef808d314d9e6d" +checksum = "1f5a24d9090e7288d7abba810c87c73a63b6f940cee264c4c98a0951e85d047c" dependencies = [ "anyhow", "arbitrary", @@ -2733,7 +2722,7 @@ dependencies = [ "automap", "backtrace", "contrafact", - "derive_builder 0.20.0", + "derive_builder 0.20.2", "derive_more", "fixt", "flate2", @@ -2777,9 +2766,9 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df91c909ed1bcf3dfc55db8dfa8361dba9c4e518c80f9cd30b5c00a3e9c84c62" +checksum = "4fa1fbf85e159b07bac3bb9596f9af5ca79e8e31f83c47a70f8517fd945bcd04" dependencies = [ "backtrace", "cfg-if 1.0.0", @@ -2795,9 +2784,9 @@ dependencies = [ [[package]] name = "holochain_wasm_test_utils" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1333cd0ba272e3191489e52538a3b787f294ca81ccf3b6e0d3839be5cf3fca4" +checksum = "6a98d7627be51e9f40447773f5c843c14c47187436ea832ff95212385320b0ea" dependencies = [ "holochain_types", "holochain_util", @@ -2856,9 +2845,9 @@ dependencies = [ [[package]] name = "holochain_websocket" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0e211a00967a0e7796fcd43b28a7109d92d44ff19266cf08a2da40e62e7a33f" +checksum = "41096273a68c09422a30a744902406a19abdc122899a6b11474dba4e1b35e05e" dependencies = [ "async-trait", "futures", @@ -2873,13 +2862,13 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "526a51ed0b962c2579ff57106fe2dd032a9a1cf2e4820f3dc2f2b37a59b0cc66" +checksum = "9e7cb5c0a7d7162bb3f3fe96e4fb63b31da47a11aa3f3d509e44b78ca4920382" dependencies = [ "arbitrary", "contrafact", - "derive_builder 0.20.0", + "derive_builder 0.20.2", "derive_more", "fixt", "holo_hash", @@ -2997,9 +2986,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -3009,9 +2998,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "human-panic" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c5a08ed290eac04006e21e63d32e90086b6182c7cd0452d10f4264def1fec9a" +checksum = "80b84a66a325082740043a6c28bbea400c129eac0d3a27673a1de971e44bf1f7" dependencies = [ "anstream", "anstyle", @@ -3025,9 +3014,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.30" +version = "0.14.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" dependencies = [ "bytes", "futures-channel", @@ -3049,14 +3038,14 @@ dependencies = [ [[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", "futures-util", - "h2 0.4.5", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "httparse", @@ -3069,15 +3058,15 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.4.1", + "hyper 1.5.0", "hyper-util", - "rustls 0.23.12", + "rustls 0.23.15", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -3092,7 +3081,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.0", "hyper-util", "native-tls", "tokio", @@ -3102,29 +3091,28 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.1", - "hyper 1.4.1", + "hyper 1.5.0", "pin-project-lite", "socket2 0.5.7", "tokio", - "tower", "tower-service", "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3191,19 +3179,19 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "hashbrown 0.12.3", "serde", ] [[package]] name = "indexmap" -version = "2.3.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "serde", ] @@ -3214,12 +3202,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "232929e1d75fe899576a3d5c7416ad0d88dbfbb3c3d6aa00873a7408a50ddb88" dependencies = [ "ahash 0.8.11", - "clap 4.5.13", + "clap 4.5.20", "crossbeam-channel", "crossbeam-utils", - "dashmap 6.0.1", + "dashmap 6.1.0", "env_logger", - "indexmap 2.3.0", + "indexmap 2.6.0", "is-terminal", "itoa", "log", @@ -3261,30 +3249,19 @@ dependencies = [ "trilean", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] @@ -3362,18 +3339,18 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] [[package]] name = "kitsune_p2p" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "820f8c4b6fe9c5282361ebce22b9b355e3a6f3f0259acf8b585f1d46c503ca12" +checksum = "d139523575868a1a8ed109556db5a1004ccc5d5a2e6e3bf62f6bad3777c6150c" dependencies = [ "arrayref", "base64 0.22.1", @@ -3418,9 +3395,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d57481371cae8f3afdc4f8b0791aa04c70afe375c8678ca2bf966637220b6a" +checksum = "33f6e27475c31b3492ba78dbc0e945798cf00d7489def5e574f1ff26ab7cdffb" dependencies = [ "arbitrary", "base64 0.22.1", @@ -3437,9 +3414,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10105ffc84c408d89a39180460fa9adcfcff09dedb511703efdab050fdbfe40c" +checksum = "9bf0b3a417771c4d5268cb211a2aba64d495091868f990c7e728362aab7c8f6d" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -3448,11 +3425,11 @@ dependencies = [ [[package]] name = "kitsune_p2p_bootstrap" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819b705dd8ef03a47b7d1d5df604cead7be890fcea864d028212252baa8ae649" +checksum = "82389b98b00346c7f92248fb73825c083720fb729748a6c184e7da938b1c41d0" dependencies = [ - "clap 4.5.13", + "clap 4.5.20", "futures", "kitsune_p2p_bin_data", "kitsune_p2p_types", @@ -3468,9 +3445,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bootstrap_client" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af44ba9ef97b6e00c99c8762d679eaa209e933e1e6fc517ef8df8a8134f1b3f7" +checksum = "3a1c01931a38d0e09927bcf78040fc97de35491c96be63352c0c4371af9a7e57" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_bootstrap", @@ -3483,9 +3460,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58e09eb5fefd76459e8417234dff5170dcc40c6bddfe56d84d59d1b1867e4378" +checksum = "57f1f73203977efe3cc1141a959b07b29d82220f211955f14f72e5731ac8cb05" dependencies = [ "arbitrary", "colored", @@ -3507,9 +3484,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6be19fb54f5f3adb7ef461d51d073f22f3e7343952a31523d04799bceb695ee2" +checksum = "b703d57c74b2a3d187ec3bbd2be8cf0f52c8d8e1059f5ba3c0d23218f6504e84" dependencies = [ "arbitrary", "derive_more", @@ -3525,13 +3502,13 @@ dependencies = [ [[package]] name = "kitsune_p2p_fetch" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbafc5fb36c8940989b6d8c4ea02aec09efc4f195e79d4532b5bdb363bbec1d2" +checksum = "e6550ea608b633ac295a545c84fb7ff435c263b80a4b16907ab6aace6ac4ae15" dependencies = [ "backon", "derive_more", - "indexmap 2.3.0", + "indexmap 2.6.0", "kitsune_p2p_timestamp", "kitsune_p2p_types", "serde", @@ -3541,9 +3518,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_mdns" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17854121a83e6694bd890c869fa7e511449131495c0ad954c13409f2fc8e7b5e" +checksum = "305236dcbbd2c48d03c29ce430bd8319f7c7e4c64790f97bdb4337238871393b" dependencies = [ "base64 0.22.1", "err-derive 0.3.1", @@ -3556,9 +3533,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_proxy" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c6aa7991351145e7ee372777335851290dbec181d4defa7b266e88778c4c6a" +checksum = "f571aa38f61733d1e6a41d35cc08f514a5616039363a47ea7e92d4dd958ccbd1" dependencies = [ "base64 0.22.1", "derive_more", @@ -3574,9 +3551,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f0ae9c213de76b54f2a7fcfd1f379b106b45efef1c4365110d7df96a531d69e" +checksum = "dade104770176570d49fc70d56801f81e0969b440b71f92ed5ea99746da4932f" dependencies = [ "arbitrary", "chrono", @@ -3590,9 +3567,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_transport_quic" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcda54a6237011a388f0d4bc2a63eb4011927c08dc805fbb41139414c86f1ca9" +checksum = "5702ab51e38eccf842e626cfa785f8e6765ac201ed3251b6a6a284d543bd09a0" dependencies = [ "blake2b_simd", "futures", @@ -3606,9 +3583,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_types" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5466b1e18532035c7bdb3347362463943ed3c7896e2970ba224896f9a2556540" +checksum = "46c0cd7db3b403856bcaebc6a781782bb94350e24cfec2d9296a1518310f1a28" dependencies = [ "arbitrary", "base64 0.22.1", @@ -3705,9 +3682,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "f0b21006cd1874ae9e650973c565615676dc4a274c965bb0a73796dac838ce4f" [[package]] name = "libflate" @@ -3777,13 +3754,14 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", + "redox_syscall 0.5.7", ] [[package]] name = "libsodium-sys-stable" -version = "1.21.1" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd1882b85f01cdd4021c0664fd897710a04c5d01b593a5a70e1b0baa999c1f8" +checksum = "90e7b5bc5a90cb1a680d8b0340f935d575292b8458e077f8da8cf134289d7dcf" dependencies = [ "cc", "libc", @@ -3793,7 +3771,7 @@ dependencies = [ "tar", "ureq", "vcpkg", - "zip 2.1.6", + "zip 2.2.0", ] [[package]] @@ -3808,12 +3786,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -3832,7 +3804,7 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "scopeguard", ] @@ -3853,11 +3825,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.0", ] [[package]] @@ -3911,7 +3883,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "rawpointer", ] @@ -3961,7 +3933,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] @@ -3970,7 +3942,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] @@ -3997,24 +3969,24 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "minisign-verify" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" +checksum = "a05b5d0594e0cb1ad8cee3373018d2b84e25905dc75b2468114cc9a8e86cfc20" [[package]] name = "miniz_oxide" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] name = "mio" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ "hermit-abi 0.3.9", "libc", @@ -4057,9 +4029,9 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "mr_bundle" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2343770ce615ec247e0089a8eaae5731809493a708ac244e187e43a005fb1987" +checksum = "032b2adeb25720b79d7a18ae93dc53a9719e93e6eb707f12b53898b6b4e3febb" dependencies = [ "arbitrary", "derive_more", @@ -4248,6 +4220,7 @@ name = "notifications_integrity" version = "0.0.1" dependencies = [ "hdi", + "profiles_types", "serde", ] @@ -4334,7 +4307,7 @@ version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "num-integer", "num-traits", ] @@ -4356,7 +4329,7 @@ version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "libm", ] @@ -4388,23 +4361,23 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] name = "object" -version = "0.36.2" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "one_err" @@ -4420,9 +4393,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", @@ -4441,7 +4414,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -4452,18 +4425,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.3.1+3.3.1" +version = "300.3.2+3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" +checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b" 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", @@ -4536,9 +4509,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -4583,7 +4556,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.7", "smallvec", "windows-targets 0.52.6", ] @@ -4611,9 +4584,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.11" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", "thiserror", @@ -4627,28 +4600,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.3.0", + "indexmap 2.6.0", "quickcheck", ] [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -4665,50 +4638,34 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.0", + "fastrand", "futures-io", ] [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "polling" -version = "2.8.0" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg 1.3.0", - "bitflags 1.3.2", - "cfg-if 1.0.0", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.34", + "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4772,9 +4729,9 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" dependencies = [ "diff", "yansi", @@ -4782,11 +4739,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] @@ -4815,13 +4772,23 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" dependencies = [ "unicode-ident", ] +[[package]] +name = "profiles_types" +version = "0.2.0" +source = "git+https://github.com/holochain-open-dev/profiles?branch=nixify#3c854292c1d30247d05764b974ccb145350b144a" +dependencies = [ + "derive_more", + "hdi", + "serde", +] + [[package]] name = "proptest" version = "1.5.0" @@ -4836,7 +4803,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift 0.3.0", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", "rusty-fork", "tempfile", "unarray", @@ -4861,7 +4828,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -4974,9 +4941,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -5262,27 +5229,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.5.3" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom 0.2.15", "libredox", @@ -5303,14 +5261,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -5324,13 +5282,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", ] [[package]] @@ -5341,9 +5299,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "region" @@ -5368,20 +5326,20 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.5" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ "base64 0.22.1", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.4.5", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.0", "hyper-rustls", "hyper-tls", "hyper-util", @@ -5393,7 +5351,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "serde", "serde_json", "serde_urlencoded", @@ -5406,14 +5364,14 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "windows-registry", ] [[package]] name = "rgb" -version = "0.8.45" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -5450,9 +5408,9 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" dependencies = [ "bitvec", "bytecheck", @@ -5469,9 +5427,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" dependencies = [ "proc-macro2", "quote", @@ -5561,37 +5519,23 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver 1.0.23", ] [[package]] name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.14", + "linux-raw-sys", "windows-sys 0.52.0", ] @@ -5609,13 +5553,13 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993" dependencies = [ "once_cell", "rustls-pki-types", - "rustls-webpki 0.102.6", + "rustls-webpki 0.102.8", "subtle", "zeroize", ] @@ -5652,19 +5596,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-webpki" @@ -5678,9 +5621,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring 0.17.8", "rustls-pki-types", @@ -5689,9 +5632,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "rusty-fork" @@ -5731,11 +5674,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5769,7 +5712,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -5796,9 +5739,9 @@ dependencies = [ [[package]] name = "sd-notify" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4646d6f919800cd25c50edb49438a1381e2cd4833c027e75e8897981c50b8b5e" +checksum = "1be20c5f7f393ee700f8b2f28ea35812e4e212f40774b550cd2a93ea91684451" [[package]] name = "seahash" @@ -5821,9 +5764,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -5900,16 +5843,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half", - "serde", -] - [[package]] name = "serde_derive" version = "1.0.203" @@ -5918,7 +5851,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -5929,16 +5862,16 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] name = "serde_json" -version = "1.0.122" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.6.0", "itoa", "memchr", "ryu", @@ -5947,9 +5880,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -5968,15 +5901,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.3.0", + "indexmap 2.6.0", "serde", "serde_derive", "serde_json", @@ -5986,14 +5919,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -6002,7 +5935,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.6.0", "itoa", "ryu", "serde", @@ -6061,6 +5994,12 @@ dependencies = [ "memmap2 0.6.2", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "shrinkwraprs" version = "0.3.0" @@ -6104,9 +6043,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simdutf8" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "siphasher" @@ -6123,7 +6062,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] @@ -6187,9 +6126,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "sqlformat" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f" +checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790" dependencies = [ "nom", "unicode_categories", @@ -6247,7 +6186,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -6258,7 +6197,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -6354,9 +6293,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.72" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -6368,6 +6307,9 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "synstructure" @@ -6398,20 +6340,20 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -6425,9 +6367,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", @@ -6454,15 +6396,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.11.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.1.0", + "fastrand", "once_cell", - "rustix 0.38.34", - "windows-sys 0.52.0", + "rustix", + "windows-sys 0.59.0", ] [[package]] @@ -6537,7 +6479,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -6551,22 +6493,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -6636,9 +6578,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.2" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -6660,7 +6602,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -6690,16 +6632,16 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.12", + "rustls 0.23.15", "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -6737,9 +6679,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -6757,7 +6699,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.20", + "toml_edit", ] [[package]] @@ -6771,26 +6713,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.3.0", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.20" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.18", + "winnow", ] [[package]] @@ -6806,32 +6737,11 @@ dependencies = [ "walkdir", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -6853,7 +6763,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -7085,9 +6995,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "unarray" @@ -7106,42 +7016,42 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "unicode_categories" @@ -7186,9 +7096,9 @@ dependencies = [ [[package]] name = "ureq" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" dependencies = [ "base64 0.22.1", "log", @@ -7238,9 +7148,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 0.2.15", "rand 0.8.5", @@ -7286,12 +7196,6 @@ dependencies = [ "libc", ] -[[package]] -name = "waker-fn" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" - [[package]] name = "walkdir" version = "2.5.0" @@ -7322,7 +7226,7 @@ dependencies = [ "futures-util", "headers", "http 0.2.12", - "hyper 0.14.30", + "hyper 0.14.31", "log", "mime", "mime_guess", @@ -7354,34 +7258,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if 1.0.0", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -7391,9 +7296,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7401,22 +7306,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-encoder" @@ -7505,19 +7410,19 @@ dependencies = [ [[package]] name = "wasmer-config" -version = "0.4.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b4a632496950fde9ad821e195ef1a301440076f7c7d80de55239a140359bcbd" +checksum = "644b7e3547bd7e796d92220f60bf57734914254c6cee56607e80177a3e8a28da" dependencies = [ "anyhow", "bytesize", + "ciborium", "derive_builder 0.12.0", "hex", - "indexmap 2.3.0", + "indexmap 2.6.0", "schemars", "semver 1.0.23", "serde", - "serde_cbor", "serde_json", "serde_yaml", "thiserror", @@ -7604,7 +7509,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ "bitflags 2.6.0", - "indexmap 2.3.0", + "indexmap 2.6.0", "semver 1.0.23", ] @@ -7631,9 +7536,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -7641,14 +7546,15 @@ dependencies = [ [[package]] name = "webc" -version = "6.0.0-rc2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3e2ccb43d303c5bd48f31db7a129481a9aaa5343d623f92951751df190df81" +checksum = "cdea84cf234555864ca9b7a5084c1a99dbdf2d148035f62a09b19ce5606532c1" dependencies = [ "anyhow", "base64 0.22.1", "bytes", "cfg-if 1.0.0", + "ciborium", "document-features", "flate2", "indexmap 1.9.3", @@ -7656,7 +7562,6 @@ dependencies = [ "once_cell", "semver 1.0.23", "serde", - "serde_cbor", "serde_json", "sha2", "shared-buffer", @@ -7689,9 +7594,9 @@ dependencies = [ [[package]] name = "wide" -version = "0.7.26" +version = "0.7.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901e8597c777fa042e9e245bd56c0dc4418c5db3f845b6ff94fbac732c6a0692" +checksum = "b828f995bf1e9622031f8009f8481a85406ce1f4d4588ff746d872043e855690" dependencies = [ "bytemuck", "safe_arch", @@ -7753,6 +7658,36 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.33.0" @@ -8012,32 +7947,13 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.40" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] -[[package]] -name = "winnow" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if 1.0.0", - "windows-sys 0.48.0", -] - [[package]] name = "wyz" version = "0.5.1" @@ -8054,8 +7970,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "linux-raw-sys 0.4.14", - "rustix 0.38.34", + "linux-raw-sys", + "rustix", ] [[package]] @@ -8072,9 +7988,9 @@ checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" [[package]] name = "yansi" -version = "0.5.1" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yasna" @@ -8103,7 +8019,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -8126,16 +8042,16 @@ dependencies = [ [[package]] name = "zip" -version = "2.1.6" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e" +checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" dependencies = [ "arbitrary", "crc32fast", "crossbeam-utils", "displaydoc", "flate2", - "indexmap 2.3.0", + "indexmap 2.6.0", "memchr", "thiserror", "zopfli", diff --git a/flake.lock b/flake.lock index 7c6f4362..8f89144b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,47 @@ { "nodes": { + "android-nixpkgs": { + "inputs": { + "devshell": "devshell", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1720988234, + "narHash": "sha256-OzqdY+tTyT6bPNi/jFt2lFmy3nLr7qyhm+0hd5QovgY=", + "owner": "tadfisher", + "repo": "android-nixpkgs", + "rev": "4aeeeec599210e54aee0ac31d4fcb512f87351a0", + "type": "github" + }, + "original": { + "owner": "tadfisher", + "repo": "android-nixpkgs", + "rev": "4aeeeec599210e54aee0ac31d4fcb512f87351a0", + "type": "github" + } + }, + "android-nixpkgs_2": { + "inputs": { + "devshell": "devshell_2", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_10" + }, + "locked": { + "lastModified": 1720988234, + "narHash": "sha256-OzqdY+tTyT6bPNi/jFt2lFmy3nLr7qyhm+0hd5QovgY=", + "owner": "tadfisher", + "repo": "android-nixpkgs", + "rev": "4aeeeec599210e54aee0ac31d4fcb512f87351a0", + "type": "github" + }, + "original": { + "owner": "tadfisher", + "repo": "android-nixpkgs", + "rev": "4aeeeec599210e54aee0ac31d4fcb512f87351a0", + "type": "github" + } + }, "cargo-chef": { "flake": false, "locked": { @@ -49,7 +91,22 @@ "type": "github" } }, - "crane_2": { + "crane_10": { + "locked": { + "lastModified": 1725125250, + "narHash": "sha256-CB20rDD5eHikF6mMTTJdwPP1qvyoiyyw1RDUzwIaIF8=", + "owner": "ipetkov", + "repo": "crane", + "rev": "96fd12c7100e9e05fa1a0a5bd108525600ce282f", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_11": { "locked": { "lastModified": 1725125250, "narHash": "sha256-CB20rDD5eHikF6mMTTJdwPP1qvyoiyyw1RDUzwIaIF8=", @@ -64,6 +121,44 @@ "type": "github" } }, + "crane_12": { + "inputs": { + "nixpkgs": [ + "scaffolding", + "scaffolding", + "holochain", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721322122, + "narHash": "sha256-a0G1NvyXGzdwgu6e1HQpmK5R5yLsfxeBe07nNDyYd+g=", + "owner": "ipetkov", + "repo": "crane", + "rev": "8a68b987c476a33e90f203f0927614a75c3f47ea", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { + "locked": { + "lastModified": 1727974419, + "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", + "owner": "ipetkov", + "repo": "crane", + "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "crane_3": { "locked": { "lastModified": 1725125250, @@ -110,20 +205,57 @@ } }, "crane_6": { - "inputs": { - "nixpkgs": [ - "scaffolding", - "scaffolding", - "holochain", - "nixpkgs" - ] + "locked": { + "lastModified": 1725125250, + "narHash": "sha256-CB20rDD5eHikF6mMTTJdwPP1qvyoiyyw1RDUzwIaIF8=", + "owner": "ipetkov", + "repo": "crane", + "rev": "96fd12c7100e9e05fa1a0a5bd108525600ce282f", + "type": "github" }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_7": { "locked": { - "lastModified": 1721322122, - "narHash": "sha256-a0G1NvyXGzdwgu6e1HQpmK5R5yLsfxeBe07nNDyYd+g=", + "lastModified": 1725125250, + "narHash": "sha256-CB20rDD5eHikF6mMTTJdwPP1qvyoiyyw1RDUzwIaIF8=", "owner": "ipetkov", "repo": "crane", - "rev": "8a68b987c476a33e90f203f0927614a75c3f47ea", + "rev": "96fd12c7100e9e05fa1a0a5bd108525600ce282f", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_8": { + "locked": { + "lastModified": 1727974419, + "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", + "owner": "ipetkov", + "repo": "crane", + "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_9": { + "locked": { + "lastModified": 1725125250, + "narHash": "sha256-CB20rDD5eHikF6mMTTJdwPP1qvyoiyyw1RDUzwIaIF8=", + "owner": "ipetkov", + "repo": "crane", + "rev": "96fd12c7100e9e05fa1a0a5bd108525600ce282f", "type": "github" }, "original": { @@ -148,6 +280,53 @@ "type": "github" } }, + "devshell": { + "inputs": { + "nixpkgs": [ + "profiles", + "p2p-shipyard", + "android-nixpkgs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722113426, + "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "owner": "numtide", + "repo": "devshell", + "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_2": { + "inputs": { + "nixpkgs": [ + "profiles", + "playground", + "p2p-shipyard", + "android-nixpkgs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722113426, + "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "owner": "numtide", + "repo": "devshell", + "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "empty": { "flake": false, "locked": { @@ -198,9 +377,27 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_10": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": "nixpkgs-lib_10" + }, + "locked": { + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_11": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_11" }, "locked": { "lastModified": 1725234343, @@ -216,6 +413,41 @@ "type": "github" } }, + "flake-parts_12": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_12" + }, + "locked": { + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_3" @@ -275,73 +507,164 @@ "nixpkgs-lib": "nixpkgs-lib_6" }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "type": "github" }, "original": { - "id": "flake-parts", - "type": "indirect" + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" } }, - "hc-infra": { + "flake-parts_7": { "inputs": { - "crane": [ - "hc-infra", - "holonix", - "crane" - ], - "holonix": "holonix", - "nixpkgs": [ - "hc-infra", - "holonix", - "nixpkgs" - ], - "pnpmnixpkgs": "pnpmnixpkgs", - "rust-overlay": [ - "hc-infra", - "holonix", - "rust-overlay" - ] + "nixpkgs-lib": "nixpkgs-lib_7" }, "locked": { - "lastModified": 1727766704, - "narHash": "sha256-rrUCUr4IOBIAMNSMCLOFDvolz83cycXfuALSJT/f1hw=", - "owner": "holochain-open-dev", - "repo": "infrastructure", - "rev": "b30bc64ee90e01a3da8c01c7b3b66e3c72019f5e", + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "type": "github" }, "original": { - "owner": "holochain-open-dev", - "repo": "infrastructure", + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, - "hc-infra_2": { + "flake-parts_8": { "inputs": { - "crane": [ - "profiles", - "hc-infra", - "holonix", - "crane" - ], - "holonix": "holonix_3", - "nixpkgs": [ - "profiles", - "hc-infra", - "holonix", - "nixpkgs" - ], - "pnpmnixpkgs": "pnpmnixpkgs_2", - "rust-overlay": [ - "profiles", - "hc-infra", - "holonix", - "rust-overlay" + "nixpkgs-lib": "nixpkgs-lib_8" + }, + "locked": { + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_9": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_9" + }, + "locked": { + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "hc-infra": { + "inputs": { + "crane": [ + "hc-infra", + "holonix", + "crane" + ], + "holonix": "holonix", + "nixpkgs": [ + "hc-infra", + "holonix", + "nixpkgs" + ], + "pnpmnixpkgs": "pnpmnixpkgs", + "rust-overlay": [ + "hc-infra", + "holonix", + "rust-overlay" + ] + }, + "locked": { + "lastModified": 1729155170, + "narHash": "sha256-NeFwKsdQS4sh91RRqEjr+4qMn0clhvSSKOyAAuv3tTE=", + "owner": "holochain-open-dev", + "repo": "infrastructure", + "rev": "e253207c9b0bdac2203b178562cba9d9d6fe4be6", + "type": "github" + }, + "original": { + "owner": "holochain-open-dev", + "repo": "infrastructure", + "type": "github" + } + }, + "hc-infra_2": { + "inputs": { + "crane": [ + "profiles", + "hc-infra", + "holonix", + "crane" + ], + "holonix": "holonix_3", + "nixpkgs": [ + "profiles", + "hc-infra", + "holonix", + "nixpkgs" + ], + "pnpmnixpkgs": "pnpmnixpkgs_2", + "rust-overlay": [ + "profiles", + "hc-infra", + "holonix", + "rust-overlay" ] }, "locked": { @@ -358,6 +681,129 @@ "type": "github" } }, + "hc-infra_3": { + "inputs": { + "crane": [ + "profiles", + "p2p-shipyard", + "hc-infra", + "holonix", + "crane" + ], + "holonix": "holonix_5", + "nixpkgs": [ + "profiles", + "p2p-shipyard", + "hc-infra", + "holonix", + "nixpkgs" + ], + "pnpmnixpkgs": "pnpmnixpkgs_3", + "rust-overlay": [ + "profiles", + "p2p-shipyard", + "hc-infra", + "holonix", + "rust-overlay" + ] + }, + "locked": { + "lastModified": 1727440365, + "narHash": "sha256-XeonUZzVKcl3QDrhE9zP2JuK4LkzSsNIf/p/qKS9PNM=", + "owner": "holochain-open-dev", + "repo": "infrastructure", + "rev": "80fae8556cdcc5b8dc155ca41f3786787bcf806a", + "type": "github" + }, + "original": { + "owner": "holochain-open-dev", + "repo": "infrastructure", + "type": "github" + } + }, + "hc-infra_4": { + "inputs": { + "crane": [ + "profiles", + "playground", + "hc-infra", + "holonix", + "crane" + ], + "holonix": "holonix_7", + "nixpkgs": [ + "profiles", + "playground", + "hc-infra", + "holonix", + "nixpkgs" + ], + "pnpmnixpkgs": "pnpmnixpkgs_4", + "rust-overlay": [ + "profiles", + "playground", + "hc-infra", + "holonix", + "rust-overlay" + ] + }, + "locked": { + "lastModified": 1728573856, + "narHash": "sha256-XlnTbS45DKtlHjhc3KT2lqlEn86dxEMcmcHobDn69Zc=", + "owner": "holochain-open-dev", + "repo": "infrastructure", + "rev": "e342ffa8d1304205a0f5a339d00923243a2bd309", + "type": "github" + }, + "original": { + "owner": "holochain-open-dev", + "repo": "infrastructure", + "type": "github" + } + }, + "hc-infra_5": { + "inputs": { + "crane": [ + "profiles", + "playground", + "p2p-shipyard", + "hc-infra", + "holonix", + "crane" + ], + "holonix": "holonix_9", + "nixpkgs": [ + "profiles", + "playground", + "p2p-shipyard", + "hc-infra", + "holonix", + "nixpkgs" + ], + "pnpmnixpkgs": "pnpmnixpkgs_5", + "rust-overlay": [ + "profiles", + "playground", + "p2p-shipyard", + "hc-infra", + "holonix", + "rust-overlay" + ] + }, + "locked": { + "lastModified": 1727440365, + "narHash": "sha256-XeonUZzVKcl3QDrhE9zP2JuK4LkzSsNIf/p/qKS9PNM=", + "owner": "holochain-open-dev", + "repo": "infrastructure", + "rev": "80fae8556cdcc5b8dc155ca41f3786787bcf806a", + "type": "github" + }, + "original": { + "owner": "holochain-open-dev", + "repo": "infrastructure", + "type": "github" + } + }, "hc-launch": { "flake": false, "locked": { @@ -375,7 +821,7 @@ "type": "github" } }, - "hc-launch_2": { + "hc-launch_10": { "flake": false, "locked": { "lastModified": 1717431387, @@ -392,7 +838,7 @@ "type": "github" } }, - "hc-launch_3": { + "hc-launch_11": { "flake": false, "locked": { "lastModified": 1717431387, @@ -409,7 +855,7 @@ "type": "github" } }, - "hc-launch_4": { + "hc-launch_2": { "flake": false, "locked": { "lastModified": 1717431387, @@ -426,7 +872,7 @@ "type": "github" } }, - "hc-launch_5": { + "hc-launch_3": { "flake": false, "locked": { "lastModified": 1717431387, @@ -443,83 +889,117 @@ "type": "github" } }, - "hc-scaffold": { + "hc-launch_4": { "flake": false, "locked": { - "lastModified": 1724073530, - "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", + "lastModified": 1717431387, + "narHash": "sha256-+VvWwBmxcgePV1L6kU2mSkg3emMiMgpdQnCqvQJkRPk=", "owner": "holochain", - "repo": "scaffolding", - "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", + "repo": "hc-launch", + "rev": "9d9cab5e6b57e1c278113921ff203e515c8bbd2e", "type": "github" }, "original": { "owner": "holochain", "ref": "holochain-0.3", - "repo": "scaffolding", + "repo": "hc-launch", "type": "github" } }, - "hc-scaffold_2": { + "hc-launch_5": { "flake": false, "locked": { - "lastModified": 1724073530, - "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", + "lastModified": 1717431387, + "narHash": "sha256-+VvWwBmxcgePV1L6kU2mSkg3emMiMgpdQnCqvQJkRPk=", "owner": "holochain", - "repo": "scaffolding", - "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", + "repo": "hc-launch", + "rev": "9d9cab5e6b57e1c278113921ff203e515c8bbd2e", "type": "github" }, "original": { "owner": "holochain", "ref": "holochain-0.3", - "repo": "scaffolding", + "repo": "hc-launch", "type": "github" } }, - "hc-scaffold_3": { + "hc-launch_6": { "flake": false, "locked": { - "lastModified": 1724073530, - "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", + "lastModified": 1717431387, + "narHash": "sha256-+VvWwBmxcgePV1L6kU2mSkg3emMiMgpdQnCqvQJkRPk=", "owner": "holochain", - "repo": "scaffolding", - "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", + "repo": "hc-launch", + "rev": "9d9cab5e6b57e1c278113921ff203e515c8bbd2e", "type": "github" }, "original": { "owner": "holochain", "ref": "holochain-0.3", - "repo": "scaffolding", + "repo": "hc-launch", "type": "github" } }, - "hc-scaffold_4": { + "hc-launch_7": { "flake": false, "locked": { - "lastModified": 1724073530, - "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", + "lastModified": 1717431387, + "narHash": "sha256-+VvWwBmxcgePV1L6kU2mSkg3emMiMgpdQnCqvQJkRPk=", "owner": "holochain", - "repo": "scaffolding", - "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", + "repo": "hc-launch", + "rev": "9d9cab5e6b57e1c278113921ff203e515c8bbd2e", "type": "github" }, "original": { "owner": "holochain", "ref": "holochain-0.3", - "repo": "scaffolding", + "repo": "hc-launch", "type": "github" } }, - "hc-scaffold_5": { + "hc-launch_8": { "flake": false, "locked": { - "lastModified": 1724073530, - "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", + "lastModified": 1717431387, + "narHash": "sha256-+VvWwBmxcgePV1L6kU2mSkg3emMiMgpdQnCqvQJkRPk=", "owner": "holochain", - "repo": "scaffolding", - "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", - "type": "github" + "repo": "hc-launch", + "rev": "9d9cab5e6b57e1c278113921ff203e515c8bbd2e", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3", + "repo": "hc-launch", + "type": "github" + } + }, + "hc-launch_9": { + "flake": false, + "locked": { + "lastModified": 1717431387, + "narHash": "sha256-+VvWwBmxcgePV1L6kU2mSkg3emMiMgpdQnCqvQJkRPk=", + "owner": "holochain", + "repo": "hc-launch", + "rev": "9d9cab5e6b57e1c278113921ff203e515c8bbd2e", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3", + "repo": "hc-launch", + "type": "github" + } + }, + "hc-scaffold": { + "flake": false, + "locked": { + "lastModified": 1727691892, + "narHash": "sha256-8dMLmpYp19wZhxlR1uiSeR23nGAOhHnyiZ/5CPwOoAg=", + "owner": "holochain", + "repo": "scaffolding", + "rev": "d0290b88ac08e6811d57acb3294a177d107d2528", + "type": "github" }, "original": { "owner": "holochain", @@ -528,41 +1008,177 @@ "type": "github" } }, - "holochain": { + "hc-scaffold_10": { "flake": false, "locked": { - "lastModified": 1722347117, - "narHash": "sha256-Jv4DxaVtdbO+fOD4woFoepCCOtRN/HF94xJSwViz3ck=", + "lastModified": 1724073530, + "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", "owner": "holochain", - "repo": "holochain", - "rev": "97d86050b177829b623461970db5c3b64fbd74c1", + "repo": "scaffolding", + "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3.2", - "repo": "holochain", + "ref": "holochain-0.3", + "repo": "scaffolding", "type": "github" } }, - "holochain_2": { + "hc-scaffold_11": { "flake": false, "locked": { - "lastModified": 1722347117, - "narHash": "sha256-Jv4DxaVtdbO+fOD4woFoepCCOtRN/HF94xJSwViz3ck=", + "lastModified": 1724073530, + "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", "owner": "holochain", - "repo": "holochain", - "rev": "97d86050b177829b623461970db5c3b64fbd74c1", + "repo": "scaffolding", + "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3.2", - "repo": "holochain", + "ref": "holochain-0.3", + "repo": "scaffolding", "type": "github" } }, - "holochain_3": { + "hc-scaffold_2": { + "flake": false, + "locked": { + "lastModified": 1727691892, + "narHash": "sha256-8dMLmpYp19wZhxlR1uiSeR23nGAOhHnyiZ/5CPwOoAg=", + "owner": "holochain", + "repo": "scaffolding", + "rev": "d0290b88ac08e6811d57acb3294a177d107d2528", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3", + "repo": "scaffolding", + "type": "github" + } + }, + "hc-scaffold_3": { + "flake": false, + "locked": { + "lastModified": 1724073530, + "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", + "owner": "holochain", + "repo": "scaffolding", + "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3", + "repo": "scaffolding", + "type": "github" + } + }, + "hc-scaffold_4": { + "flake": false, + "locked": { + "lastModified": 1724073530, + "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", + "owner": "holochain", + "repo": "scaffolding", + "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3", + "repo": "scaffolding", + "type": "github" + } + }, + "hc-scaffold_5": { + "flake": false, + "locked": { + "lastModified": 1724073530, + "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", + "owner": "holochain", + "repo": "scaffolding", + "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3", + "repo": "scaffolding", + "type": "github" + } + }, + "hc-scaffold_6": { + "flake": false, + "locked": { + "lastModified": 1724073530, + "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", + "owner": "holochain", + "repo": "scaffolding", + "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3", + "repo": "scaffolding", + "type": "github" + } + }, + "hc-scaffold_7": { + "flake": false, + "locked": { + "lastModified": 1727691892, + "narHash": "sha256-8dMLmpYp19wZhxlR1uiSeR23nGAOhHnyiZ/5CPwOoAg=", + "owner": "holochain", + "repo": "scaffolding", + "rev": "d0290b88ac08e6811d57acb3294a177d107d2528", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3", + "repo": "scaffolding", + "type": "github" + } + }, + "hc-scaffold_8": { + "flake": false, + "locked": { + "lastModified": 1727691892, + "narHash": "sha256-8dMLmpYp19wZhxlR1uiSeR23nGAOhHnyiZ/5CPwOoAg=", + "owner": "holochain", + "repo": "scaffolding", + "rev": "d0290b88ac08e6811d57acb3294a177d107d2528", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3", + "repo": "scaffolding", + "type": "github" + } + }, + "hc-scaffold_9": { + "flake": false, + "locked": { + "lastModified": 1724073530, + "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", + "owner": "holochain", + "repo": "scaffolding", + "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3", + "repo": "scaffolding", + "type": "github" + } + }, + "holochain": { "flake": false, "locked": { "lastModified": 1722347117, @@ -579,7 +1195,7 @@ "type": "github" } }, - "holochain_4": { + "holochain_10": { "flake": false, "locked": { "lastModified": 1722347117, @@ -596,7 +1212,7 @@ "type": "github" } }, - "holochain_5": { + "holochain_11": { "flake": false, "locked": { "lastModified": 1722347117, @@ -613,15 +1229,15 @@ "type": "github" } }, - "holochain_6": { + "holochain_12": { "inputs": { "cargo-chef": "cargo-chef", "cargo-rdme": "cargo-rdme", - "crane": "crane_6", + "crane": "crane_12", "crate2nix": "crate2nix", "empty": "empty", "flake-compat": "flake-compat", - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_12", "holochain": [ "scaffolding", "scaffolding", @@ -641,10 +1257,10 @@ "empty" ], "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_14", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "repo-git": "repo-git", - "rust-overlay": "rust-overlay_6", + "rust-overlay": "rust-overlay_12", "scaffolding": [ "scaffolding", "scaffolding", @@ -671,7 +1287,7 @@ "type": "github" } }, - "holochain_7": { + "holochain_13": { "flake": false, "locked": { "lastModified": 1722347117, @@ -688,75 +1304,263 @@ "type": "github" } }, - "holonix": { - "inputs": { - "crane": "crane", - "flake-parts": "flake-parts", - "hc-launch": "hc-launch", - "hc-scaffold": "hc-scaffold", - "holochain": "holochain", - "lair-keystore": "lair-keystore", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" - }, + "holochain_2": { + "flake": false, "locked": { - "lastModified": 1727194089, - "narHash": "sha256-+KmoByZhktCuJHNqYiZYedvSwhjgzLev0F0NcKNHgMY=", + "lastModified": 1728056814, + "narHash": "sha256-OUVNmUCUk4G2ur+O/Q6Ji77iHQeN3PufmiPDz9MS8AY=", "owner": "holochain", - "repo": "holonix", - "rev": "0aeff9984ab60ea70df3812be605a5f455f0489b", + "repo": "holochain", + "rev": "63aeec5fd95b3263bc8ebce73c53b9f0e03bbf36", "type": "github" }, "original": { "owner": "holochain", - "ref": "main-0.3", - "repo": "holonix", + "ref": "holochain-0.3.3", + "repo": "holochain", "type": "github" } }, - "holonix_2": { - "inputs": { - "crane": "crane_2", - "flake-parts": "flake-parts_2", - "hc-launch": "hc-launch_2", - "hc-scaffold": "hc-scaffold_2", - "holochain": "holochain_2", - "lair-keystore": "lair-keystore_2", - "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay_2" - }, + "holochain_3": { + "flake": false, "locked": { - "lastModified": 1727194089, - "narHash": "sha256-+KmoByZhktCuJHNqYiZYedvSwhjgzLev0F0NcKNHgMY=", + "lastModified": 1722347117, + "narHash": "sha256-Jv4DxaVtdbO+fOD4woFoepCCOtRN/HF94xJSwViz3ck=", "owner": "holochain", - "repo": "holonix", - "rev": "0aeff9984ab60ea70df3812be605a5f455f0489b", + "repo": "holochain", + "rev": "97d86050b177829b623461970db5c3b64fbd74c1", "type": "github" }, "original": { "owner": "holochain", - "ref": "main-0.3", - "repo": "holonix", + "ref": "holochain-0.3.2", + "repo": "holochain", "type": "github" } }, - "holonix_3": { - "inputs": { - "crane": "crane_3", - "flake-parts": "flake-parts_3", - "hc-launch": "hc-launch_3", - "hc-scaffold": "hc-scaffold_3", - "holochain": "holochain_3", - "lair-keystore": "lair-keystore_3", - "nixpkgs": "nixpkgs_3", - "rust-overlay": "rust-overlay_3" - }, + "holochain_4": { + "flake": false, "locked": { - "lastModified": 1727194089, - "narHash": "sha256-+KmoByZhktCuJHNqYiZYedvSwhjgzLev0F0NcKNHgMY=", + "lastModified": 1722347117, + "narHash": "sha256-Jv4DxaVtdbO+fOD4woFoepCCOtRN/HF94xJSwViz3ck=", "owner": "holochain", - "repo": "holonix", - "rev": "0aeff9984ab60ea70df3812be605a5f455f0489b", + "repo": "holochain", + "rev": "97d86050b177829b623461970db5c3b64fbd74c1", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3.2", + "repo": "holochain", + "type": "github" + } + }, + "holochain_5": { + "flake": false, + "locked": { + "lastModified": 1722347117, + "narHash": "sha256-Jv4DxaVtdbO+fOD4woFoepCCOtRN/HF94xJSwViz3ck=", + "owner": "holochain", + "repo": "holochain", + "rev": "97d86050b177829b623461970db5c3b64fbd74c1", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3.2", + "repo": "holochain", + "type": "github" + } + }, + "holochain_6": { + "flake": false, + "locked": { + "lastModified": 1722347117, + "narHash": "sha256-Jv4DxaVtdbO+fOD4woFoepCCOtRN/HF94xJSwViz3ck=", + "owner": "holochain", + "repo": "holochain", + "rev": "97d86050b177829b623461970db5c3b64fbd74c1", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3.2", + "repo": "holochain", + "type": "github" + } + }, + "holochain_7": { + "flake": false, + "locked": { + "lastModified": 1722347117, + "narHash": "sha256-Jv4DxaVtdbO+fOD4woFoepCCOtRN/HF94xJSwViz3ck=", + "owner": "holochain", + "repo": "holochain", + "rev": "97d86050b177829b623461970db5c3b64fbd74c1", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3.2", + "repo": "holochain", + "type": "github" + } + }, + "holochain_8": { + "flake": false, + "locked": { + "lastModified": 1728056814, + "narHash": "sha256-OUVNmUCUk4G2ur+O/Q6Ji77iHQeN3PufmiPDz9MS8AY=", + "owner": "holochain", + "repo": "holochain", + "rev": "63aeec5fd95b3263bc8ebce73c53b9f0e03bbf36", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3.3", + "repo": "holochain", + "type": "github" + } + }, + "holochain_9": { + "flake": false, + "locked": { + "lastModified": 1722347117, + "narHash": "sha256-Jv4DxaVtdbO+fOD4woFoepCCOtRN/HF94xJSwViz3ck=", + "owner": "holochain", + "repo": "holochain", + "rev": "97d86050b177829b623461970db5c3b64fbd74c1", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3.2", + "repo": "holochain", + "type": "github" + } + }, + "holonix": { + "inputs": { + "crane": "crane", + "flake-parts": "flake-parts", + "hc-launch": "hc-launch", + "hc-scaffold": "hc-scaffold", + "holochain": "holochain", + "lair-keystore": "lair-keystore", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1727888522, + "narHash": "sha256-v7xvwPMeIUkYnPuMG+uypRu259t1HoSYBY+1zaq8jHs=", + "owner": "holochain", + "repo": "holonix", + "rev": "9d3c4cf95e0224a953de9a290d055e494113e42b", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "main-0.3", + "repo": "holonix", + "type": "github" + } + }, + "holonix_10": { + "inputs": { + "crane": "crane_10", + "flake-parts": "flake-parts_10", + "hc-launch": "hc-launch_10", + "hc-scaffold": "hc-scaffold_10", + "holochain": "holochain_10", + "lair-keystore": "lair-keystore_10", + "nixpkgs": "nixpkgs_12", + "rust-overlay": "rust-overlay_10" + }, + "locked": { + "lastModified": 1727194089, + "narHash": "sha256-+KmoByZhktCuJHNqYiZYedvSwhjgzLev0F0NcKNHgMY=", + "owner": "holochain", + "repo": "holonix", + "rev": "0aeff9984ab60ea70df3812be605a5f455f0489b", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "main-0.3", + "repo": "holonix", + "type": "github" + } + }, + "holonix_11": { + "inputs": { + "crane": "crane_11", + "flake-parts": "flake-parts_11", + "hc-launch": "hc-launch_11", + "hc-scaffold": "hc-scaffold_11", + "holochain": "holochain_11", + "lair-keystore": "lair-keystore_11", + "nixpkgs": "nixpkgs_13", + "rust-overlay": "rust-overlay_11" + }, + "locked": { + "lastModified": 1727194089, + "narHash": "sha256-+KmoByZhktCuJHNqYiZYedvSwhjgzLev0F0NcKNHgMY=", + "owner": "holochain", + "repo": "holonix", + "rev": "0aeff9984ab60ea70df3812be605a5f455f0489b", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "main-0.3", + "repo": "holonix", + "type": "github" + } + }, + "holonix_2": { + "inputs": { + "crane": "crane_2", + "flake-parts": "flake-parts_2", + "hc-launch": "hc-launch_2", + "hc-scaffold": "hc-scaffold_2", + "holochain": "holochain_2", + "lair-keystore": "lair-keystore_2", + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1728321646, + "narHash": "sha256-Wi6LEXhmErD4P4wELAcLP5z/keH7EeYl6zpWQzXXvsk=", + "owner": "holochain", + "repo": "holonix", + "rev": "a3252429407995fae1987be1a0391504f8e40269", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "main-0.3", + "repo": "holonix", + "type": "github" + } + }, + "holonix_3": { + "inputs": { + "crane": "crane_3", + "flake-parts": "flake-parts_3", + "hc-launch": "hc-launch_3", + "hc-scaffold": "hc-scaffold_3", + "holochain": "holochain_3", + "lair-keystore": "lair-keystore_3", + "nixpkgs": "nixpkgs_3", + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1727194089, + "narHash": "sha256-+KmoByZhktCuJHNqYiZYedvSwhjgzLev0F0NcKNHgMY=", + "owner": "holochain", + "repo": "holonix", + "rev": "0aeff9984ab60ea70df3812be605a5f455f0489b", "type": "github" }, "original": { @@ -800,7 +1604,7 @@ "hc-scaffold": "hc-scaffold_5", "holochain": "holochain_5", "lair-keystore": "lair-keystore_5", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay_5" }, "locked": { @@ -818,58 +1622,111 @@ "type": "github" } }, - "lair": { - "flake": false, + "holonix_6": { + "inputs": { + "crane": "crane_6", + "flake-parts": "flake-parts_6", + "hc-launch": "hc-launch_6", + "hc-scaffold": "hc-scaffold_6", + "holochain": "holochain_6", + "lair-keystore": "lair-keystore_6", + "nixpkgs": "nixpkgs_7", + "rust-overlay": "rust-overlay_6" + }, "locked": { - "lastModified": 1717684904, - "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", + "lastModified": 1727194089, + "narHash": "sha256-+KmoByZhktCuJHNqYiZYedvSwhjgzLev0F0NcKNHgMY=", "owner": "holochain", - "repo": "lair", - "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", + "repo": "holonix", + "rev": "0aeff9984ab60ea70df3812be605a5f455f0489b", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.4.5", - "repo": "lair", + "ref": "main-0.3", + "repo": "holonix", "type": "github" } }, - "lair-keystore": { - "flake": false, + "holonix_7": { + "inputs": { + "crane": "crane_7", + "flake-parts": "flake-parts_7", + "hc-launch": "hc-launch_7", + "hc-scaffold": "hc-scaffold_7", + "holochain": "holochain_7", + "lair-keystore": "lair-keystore_7", + "nixpkgs": "nixpkgs_8", + "rust-overlay": "rust-overlay_7" + }, "locked": { - "lastModified": 1717684904, - "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", + "lastModified": 1727888522, + "narHash": "sha256-v7xvwPMeIUkYnPuMG+uypRu259t1HoSYBY+1zaq8jHs=", "owner": "holochain", - "repo": "lair", - "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", + "repo": "holonix", + "rev": "9d3c4cf95e0224a953de9a290d055e494113e42b", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.4.5", - "repo": "lair", + "ref": "main-0.3", + "repo": "holonix", "type": "github" } }, - "lair-keystore_2": { - "flake": false, + "holonix_8": { + "inputs": { + "crane": "crane_8", + "flake-parts": "flake-parts_8", + "hc-launch": "hc-launch_8", + "hc-scaffold": "hc-scaffold_8", + "holochain": "holochain_8", + "lair-keystore": "lair-keystore_8", + "nixpkgs": "nixpkgs_9", + "rust-overlay": "rust-overlay_8" + }, "locked": { - "lastModified": 1717684904, - "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", + "lastModified": 1728321646, + "narHash": "sha256-Wi6LEXhmErD4P4wELAcLP5z/keH7EeYl6zpWQzXXvsk=", "owner": "holochain", - "repo": "lair", - "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", + "repo": "holonix", + "rev": "a3252429407995fae1987be1a0391504f8e40269", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.4.5", - "repo": "lair", + "ref": "main-0.3", + "repo": "holonix", "type": "github" } }, - "lair-keystore_3": { + "holonix_9": { + "inputs": { + "crane": "crane_9", + "flake-parts": "flake-parts_9", + "hc-launch": "hc-launch_9", + "hc-scaffold": "hc-scaffold_9", + "holochain": "holochain_9", + "lair-keystore": "lair-keystore_9", + "nixpkgs": "nixpkgs_11", + "rust-overlay": "rust-overlay_9" + }, + "locked": { + "lastModified": 1727194089, + "narHash": "sha256-+KmoByZhktCuJHNqYiZYedvSwhjgzLev0F0NcKNHgMY=", + "owner": "holochain", + "repo": "holonix", + "rev": "0aeff9984ab60ea70df3812be605a5f455f0489b", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "main-0.3", + "repo": "holonix", + "type": "github" + } + }, + "lair": { "flake": false, "locked": { "lastModified": 1717684904, @@ -886,7 +1743,7 @@ "type": "github" } }, - "lair-keystore_4": { + "lair-keystore": { "flake": false, "locked": { "lastModified": 1717684904, @@ -903,7 +1760,160 @@ "type": "github" } }, - "lair-keystore_5": { + "lair-keystore_10": { + "flake": false, + "locked": { + "lastModified": 1717684904, + "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", + "owner": "holochain", + "repo": "lair", + "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "lair_keystore-v0.4.5", + "repo": "lair", + "type": "github" + } + }, + "lair-keystore_11": { + "flake": false, + "locked": { + "lastModified": 1717684904, + "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", + "owner": "holochain", + "repo": "lair", + "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "lair_keystore-v0.4.5", + "repo": "lair", + "type": "github" + } + }, + "lair-keystore_2": { + "flake": false, + "locked": { + "lastModified": 1717684904, + "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", + "owner": "holochain", + "repo": "lair", + "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "lair_keystore-v0.4.5", + "repo": "lair", + "type": "github" + } + }, + "lair-keystore_3": { + "flake": false, + "locked": { + "lastModified": 1717684904, + "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", + "owner": "holochain", + "repo": "lair", + "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "lair_keystore-v0.4.5", + "repo": "lair", + "type": "github" + } + }, + "lair-keystore_4": { + "flake": false, + "locked": { + "lastModified": 1717684904, + "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", + "owner": "holochain", + "repo": "lair", + "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "lair_keystore-v0.4.5", + "repo": "lair", + "type": "github" + } + }, + "lair-keystore_5": { + "flake": false, + "locked": { + "lastModified": 1717684904, + "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", + "owner": "holochain", + "repo": "lair", + "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "lair_keystore-v0.4.5", + "repo": "lair", + "type": "github" + } + }, + "lair-keystore_6": { + "flake": false, + "locked": { + "lastModified": 1717684904, + "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", + "owner": "holochain", + "repo": "lair", + "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "lair_keystore-v0.4.5", + "repo": "lair", + "type": "github" + } + }, + "lair-keystore_7": { + "flake": false, + "locked": { + "lastModified": 1717684904, + "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", + "owner": "holochain", + "repo": "lair", + "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "lair_keystore-v0.4.5", + "repo": "lair", + "type": "github" + } + }, + "lair-keystore_8": { + "flake": false, + "locked": { + "lastModified": 1717684904, + "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", + "owner": "holochain", + "repo": "lair", + "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "lair_keystore-v0.4.5", + "repo": "lair", + "type": "github" + } + }, + "lair-keystore_9": { "flake": false, "locked": { "lastModified": 1717684904, @@ -980,7 +1990,19 @@ "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" } }, - "nixpkgs-lib_2": { + "nixpkgs-lib_10": { + "locked": { + "lastModified": 1725233747, + "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + } + }, + "nixpkgs-lib_11": { "locked": { "lastModified": 1725233747, "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", @@ -992,6 +2014,30 @@ "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" } }, + "nixpkgs-lib_12": { + "locked": { + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + } + }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + } + }, "nixpkgs-lib_3": { "locked": { "lastModified": 1725233747, @@ -1023,109 +2069,429 @@ "type": "tarball", "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" - } - }, - "nixpkgs-lib_6": { + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + } + }, + "nixpkgs-lib_6": { + "locked": { + "lastModified": 1725233747, + "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + } + }, + "nixpkgs-lib_7": { + "locked": { + "lastModified": 1725233747, + "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + } + }, + "nixpkgs-lib_8": { + "locked": { + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + } + }, + "nixpkgs-lib_9": { + "locked": { + "lastModified": 1725233747, + "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + } + }, + "nixpkgs_10": { + "locked": { + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1717179513, + "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1717179513, + "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_13": { + "locked": { + "lastModified": 1717179513, + "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_14": { + "locked": { + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1717179513, + "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1717179513, + "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1717179513, + "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1717179513, + "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1717179513, + "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1717179513, + "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1717179513, + "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "p2p-shipyard": { + "inputs": { + "android-nixpkgs": "android-nixpkgs", + "crane": [ + "profiles", + "p2p-shipyard", + "holonix", + "crane" + ], + "hc-infra": "hc-infra_3", + "holonix": "holonix_6", + "nixpkgs": [ + "profiles", + "p2p-shipyard", + "hc-infra", + "nixpkgs" + ], + "rust-overlay": [ + "profiles", + "p2p-shipyard", + "holonix", + "rust-overlay" + ], + "webkitgtknixpkgs": "webkitgtknixpkgs" + }, + "locked": { + "lastModified": 1728913643, + "narHash": "sha256-wpMb1WpGtFIYPxSqHhTRyG1AycUXjTE1waiJr7OPWio=", + "owner": "darksoil-studio", + "repo": "p2p-shipyard", + "rev": "2b98a9022d027c839084ff6b1656205493719517", + "type": "github" + }, + "original": { + "owner": "darksoil-studio", + "ref": "develop", + "repo": "p2p-shipyard", + "type": "github" + } + }, + "p2p-shipyard_2": { + "inputs": { + "android-nixpkgs": "android-nixpkgs_2", + "crane": [ + "profiles", + "playground", + "p2p-shipyard", + "holonix", + "crane" + ], + "hc-infra": "hc-infra_5", + "holonix": "holonix_10", + "nixpkgs": [ + "profiles", + "playground", + "p2p-shipyard", + "hc-infra", + "nixpkgs" + ], + "rust-overlay": [ + "profiles", + "playground", + "p2p-shipyard", + "holonix", + "rust-overlay" + ], + "webkitgtknixpkgs": "webkitgtknixpkgs_2" + }, "locked": { - "lastModified": 1719876945, - "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "lastModified": 1728285492, + "narHash": "sha256-Bt22i2hmD6ei0p3cWUDKvdYxm0mSdVD4Id5LWdBLTfY=", + "owner": "darksoil-studio", + "repo": "p2p-shipyard", + "rev": "e53bca77507eb808009b753b811aa9fc8ed32f0a", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "owner": "darksoil-studio", + "repo": "p2p-shipyard", + "type": "github" } }, - "nixpkgs_2": { + "playground": { + "inputs": { + "hc-infra": "hc-infra_4", + "holonix": "holonix_8", + "nixpkgs": [ + "profiles", + "playground", + "holonix", + "nixpkgs" + ], + "p2p-shipyard": "p2p-shipyard_2" + }, "locked": { - "lastModified": 1717179513, - "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "lastModified": 1728899168, + "narHash": "sha256-1gb+yj0J7n2zey0/Kg1SCdNhs/Lzjr18GMQt2Xn/Ekg=", + "owner": "darksoil-studio", + "repo": "holochain-playground", + "rev": "d988519414a5ef306c4f08c2cba1a060ca529df4", "type": "github" }, "original": { - "owner": "nixos", - "ref": "24.05", - "repo": "nixpkgs", + "owner": "darksoil-studio", + "repo": "holochain-playground", "type": "github" } }, - "nixpkgs_3": { + "pnpmnixpkgs": { "locked": { - "lastModified": 1717179513, - "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "lastModified": 1727907660, + "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", "type": "github" }, "original": { "owner": "nixos", - "ref": "24.05", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_4": { + "pnpmnixpkgs_2": { "locked": { - "lastModified": 1717179513, - "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "lastModified": 1727264057, + "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "rev": "759537f06e6999e141588ff1c9be7f3a5c060106", "type": "github" }, "original": { "owner": "nixos", - "ref": "24.05", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_5": { + "pnpmnixpkgs_3": { "locked": { - "lastModified": 1717179513, - "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "lastModified": 1727264057, + "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "rev": "759537f06e6999e141588ff1c9be7f3a5c060106", "type": "github" }, "original": { "owner": "nixos", - "ref": "24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", - "owner": "NixOS", + "ref": "nixos-24.05", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" } }, - "pnpmnixpkgs": { + "pnpmnixpkgs_4": { "locked": { - "lastModified": 1727540905, - "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", + "lastModified": 1727907660, + "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fbca5e745367ae7632731639de5c21f29c8744ed", + "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", "type": "github" }, "original": { @@ -1135,7 +2501,7 @@ "type": "github" } }, - "pnpmnixpkgs_2": { + "pnpmnixpkgs_5": { "locked": { "lastModified": 1727264057, "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=", @@ -1175,14 +2541,16 @@ "profiles", "holonix", "nixpkgs" - ] + ], + "p2p-shipyard": "p2p-shipyard", + "playground": "playground" }, "locked": { - "lastModified": 1727357160, - "narHash": "sha256-4/7Ux6rILEFyfoWfohVF3unqClTs6BJRZefEkNUVjvI=", + "lastModified": 1729159398, + "narHash": "sha256-nuO7oqBoKT1XY20mDQJe9HCuPnyApXX/7EgrRzGxwLM=", "owner": "holochain-open-dev", "repo": "profiles", - "rev": "43e97c82887cc3eb91ef92c9ab01b93529693b68", + "rev": "3c854292c1d30247d05764b974ccb145350b144a", "type": "github" }, "original": { @@ -1238,9 +2606,34 @@ "type": "github" } }, - "rust-overlay_2": { + "rust-overlay_10": { + "inputs": { + "nixpkgs": [ + "profiles", + "playground", + "p2p-shipyard", + "holonix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1725243956, + "narHash": "sha256-0A5ZP8uDCyBdYUzayZfy6JFdTefP79oZVAjyqA/yuSI=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "a10c8092d5f82622be79ed4dd12289f72011f850", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_11": { "inputs": { "nixpkgs": [ + "scaffolding", "holonix", "nixpkgs" ] @@ -1259,6 +2652,50 @@ "type": "github" } }, + "rust-overlay_12": { + "inputs": { + "nixpkgs": [ + "scaffolding", + "scaffolding", + "holochain", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1723343015, + "narHash": "sha256-oS8Qhpo71B/6OOsuVBFJbems7RKD/5e3TN2AdXhwMjg=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "ed4fe9af3814694d59c572649e881a6aa6eba533", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "holonix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728268235, + "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "25685cc2c7054efc31351c172ae77b21814f2d42", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "rust-overlay_3": { "inputs": { "nixpkgs": [ @@ -1307,7 +2744,9 @@ "rust-overlay_5": { "inputs": { "nixpkgs": [ - "scaffolding", + "profiles", + "p2p-shipyard", + "hc-infra", "holonix", "nixpkgs" ] @@ -1329,18 +2768,90 @@ "rust-overlay_6": { "inputs": { "nixpkgs": [ - "scaffolding", - "scaffolding", - "holochain", + "profiles", + "p2p-shipyard", + "holonix", "nixpkgs" ] }, "locked": { - "lastModified": 1723343015, - "narHash": "sha256-oS8Qhpo71B/6OOsuVBFJbems7RKD/5e3TN2AdXhwMjg=", + "lastModified": 1725243956, + "narHash": "sha256-0A5ZP8uDCyBdYUzayZfy6JFdTefP79oZVAjyqA/yuSI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ed4fe9af3814694d59c572649e881a6aa6eba533", + "rev": "a10c8092d5f82622be79ed4dd12289f72011f850", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_7": { + "inputs": { + "nixpkgs": [ + "profiles", + "playground", + "hc-infra", + "holonix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1725243956, + "narHash": "sha256-0A5ZP8uDCyBdYUzayZfy6JFdTefP79oZVAjyqA/yuSI=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "a10c8092d5f82622be79ed4dd12289f72011f850", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_8": { + "inputs": { + "nixpkgs": [ + "profiles", + "playground", + "holonix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728268235, + "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "25685cc2c7054efc31351c172ae77b21814f2d42", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_9": { + "inputs": { + "nixpkgs": [ + "profiles", + "playground", + "p2p-shipyard", + "hc-infra", + "holonix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1725243956, + "narHash": "sha256-0A5ZP8uDCyBdYUzayZfy6JFdTefP79oZVAjyqA/yuSI=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "a10c8092d5f82622be79ed4dd12289f72011f850", "type": "github" }, "original": { @@ -1356,7 +2867,7 @@ "holonix", "flake-parts" ], - "holonix": "holonix_5", + "holonix": "holonix_11", "nixpkgs": [ "scaffolding", "holonix", @@ -1365,11 +2876,11 @@ "scaffolding": "scaffolding_2" }, "locked": { - "lastModified": 1727435197, - "narHash": "sha256-0bPb/drCzIqoN2PopDxyafpM2fszNr5qtyp1FpmTy4s=", + "lastModified": 1727783028, + "narHash": "sha256-AR2ag9FzLb4RekR/BcmT0lHQuDJ+RIFW1FQ6dOe9KfQ=", "owner": "holochain-open-dev", "repo": "templates", - "rev": "1eb9ca470d9c85b4e1dee65786147a5247a3c462", + "rev": "e36be7c0c66babd878d9571a6a66500a2c6407c6", "type": "github" }, "original": { @@ -1380,7 +2891,7 @@ }, "scaffolding_2": { "inputs": { - "holochain": "holochain_6", + "holochain": "holochain_12", "nixpkgs": [ "scaffolding", "scaffolding", @@ -1421,9 +2932,39 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "versions": { "inputs": { - "holochain": "holochain_7", + "holochain": "holochain_13", "lair": "lair", "launcher": "launcher", "scaffolding": "scaffolding_3" @@ -1443,6 +2984,38 @@ "repo": "holochain", "type": "github" } + }, + "webkitgtknixpkgs": { + "locked": { + "lastModified": 1716358718, + "narHash": "sha256-NQbegJb2ZZnAqp2EJhWwTf6DrZXSpA6xZCEq+RGV1r0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3f316d2a50699a78afe5e77ca486ad553169061e", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3f316d2a50699a78afe5e77ca486ad553169061e", + "type": "github" + } + }, + "webkitgtknixpkgs_2": { + "locked": { + "lastModified": 1716358718, + "narHash": "sha256-NQbegJb2ZZnAqp2EJhWwTf6DrZXSpA6xZCEq+RGV1r0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3f316d2a50699a78afe5e77ca486ad553169061e", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3f316d2a50699a78afe5e77ca486ad553169061e", + "type": "github" + } } }, "root": "root", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bcc0eb81..171f9d91 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -92,9 +92,12 @@ importers: tests: dependencies: + '@holochain-open-dev/profiles': + specifier: github:holochain-open-dev/profiles#3c854292c1d30247d05764b974ccb145350b144a&path:ui + version: https://codeload.github.com/holochain-open-dev/profiles/tar.gz/3c854292c1d30247d05764b974ccb145350b144a#path:ui(@types/react@18.3.10) '@holochain-open-dev/signals': - specifier: ^0.300.6 - version: 0.300.7(@types/react@18.3.10) + specifier: ^0.300.9 + version: 0.300.9(@types/react@18.3.10) '@holochain-open-dev/utils': specifier: ^0.300.3 version: 0.300.3 @@ -120,8 +123,8 @@ importers: specifier: ^0.300.1 version: 0.300.1(@types/react@18.3.10) '@holochain-open-dev/profiles': - specifier: github:holochain-open-dev/profiles#43e97c82887cc3eb91ef92c9ab01b93529693b68&path:ui - version: https://codeload.github.com/holochain-open-dev/profiles/tar.gz/43e97c82887cc3eb91ef92c9ab01b93529693b68#path:ui(@types/react@18.3.10) + specifier: github:holochain-open-dev/profiles#3c854292c1d30247d05764b974ccb145350b144a&path:ui + version: https://codeload.github.com/holochain-open-dev/profiles/tar.gz/3c854292c1d30247d05764b974ccb145350b144a#path:ui(@types/react@18.3.10) '@holochain-open-dev/signals': specifier: ^0.300.6 version: 0.300.7(@types/react@18.3.10) @@ -709,6 +712,10 @@ packages: '@holochain-open-dev/elements@0.300.1': resolution: {integrity: sha512-i0BYvrM+aKFlyiNQ02mkqTElLxQ4AFM0nBs4whXrb/p7XU/SQm0dApieEGMsTgtZu8cI/ZgmPzi6qQSduXXLPA==} + '@holochain-open-dev/profiles@https://codeload.github.com/holochain-open-dev/profiles/tar.gz/3c854292c1d30247d05764b974ccb145350b144a#path:ui': + resolution: {path: ui, tarball: https://codeload.github.com/holochain-open-dev/profiles/tar.gz/3c854292c1d30247d05764b974ccb145350b144a} + version: 0.300.0 + '@holochain-open-dev/profiles@https://codeload.github.com/holochain-open-dev/profiles/tar.gz/43e97c82887cc3eb91ef92c9ab01b93529693b68#path:ui': resolution: {path: ui, tarball: https://codeload.github.com/holochain-open-dev/profiles/tar.gz/43e97c82887cc3eb91ef92c9ab01b93529693b68} version: 0.300.0 @@ -716,6 +723,9 @@ packages: '@holochain-open-dev/signals@0.300.7': resolution: {integrity: sha512-3B2dGbGzNt7V6PvXTmKPfmxE4SFKrRm2qAU7hJVu3KhalKGEvBk8QiTevkveP6pHfUhEG+q4zhvE4cQrFJ/Ojg==} + '@holochain-open-dev/signals@0.300.9': + resolution: {integrity: sha512-ar8c6J5hPqCwZmxuF+ef7GZo4QGYrqLZ3PcNwGKxrcBAmtqoQpHl0Y6+3KFX5fqm9u6fqkj6P1OlMbn62/gjzA==} + '@holochain-open-dev/utils@0.300.3': resolution: {integrity: sha512-ckamdApCDWevnQNvggf+M/lOYCUGbKxoPajOkKy5kX/DbY5hIkFJot2lFvxTBpv5hYYGqWkZVbOldJ5DFdqD4w==} @@ -3555,6 +3565,23 @@ snapshots: - bufferutil - utf-8-validate + '@holochain-open-dev/profiles@https://codeload.github.com/holochain-open-dev/profiles/tar.gz/3c854292c1d30247d05764b974ccb145350b144a#path:ui(@types/react@18.3.10)': + dependencies: + '@holochain-open-dev/elements': 0.300.1(@types/react@18.3.10) + '@holochain-open-dev/signals': 0.300.9(@types/react@18.3.10) + '@holochain-open-dev/utils': 0.300.3 + '@holochain/client': 0.17.1 + '@lit/context': 1.1.2 + '@lit/localize': 0.12.2 + '@mdi/js': 7.4.47 + '@msgpack/msgpack': 2.8.0 + '@shoelace-style/shoelace': 2.17.1(@types/react@18.3.10) + lit: 3.2.0 + transitivePeerDependencies: + - '@types/react' + - bufferutil + - utf-8-validate + '@holochain-open-dev/profiles@https://codeload.github.com/holochain-open-dev/profiles/tar.gz/43e97c82887cc3eb91ef92c9ab01b93529693b68#path:ui(@types/react@18.3.10)': dependencies: '@holochain-open-dev/elements': 0.300.1(@types/react@18.3.10) @@ -3585,6 +3612,19 @@ snapshots: - bufferutil - utf-8-validate + '@holochain-open-dev/signals@0.300.9(@types/react@18.3.10)': + dependencies: + '@holochain-open-dev/utils': 0.300.3 + '@holochain/client': 0.17.1 + '@shoelace-style/shoelace': 2.17.1(@types/react@18.3.10) + async-signals: 0.1.11 + lit-signal-watcher: 0.1.1 + signal-polyfill: 0.1.2 + transitivePeerDependencies: + - '@types/react' + - bufferutil + - utf-8-validate + '@holochain-open-dev/utils@0.300.3': dependencies: '@holochain/client': 0.17.1 diff --git a/tests/package.json b/tests/package.json index 8d6035c6..74aa597c 100644 --- a/tests/package.json +++ b/tests/package.json @@ -8,8 +8,9 @@ "@msgpack/msgpack": "^2.7.0", "@holochain/client": "^0.17.1", "@holochain/tryorama": "^v0.16.0", - "@holochain-open-dev/signals": "^0.300.6", + "@holochain-open-dev/signals": "^0.300.9", "@holochain-open-dev/utils": "^0.300.3", + "@holochain-open-dev/profiles": "github:holochain-open-dev/profiles#3c854292c1d30247d05764b974ccb145350b144a&path:ui", "typescript": "^5.4.5", "vitest": "^1.4.0" }, diff --git a/tests/src/notification-lifecycle.test.ts b/tests/src/notification-lifecycle.test.ts index 337751a3..be6a202d 100644 --- a/tests/src/notification-lifecycle.test.ts +++ b/tests/src/notification-lifecycle.test.ts @@ -1,6 +1,6 @@ import { toPromise } from '@holochain-open-dev/signals'; import { EntryRecord } from '@holochain-open-dev/utils'; -import { dhtSync, runScenario } from '@holochain/tryorama'; +import { dhtSync, pause, runScenario } from '@holochain/tryorama'; import { assert, test } from 'vitest'; import { sampleNotification } from '../../ui/src/mocks.js'; @@ -11,6 +11,18 @@ test('create notifications, read it, and dismiss it', async () => { await runScenario(async scenario => { const { alice, bob } = await setup(scenario); + const aliceProfile = + await alice.store.client.profilesStore.client.createProfile({ + nickname: 'alice', + fields: {}, + }); + + const bobProfile = + await bob.store.client.profilesStore.client.createProfile({ + nickname: 'bob', + fields: {}, + }); + // Wait for the created entry to be propagated to the other node. await dhtSync([alice.player, bob.player], alice.player.cells[0].cell_id[0]); @@ -26,12 +38,12 @@ test('create notifications, read it, and dismiss it', async () => { // Alice creates a Notification await alice.store.client.createNotification( await sampleNotification(alice.store.client, { - recipients: [bob.player.agentPubKey], + recipients_profiles_hashes: [bobProfile.actionHash], }), ); await alice.store.client.createNotification( await sampleNotification(alice.store.client, { - recipients: [bob.player.agentPubKey], + recipients_profiles_hashes: [bobProfile.actionHash], }), ); @@ -92,6 +104,21 @@ test('create notifications and dismiss it directly', async () => { await runScenario(async scenario => { const { alice, bob } = await setup(scenario); + const aliceProfile = + await alice.store.client.profilesStore.client.createProfile({ + nickname: 'alice', + fields: {}, + }); + + const bobProfile = + await bob.store.client.profilesStore.client.createProfile({ + nickname: 'bob', + fields: {}, + }); + + // Wait for the created entry to be propagated to the other node. + await dhtSync([alice.player, bob.player], alice.player.cells[0].cell_id[0]); + let unreadNotifications = await toPromise(bob.store.unreadNotifications); assert.equal(unreadNotifications.size, 0); let readNotifications = await toPromise(bob.store.readNotifications); @@ -104,12 +131,12 @@ test('create notifications and dismiss it directly', async () => { // Alice creates a Notification await alice.store.client.createNotification( await sampleNotification(alice.store.client, { - recipients: [bob.player.agentPubKey], + recipients_profiles_hashes: [bobProfile.actionHash], }), ); await alice.store.client.createNotification( await sampleNotification(alice.store.client, { - recipients: [bob.player.agentPubKey], + recipients_profiles_hashes: [bobProfile.actionHash], }), ); diff --git a/tests/src/setup.ts b/tests/src/setup.ts index ab96f54f..c1a87069 100644 --- a/tests/src/setup.ts +++ b/tests/src/setup.ts @@ -1,3 +1,5 @@ +import { ProfilesClient, ProfilesStore } from '@holochain-open-dev/profiles'; +import { AppWebsocket } from '@holochain/client'; import { Scenario } from '@holochain/tryorama'; import { dirname } from 'path'; import { fileURLToPath } from 'url'; @@ -21,13 +23,27 @@ export async function setup(scenario: Scenario) { // Shortcut peer discovery through gossip and register all agents in every // conductor of the scenario. await scenario.shareAllAgents(); + await alice.conductor + .adminWs() + .authorizeSigningCredentials(alice.cells[0].cell_id); + patchCallZome(alice.appWs as AppWebsocket); + + await bob.conductor + .adminWs() + .authorizeSigningCredentials(bob.cells[0].cell_id); + patchCallZome(bob.appWs as AppWebsocket); const config: NotificationsConfig = { types: {}, }; + const aliceProfilesStore = new ProfilesStore( + new ProfilesClient(alice.appWs as any, 'notifications_test', 'profiles'), + ); + const aliceStore = new NotificationsStore( new NotificationsClient( + aliceProfilesStore, alice.appWs as any, 'notifications_test', 'notifications', @@ -35,8 +51,13 @@ export async function setup(scenario: Scenario) { config, ); + const bobProfilesStore = new ProfilesStore( + new ProfilesClient(bob.appWs as any, 'notifications_test', 'profiles'), + ); + const bobStore = new NotificationsStore( new NotificationsClient( + bobProfilesStore, bob.appWs as any, 'notifications_test', 'notifications', @@ -49,8 +70,8 @@ export async function setup(scenario: Scenario) { await scenario.shareAllAgents(); // Prevent race condition when two zome calls are made instantly at the beginning of the lifecycle that cause a ChainHeadMoved error because they trigger 2 parallel init workflows - await aliceStore.client.getUndismissedNotifications(); - await bobStore.client.getUndismissedNotifications(); + await aliceStore.client.profilesStore.client.getAllProfiles(); + await bobStore.client.profilesStore.client.getAllProfiles(); return { alice: { @@ -63,3 +84,20 @@ export async function setup(scenario: Scenario) { }, }; } +export function patchCallZome(appWs: AppWebsocket) { + const callZome = appWs.callZome; + + appWs.callZome = async req => { + try { + const result = await callZome(req); + return result; + } catch (e) { + if ( + !e.toString().includes('Socket is not open') && + !e.toString().includes('ClientClosedWithPendingRequests') + ) { + throw e; + } + } + }; +} diff --git a/ui/custom-elements.json b/ui/custom-elements.json index 5717ff52..93a9d7ac 100644 --- a/ui/custom-elements.json +++ b/ui/custom-elements.json @@ -140,7 +140,7 @@ { "kind": "field", "name": "readNotificationsByRecipient", - "default": "new HoloHashMap>()" + "default": "new HoloHashMap>()" }, { "kind": "method", @@ -237,9 +237,9 @@ }, "parameters": [ { - "name": "recipient", + "name": "recipient_prolife_hash", "type": { - "text": "AgentPubKey" + "text": "ActionHash" } } ] @@ -249,9 +249,9 @@ "name": "mark_notifications_as_read", "parameters": [ { - "name": "notifications", + "name": "input", "type": { - "text": "ActionHash[]" + "text": "{\n\t\tnotifications_hashes: ActionHash[];\n\t\tmy_profile_hash: ActionHash;\n\t}" } } ] @@ -261,9 +261,9 @@ "name": "dismiss_notifications", "parameters": [ { - "name": "notifications", + "name": "input", "type": { - "text": "ActionHash[]" + "text": "{\n\t\tnotifications_hashes: ActionHash[];\n\t\tmy_profile_hash: ActionHash;\n\t}" } } ] @@ -275,7 +275,15 @@ "type": { "text": "Promise>" } - } + }, + "parameters": [ + { + "name": "myProfileHash", + "type": { + "text": "ActionHash" + } + } + ] }, { "kind": "method", @@ -284,7 +292,15 @@ "type": { "text": "Promise>" } - } + }, + "parameters": [ + { + "name": "myProfileHash", + "type": { + "text": "ActionHash" + } + } + ] }, { "kind": "method", @@ -293,7 +309,15 @@ "type": { "text": "Promise>" } - } + }, + "parameters": [ + { + "name": "myProfileHash", + "type": { + "text": "ActionHash" + } + } + ] } ], "superclass": { @@ -398,6 +422,12 @@ } }, "parameters": [ + { + "name": "myProfileHash", + "type": { + "text": "ActionHash" + } + }, { "name": "notificationsHashes", "type": { @@ -415,6 +445,12 @@ } }, "parameters": [ + { + "name": "myProfileHash", + "type": { + "text": "ActionHash" + } + }, { "name": "notificationsHashes", "type": { @@ -447,7 +483,15 @@ "type": { "text": "Promise>" } - } + }, + "parameters": [ + { + "name": "myProfileHash", + "type": { + "text": "ActionHash" + } + } + ] }, { "kind": "method", @@ -456,7 +500,15 @@ "type": { "text": "Promise>" } - } + }, + "parameters": [ + { + "name": "myProfileHash", + "type": { + "text": "ActionHash" + } + } + ] }, { "kind": "method", @@ -465,7 +517,15 @@ "type": { "text": "Promise<\n\t\tArray<[SignedActionHashed, SignedActionHashed[]]>\n\t>" } - } + }, + "parameters": [ + { + "name": "myProfileHash", + "type": { + "text": "ActionHash" + } + } + ] } ], "superclass": { @@ -512,6 +572,11 @@ "default": "new LazyHoloHashMap((notificationHash: ActionHash) => ({\n\t\tentry: immutableEntrySignal(() =>\n\t\t\tthis.client.getNotification(notificationHash),\n\t\t),\n\t\tdeletes: deletesForEntrySignal(this.client, notificationHash, () =>\n\t\t\tthis.client.getAllDeletesForNotification(notificationHash),\n\t\t),\n\t}))", "description": "Notification" }, + { + "kind": "field", + "name": "myProfileExistsOrPending", + "privacy": "private" + }, { "kind": "field", "name": "undismissedNotificationsLinks", @@ -627,6 +692,12 @@ "kind": "method", "name": "renderNotificationGroup", "parameters": [ + { + "name": "myProfileHash", + "type": { + "text": "ActionHash" + } + }, { "name": "read", "type": { diff --git a/ui/package.json b/ui/package.json index ab392610..e57d2c24 100644 --- a/ui/package.json +++ b/ui/package.json @@ -30,7 +30,7 @@ }, "dependencies": { "@holochain-open-dev/elements": "^0.300.1", - "@holochain-open-dev/profiles": "github:holochain-open-dev/profiles#43e97c82887cc3eb91ef92c9ab01b93529693b68&path:ui", + "@holochain-open-dev/profiles": "github:holochain-open-dev/profiles#3c854292c1d30247d05764b974ccb145350b144a&path:ui", "@holochain-open-dev/signals": "^0.300.6", "@holochain-open-dev/utils": "^0.300.3", "@holochain/client": "^0.17.1", diff --git a/ui/src/elements/my-notifications-icon-button.ts b/ui/src/elements/my-notifications-icon-button.ts index 46cf40d6..73b7f236 100644 --- a/ui/src/elements/my-notifications-icon-button.ts +++ b/ui/src/elements/my-notifications-icon-button.ts @@ -1,5 +1,9 @@ import { sharedStyles, wrapPathInSvg } from '@holochain-open-dev/elements'; import '@holochain-open-dev/elements/dist/elements/display-error.js'; +import { + ProfilesStore, + profilesStoreContext, +} from '@holochain-open-dev/profiles'; import '@holochain-open-dev/profiles/dist/elements/agent-avatar.js'; import { SignalWatcher, joinAsync } from '@holochain-open-dev/signals'; import { consume } from '@lit/context'; @@ -31,10 +35,17 @@ export class MyNotificationsIconButton extends SignalWatcher(LitElement) { @consume({ context: notificationsStoreContext, subscribe: true }) notificationsStore!: NotificationsStore; + /** + * @internal + */ + @consume({ context: profilesStoreContext, subscribe: true }) + profilesStore!: ProfilesStore; + render() { const result = joinAsync([ this.notificationsStore.unreadNotifications.get(), this.notificationsStore.readNotifications.get(), + this.profilesStore.myProfile.get(), ]); switch (result.status) { @@ -60,6 +71,7 @@ export class MyNotificationsIconButton extends SignalWatcher(LitElement) { hoist @sl-hide=${() => this.notificationsStore.client.markNotificationsAsRead( + result.value[2]!.profileHash, Array.from(unreadNotifications.keys()), )} > diff --git a/ui/src/elements/my-notifications-list.ts b/ui/src/elements/my-notifications-list.ts index b1cf602a..bdb0b857 100644 --- a/ui/src/elements/my-notifications-list.ts +++ b/ui/src/elements/my-notifications-list.ts @@ -1,4 +1,8 @@ import { sharedStyles, wrapPathInSvg } from '@holochain-open-dev/elements'; +import { + ProfilesStore, + profilesStoreContext, +} from '@holochain-open-dev/profiles'; import { AsyncResult, SignalWatcher, @@ -52,8 +56,14 @@ export class MyNotifications extends SignalWatcher(LitElement) { */ @consume({ context: notificationsStoreContext, subscribe: true }) notificationsStore!: NotificationsStore; + /** + * @internal + */ + @consume({ context: profilesStoreContext, subscribe: true }) + profilesStore!: ProfilesStore; renderNotificationGroup( + myProfileHash: ActionHash, read: boolean, persistent: boolean, notificationGroup: NotificationGroup, @@ -120,6 +130,7 @@ export class MyNotifications extends SignalWatcher(LitElement) { id="dismiss-single-notification" @click=${(e: Event) => { this.notificationsStore.client.dismissNotifications( + myProfileHash, notificationGroup.notifications.map( n => n.record.actionHash, ), @@ -179,6 +190,7 @@ export class MyNotifications extends SignalWatcher(LitElement) { } getNotificationsGroups() { + const myProfile = this.profilesStore.myProfile.get(); const unreadNotifications = this.notificationsStore.unreadNotifications.get(); const readNotifications = this.notificationsStore.readNotifications.get(); @@ -287,9 +299,12 @@ export class MyNotifications extends SignalWatcher(LitElement) { readPersistent.sort((a, b) => b.timestamp - a.timestamp); readNonPersistent.sort((a, b) => b.timestamp - a.timestamp); + if (myProfile.status !== 'completed') return myProfile; + return { status: 'completed' as const, value: { + myProfileHash: myProfile.value!.profileHash, unreadPersistent, readPersistent, unreadNonPersistent, @@ -345,6 +360,7 @@ export class MyNotifications extends SignalWatcher(LitElement) { readPersistent, unreadNonPersistent, readNonPersistent, + myProfileHash, } = result.value; const nonPersistentNotificationsCount = @@ -359,6 +375,7 @@ export class MyNotifications extends SignalWatcher(LitElement) {
${unreadPersistent.map((n, i) => this.renderNotificationGroup( + myProfileHash, false, true, n, @@ -370,6 +387,7 @@ export class MyNotifications extends SignalWatcher(LitElement) { : html``} ${readPersistent.map((n, i) => this.renderNotificationGroup( + myProfileHash, true, true, n, @@ -390,6 +408,7 @@ export class MyNotifications extends SignalWatcher(LitElement) { variant="text" @click=${() => this.notificationsStore.client.dismissNotifications( + myProfileHash, [ ...Array.from([] as ActionHash[]).concat( ...unreadNonPersistent.map(group => @@ -421,6 +440,7 @@ export class MyNotifications extends SignalWatcher(LitElement) {
${unreadNonPersistent.map((n, i) => this.renderNotificationGroup( + myProfileHash, false, false, n, @@ -435,6 +455,7 @@ export class MyNotifications extends SignalWatcher(LitElement) { : html``} ${readNonPersistent.map((n, i) => this.renderNotificationGroup( + myProfileHash, true, false, n, diff --git a/ui/src/mocks.ts b/ui/src/mocks.ts index 80e61fc0..4fe65e37 100644 --- a/ui/src/mocks.ts +++ b/ui/src/mocks.ts @@ -52,7 +52,7 @@ export class NotificationsZomeMock extends ZomeMock implements AppClient { } >(); notificationsForRecipient = new HoloHashMap(); - readNotificationsByRecipient = new HoloHashMap>(); + readNotificationsByRecipient = new HoloHashMap>(); async create_notification(notification: Notification): Promise { const entryHash = hash(notification, HashType.ENTRY); @@ -67,7 +67,7 @@ export class NotificationsZomeMock extends ZomeMock implements AppClient { }); await Promise.all( - notification.recipients.map(async recipient => { + notification.recipients_profiles_hashes.map(async recipient => { const existingRecipients = this.notificationsForRecipient.get(recipient) || []; this.notificationsForRecipient.set(recipient, [ @@ -124,26 +124,29 @@ export class NotificationsZomeMock extends ZomeMock implements AppClient { } async get_notifications_for_recipient( - recipient: AgentPubKey, + recipient_prolife_hash: ActionHash, ): Promise> { - return this.notificationsForRecipient.get(recipient) || []; + return this.notificationsForRecipient.get(recipient_prolife_hash) || []; } - async mark_notifications_as_read(notifications: ActionHash[]) { + async mark_notifications_as_read(input: { + notifications_hashes: ActionHash[]; + my_profile_hash: ActionHash; + }) { const readNotifications = - this.readNotificationsByRecipient.get(this.myPubKey) || []; + this.readNotificationsByRecipient.get(input.my_profile_hash) || []; const link = { - base: this.myPubKey, - target: this.myPubKey, + base: input.my_profile_hash, + target: input.my_profile_hash, author: this.myPubKey, timestamp: Date.now() * 1000, zome_index: 0, link_type: 0, - tag: encode(notifications), + tag: encode(input.notifications_hashes), create_link_hash: await fakeActionHash(), }; - this.readNotificationsByRecipient.set(this.myPubKey, [ + this.readNotificationsByRecipient.set(input.my_profile_hash, [ ...readNotifications, link, ]); @@ -152,10 +155,10 @@ export class NotificationsZomeMock extends ZomeMock implements AppClient { action: { hashed: { content: await fakeCreateLinkAction( - retype(this.myPubKey, HashType.ENTRY), - this.myPubKey, + retype(input.my_profile_hash, HashType.ENTRY), + input.my_profile_hash, 1, - encode(notifications), + encode(input.notifications_hashes), ), hash: link.create_link_hash, }, @@ -164,24 +167,31 @@ export class NotificationsZomeMock extends ZomeMock implements AppClient { }); } - async dismiss_notifications(notifications: ActionHash[]) { + async dismiss_notifications(input: { + notifications_hashes: ActionHash[]; + my_profile_hash: ActionHash; + }) { + const notifications_hashes = input.notifications_hashes; const undismissedNotifications = - this.notificationsForRecipient.get(this.myPubKey) || []; + this.notificationsForRecipient.get(input.my_profile_hash) || []; const filteredNotifications = undismissedNotifications.filter( link => - !notifications.find( + !notifications_hashes.find( n => encodeHashToBase64(n) === encodeHashToBase64(link.target), ), ); const dismissedNotifications = undismissedNotifications.filter(link => - notifications.find( + notifications_hashes.find( n => encodeHashToBase64(n) === encodeHashToBase64(link.target), ), ); - this.notificationsForRecipient.set(this.myPubKey, filteredNotifications); + this.notificationsForRecipient.set( + input.my_profile_hash, + filteredNotifications, + ); for (const link of dismissedNotifications) { this.emitSignal({ type: 'LinkDeleted', @@ -206,16 +216,22 @@ export class NotificationsZomeMock extends ZomeMock implements AppClient { } } - async get_undismissed_notifications(): Promise> { - return this.notificationsForRecipient.get(this.myPubKey); + async get_undismissed_notifications( + myProfileHash: ActionHash, + ): Promise> { + return this.notificationsForRecipient.get(myProfileHash); } - async get_dismissed_notifications(): Promise> { + async get_dismissed_notifications( + myProfileHash: ActionHash, + ): Promise> { return []; } - async get_read_notifications(): Promise> { - return this.readNotificationsByRecipient.get(this.myPubKey) || []; + async get_read_notifications( + myProfileHash: ActionHash, + ): Promise> { + return this.readNotificationsByRecipient.get(myProfileHash) || []; } } @@ -228,7 +244,7 @@ export async function sampleNotification( notification_type: 'type1', notification_group: 'Your notifications', persistent: false, - recipients: [client.client.myPubKey], + recipients_profiles_hashes: [await fakeActionHash()], content: encode({ body: 'Hello world!', }), diff --git a/ui/src/notifications-client.ts b/ui/src/notifications-client.ts index 33c05fb1..86a826db 100644 --- a/ui/src/notifications-client.ts +++ b/ui/src/notifications-client.ts @@ -1,3 +1,5 @@ +import { ProfilesStore } from '@holochain-open-dev/profiles'; +import { toPromise } from '@holochain-open-dev/signals'; import { EntryRecord, ZomeClient } from '@holochain-open-dev/utils'; import { ActionHash, @@ -15,6 +17,7 @@ import { NotificationsSignal } from './types.js'; export class NotificationsClient extends ZomeClient { constructor( + public profilesStore: ProfilesStore, public client: AppClient, public roleName: string, public zomeName = 'notifications', @@ -37,12 +40,28 @@ export class NotificationsClient extends ZomeClient { return record ? new EntryRecord(record) : undefined; } - markNotificationsAsRead(notificationsHashes: ActionHash[]): Promise { - return this.callZome('mark_notifications_as_read', notificationsHashes); + private async myProfileHash() { + const myProfile = await toPromise(this.profilesStore.myProfile); + if (myProfile === undefined) throw new Error('Could not find my profile'); + return myProfile.profileHash; } - dismissNotifications(notificationsHashes: ActionHash[]): Promise { - return this.callZome('dismiss_notifications', notificationsHashes); + async markNotificationsAsRead( + notificationsHashes: ActionHash[], + ): Promise { + const myProfileHash = await this.myProfileHash(); + return this.callZome('mark_notifications_as_read', { + my_profile_hash: myProfileHash, + notifications_hashes: notificationsHashes, + }); + } + + async dismissNotifications(notificationsHashes: ActionHash[]): Promise { + const myProfileHash = await this.myProfileHash(); + return this.callZome('dismiss_notifications', { + my_profile_hash: myProfileHash, + notifications_hashes: notificationsHashes, + }); } getAllDeletesForNotification( @@ -55,16 +74,19 @@ export class NotificationsClient extends ZomeClient { } async getUndismissedNotifications(): Promise> { - return this.callZome('get_undismissed_notifications', undefined); + const myProfileHash = await this.myProfileHash(); + return this.callZome('get_undismissed_notifications', myProfileHash); } async getReadNotifications(): Promise> { - return this.callZome('get_read_notifications', undefined); + const myProfileHash = await this.myProfileHash(); + return this.callZome('get_read_notifications', myProfileHash); } async getDismissedNotifications(): Promise< Array<[SignedActionHashed, SignedActionHashed[]]> > { - return this.callZome('get_dismissed_notifications', undefined); + const myProfileHash = await this.myProfileHash(); + return this.callZome('get_dismissed_notifications', myProfileHash); } } diff --git a/ui/src/notifications-store.ts b/ui/src/notifications-store.ts index 1f386dd0..5dffc4df 100644 --- a/ui/src/notifications-store.ts +++ b/ui/src/notifications-store.ts @@ -1,10 +1,13 @@ +import { ProfilesStore } from '@holochain-open-dev/profiles'; import { AsyncComputed, + AsyncState, deletedLinksSignal, deletesForEntrySignal, immutableEntrySignal, joinAsyncMap, liveLinksSignal, + pipe, uniquify, } from '@holochain-open-dev/signals'; import { @@ -14,7 +17,7 @@ import { pickBy, slice, } from '@holochain-open-dev/utils'; -import { ActionHash, encodeHashToBase64 } from '@holochain/client'; +import { ActionHash, Link, encodeHashToBase64 } from '@holochain/client'; import { decode } from '@msgpack/msgpack'; import { NotificationsClient } from './notifications-client.js'; @@ -44,19 +47,37 @@ export class NotificationsStore { ), })); - private undismissedNotificationsLinks = liveLinksSignal( - this.client, - this.client.client.myPubKey, - () => this.client.getUndismissedNotifications(), - 'RecipientToNotifications', - 5000, + private myProfileExistsOrPending = pipe( + this.client.profilesStore.myProfile, + myProfile => + myProfile !== undefined + ? myProfile + : { + status: 'pending', + }, ); - private readNotificationsLinks = liveLinksSignal( - this.client, - this.client.client.myPubKey, - () => this.client.getReadNotifications(), - 'ReadNotifications', + private undismissedNotificationsLinks = pipe( + this.myProfileExistsOrPending, + myProfile => + liveLinksSignal( + this.client, + myProfile.profileHash, + () => this.client.getUndismissedNotifications(), + 'RecipientToNotifications', + 5000, + ), + ); + + private readNotificationsLinks = pipe( + this.myProfileExistsOrPending, + myProfile => + liveLinksSignal( + this.client, + myProfile.profileHash, + () => this.client.getReadNotifications(), + 'ReadNotifications', + ), ); readNotifications = new AsyncComputed(() => { @@ -145,11 +166,13 @@ export class NotificationsStore { }; }); - deletedNotificationsLinks = deletedLinksSignal( - this.client, - this.client.client.myPubKey, - () => this.client.getDismissedNotifications(), - 'RecipientToNotifications', + deletedNotificationsLinks = pipe(this.myProfileExistsOrPending, myProfile => + deletedLinksSignal( + this.client, + myProfile.profileHash, + () => this.client.getDismissedNotifications(), + 'RecipientToNotifications', + ), ); dismissedNotifications = new AsyncComputed(() => { diff --git a/ui/src/types.ts b/ui/src/types.ts index 6e6a6ae0..a855ee99 100644 --- a/ui/src/types.ts +++ b/ui/src/types.ts @@ -1,6 +1,6 @@ import { AsyncSignal } from '@holochain-open-dev/signals'; import { ActionCommittedSignal, EntryRecord } from '@holochain-open-dev/utils'; -import { AgentPubKey } from '@holochain/client'; +import { ActionHash } from '@holochain/client'; export type NotificationsSignal = ActionCommittedSignal; @@ -15,7 +15,7 @@ export interface Notification { persistent: boolean; - recipients: Array; + recipients_profiles_hashes: Array; content: Uint8Array; } @@ -28,7 +28,7 @@ export interface NotificationsConfig { enabled: boolean; sendEmail: ( notification: EntryRecord, - recipientPubKey: AgentPubKey, + recipientProfileHash: ActionHash, recipientEmailAddress: string, ) => Promise; }; diff --git a/zomes/coordinator/notifications/src/notification.rs b/zomes/coordinator/notifications/src/notification.rs index 53378fd2..cfa0cf1c 100644 --- a/zomes/coordinator/notifications/src/notification.rs +++ b/zomes/coordinator/notifications/src/notification.rs @@ -19,7 +19,7 @@ pub fn create_notification(notification: Notification) -> ExternResult<()> { pub fn create_notification_link(notification_hash: ActionHash) -> ExternResult<()> { let app_entry = get_entry_for_action(¬ification_hash)?; if let Some(EntryTypes::Notification(notification)) = app_entry { - for base in notification.recipients.clone() { + for base in notification.recipients_profiles_hashes.clone() { create_link_relaxed( base, notification_hash.clone(), @@ -47,8 +47,15 @@ pub fn get_notification(notification_hash: ActionHash) -> ExternResult); +#[derive(Serialize, Deserialize, Debug, SerializedBytes)] +pub struct MarkNotificationsAsReadInput { + my_profile_hash: ActionHash, + notifications_hashes: Vec, +} + #[hdk_extern] -pub fn mark_notifications_as_read(notifications_hashes: Vec) -> ExternResult<()> { +pub fn mark_notifications_as_read(input: MarkNotificationsAsReadInput) -> ExternResult<()> { + let notifications_hashes = input.notifications_hashes; let hash_size = 39; let max_hashes_per_link_tag = (MAX_TAG_SIZE / hash_size) - 1; @@ -64,8 +71,8 @@ pub fn mark_notifications_as_read(notifications_hashes: Vec) -> Exte })?; create_link_relaxed( - agent_info()?.agent_latest_pubkey, - agent_info()?.agent_latest_pubkey, + input.my_profile_hash.clone(), + input.my_profile_hash.clone(), LinkTypes::ReadNotifications, bytes.bytes().to_vec(), )?; @@ -74,18 +81,26 @@ pub fn mark_notifications_as_read(notifications_hashes: Vec) -> Exte Ok(()) } +#[derive(Serialize, Deserialize, Debug, SerializedBytes)] +pub struct DismissNotificationsInput { + my_profile_hash: ActionHash, + notifications_hashes: Vec, +} + #[hdk_extern] -pub fn dismiss_notifications(notifications_hashes: Vec) -> ExternResult<()> { +pub fn dismiss_notifications(input: DismissNotificationsInput) -> ExternResult<()> { + let notifications_hashes = input.notifications_hashes; for hash in notifications_hashes.iter() { - dismiss_notification(hash.clone())?; + dismiss_notification(input.my_profile_hash.clone(), hash.clone())?; } - let read_links = get_read_notifications(())?.into_iter(); + let read_links = get_read_notifications(input.my_profile_hash.clone())?.into_iter(); - let undismissed_notifications_hashes: HashSet = get_undismissed_notifications(())? - .into_iter() - .filter_map(|link| link.target.into_action_hash()) - .collect(); + let undismissed_notifications_hashes: HashSet = + get_undismissed_notifications(input.my_profile_hash)? + .into_iter() + .filter_map(|link| link.target.into_action_hash()) + .collect(); // Iterate over the read links for link in read_links { @@ -106,8 +121,11 @@ pub fn dismiss_notifications(notifications_hashes: Vec) -> ExternRes Ok(()) } -fn dismiss_notification(notification_hash: ActionHash) -> ExternResult<()> { - let links = get_undismissed_notifications(())?; +fn dismiss_notification( + my_profile_hash: ActionHash, + notification_hash: ActionHash, +) -> ExternResult<()> { + let links = get_undismissed_notifications(my_profile_hash)?; for link in links { if let Some(action_hash) = link.target.into_action_hash() { @@ -135,32 +153,24 @@ pub fn get_all_deletes_for_notification( } #[hdk_extern] -pub fn get_undismissed_notifications() -> ExternResult> { +pub fn get_undismissed_notifications(my_profile_hash: ActionHash) -> ExternResult> { get_links( - GetLinksInputBuilder::try_new( - agent_info()?.agent_latest_pubkey, - LinkTypes::RecipientToNotifications, - )? - .build(), + GetLinksInputBuilder::try_new(my_profile_hash, LinkTypes::RecipientToNotifications)? + .build(), ) } #[hdk_extern] -pub fn get_read_notifications() -> ExternResult> { - get_links( - GetLinksInputBuilder::try_new( - agent_info()?.agent_latest_pubkey, - LinkTypes::ReadNotifications, - )? - .build(), - ) +pub fn get_read_notifications(my_profile_hash: ActionHash) -> ExternResult> { + get_links(GetLinksInputBuilder::try_new(my_profile_hash, LinkTypes::ReadNotifications)?.build()) } #[hdk_extern] pub fn get_dismissed_notifications( + my_profile_hash: ActionHash, ) -> ExternResult)>> { let details = get_link_details( - agent_info()?.agent_latest_pubkey, + my_profile_hash, LinkTypes::RecipientToNotifications, None, GetOptions::default(), diff --git a/zomes/coordinator/notifications/src/notifications_settings.rs b/zomes/coordinator/notifications/src/notifications_settings.rs index 48fe58a6..a2664a4c 100644 --- a/zomes/coordinator/notifications/src/notifications_settings.rs +++ b/zomes/coordinator/notifications/src/notifications_settings.rs @@ -2,10 +2,17 @@ use hdk::prelude::*; use notifications_integrity::*; +#[derive(Serialize, Deserialize, Debug)] +pub struct SetNotificationsSettingsInput { + notifications_settings: NotificationsSettings, + my_profile_hash: ActionHash, +} + #[hdk_extern] -pub fn set_notifications_settings(settings: NotificationsSettings) -> ExternResult<()> { - let my_pub_key = agent_info()?.agent_latest_pubkey; - let links = get_notifications_settings_links_for_agent(my_pub_key.clone())?; +pub fn set_notifications_settings(input: SetNotificationsSettingsInput) -> ExternResult<()> { + let settings = input.notifications_settings; + + let links = get_notifications_settings_links_for_agent(input.my_profile_hash.clone())?; for link in links { delete_link(link.create_link_hash)?; @@ -14,24 +21,27 @@ pub fn set_notifications_settings(settings: NotificationsSettings) -> ExternResu let action_hash = create_entry(EntryTypes::NotificationsSettings(settings))?; create_link( - my_pub_key, + input.my_profile_hash, action_hash, - LinkTypes::AgentToNotificationsSettings, + LinkTypes::ProfileToNotificationsSettings, (), )?; Ok(()) } -pub fn get_notifications_settings_links_for_agent(agent: AgentPubKey) -> ExternResult> { +pub fn get_notifications_settings_links_for_agent( + profile_hash: ActionHash, +) -> ExternResult> { get_links( - GetLinksInputBuilder::try_new(agent, LinkTypes::AgentToNotificationsSettings)?.build(), + GetLinksInputBuilder::try_new(profile_hash, LinkTypes::ProfileToNotificationsSettings)? + .build(), ) } #[hdk_extern] -pub fn get_notifications_settings_for(agent: AgentPubKey) -> ExternResult> { - let links = get_notifications_settings_links_for_agent(agent)?; +pub fn get_notifications_settings_for(profile_hash: ActionHash) -> ExternResult> { + let links = get_notifications_settings_links_for_agent(profile_hash)?; let Some(link) = links.first() else { return Ok(None); // Agent hasn't created any notifiations settings yet diff --git a/zomes/integrity/notifications/Cargo.toml b/zomes/integrity/notifications/Cargo.toml index 689bd999..a3dd5231 100644 --- a/zomes/integrity/notifications/Cargo.toml +++ b/zomes/integrity/notifications/Cargo.toml @@ -11,3 +11,4 @@ name = "notifications_integrity" hdi = { workspace = true } serde = { workspace = true } +profiles_types = { git = "https://github.com/holochain-open-dev/profiles", branch = "nixify" } diff --git a/zomes/integrity/notifications/src/lib.rs b/zomes/integrity/notifications/src/lib.rs index fd23b4d7..eb457a6d 100644 --- a/zomes/integrity/notifications/src/lib.rs +++ b/zomes/integrity/notifications/src/lib.rs @@ -1,5 +1,7 @@ use hdi::prelude::*; +pub mod profiles; + pub mod notification; pub use notification::*; @@ -22,7 +24,7 @@ pub enum EntryTypes { pub enum LinkTypes { RecipientToNotifications, ReadNotifications, - AgentToNotificationsSettings, + ProfileToNotificationsSettings, } #[hdk_extern] pub fn genesis_self_check(_data: GenesisSelfCheckData) -> ExternResult { @@ -34,6 +36,17 @@ pub fn validate_agent_joining( ) -> ExternResult { Ok(ValidateCallbackResult::Valid) } +pub fn action_hash(op: &Op) -> &ActionHash { + match op { + Op::StoreRecord(StoreRecord { record }) => record.action_address(), + Op::StoreEntry(StoreEntry { action, .. }) => &action.hashed.hash, + Op::RegisterUpdate(RegisterUpdate { update, .. }) => &update.hashed.hash, + Op::RegisterDelete(RegisterDelete { delete, .. }) => &delete.hashed.hash, + Op::RegisterAgentActivity(RegisterAgentActivity { action, .. }) => &action.hashed.hash, + Op::RegisterCreateLink(RegisterCreateLink { create_link }) => &create_link.hashed.hash, + Op::RegisterDeleteLink(RegisterDeleteLink { delete_link, .. }) => &delete_link.hashed.hash, + } +} #[hdk_extern] pub fn validate(op: Op) -> ExternResult { match op.flattened::()? { @@ -137,11 +150,16 @@ pub fn validate(op: Op) -> ExternResult { target_address, tag, ), - LinkTypes::ReadNotifications => { - validate_create_link_read_notifications(action, base_address, target_address, tag) - } - LinkTypes::AgentToNotificationsSettings => { - validate_create_link_agent_to_notifications_settings( + LinkTypes::ReadNotifications => validate_create_link_read_notifications( + action_hash(&op).clone(), + action, + base_address, + target_address, + tag, + ), + LinkTypes::ProfileToNotificationsSettings => { + validate_create_link_profile_to_notifications_settings( + action_hash(&op).clone(), action, base_address, target_address, @@ -165,14 +183,16 @@ pub fn validate(op: Op) -> ExternResult { tag, ), LinkTypes::ReadNotifications => validate_delete_link_read_notifications( + action_hash(&op).clone(), action, original_action, base_address, target_address, tag, ), - LinkTypes::AgentToNotificationsSettings => { - validate_delete_link_agent_to_notifications_settings( + LinkTypes::ProfileToNotificationsSettings => { + validate_delete_link_profile_to_notifications_settings( + action_hash(&op).clone(), action, original_action, base_address, @@ -286,13 +306,15 @@ pub fn validate(op: Op) -> ExternResult { ) } LinkTypes::ReadNotifications => validate_create_link_read_notifications( + action_hash(&op).clone(), action, base_address, target_address, tag, ), - LinkTypes::AgentToNotificationsSettings => { - validate_create_link_agent_to_notifications_settings( + LinkTypes::ProfileToNotificationsSettings => { + validate_create_link_profile_to_notifications_settings( + action_hash(&op).clone(), action, base_address, target_address, @@ -332,14 +354,16 @@ pub fn validate(op: Op) -> ExternResult { ) } LinkTypes::ReadNotifications => validate_delete_link_read_notifications( + action_hash(&op).clone(), action, create_link.clone(), base_address, create_link.target_address, create_link.tag, ), - LinkTypes::AgentToNotificationsSettings => { - validate_delete_link_agent_to_notifications_settings( + LinkTypes::ProfileToNotificationsSettings => { + validate_delete_link_profile_to_notifications_settings( + action_hash(&op).clone(), action, create_link.clone(), base_address, diff --git a/zomes/integrity/notifications/src/notification.rs b/zomes/integrity/notifications/src/notification.rs index 049b1b47..efeca35f 100644 --- a/zomes/integrity/notifications/src/notification.rs +++ b/zomes/integrity/notifications/src/notification.rs @@ -5,7 +5,7 @@ pub struct Notification { pub notification_type: String, pub notification_group: String, pub persistent: bool, - pub recipients: Vec, + pub recipients_profiles_hashes: Vec, pub content: SerializedBytes, } pub fn validate_create_notification( @@ -27,7 +27,7 @@ pub fn validate_delete_notification(_action: Delete) -> ExternResult ExternResult { @@ -39,14 +39,30 @@ pub fn validate_create_link_recipient_to_notifications( "No action hash associated with link".to_string() )))?; let record = must_get_valid_record(action_hash)?; - let _notification: crate::Notification = record + let notification: crate::Notification = record .entry() .to_app_option() .map_err(|e| wasm_error!(e))? .ok_or(wasm_error!(WasmErrorInner::Guest( "Linked action must reference an entry".to_string() )))?; - // TODO: add the appropriate validation rules + + let profile_hash = + base_address + .into_action_hash() + .ok_or(wasm_error!(WasmErrorInner::Guest( + "No action hash associated with link".to_string() + )))?; + + if !notification + .recipients_profiles_hashes + .contains(&profile_hash) + { + return Ok(ValidateCallbackResult::Invalid(format!( + "The base profile hash is not included in the recipients_profiles_hashes" + ))); + } + Ok(ValidateCallbackResult::Valid) } pub fn validate_delete_link_recipient_to_notifications( diff --git a/zomes/integrity/notifications/src/notifications_settings.rs b/zomes/integrity/notifications/src/notifications_settings.rs index b12dc09c..633d1d00 100644 --- a/zomes/integrity/notifications/src/notifications_settings.rs +++ b/zomes/integrity/notifications/src/notifications_settings.rs @@ -1,6 +1,9 @@ use std::collections::HashMap; use hdi::prelude::*; +use profiles_types::validate_profile_for_agent; + +use crate::profiles::profiles_zome_name; #[derive(Serialize, Clone, Deserialize, Debug)] #[serde(tag = "type")] @@ -40,20 +43,21 @@ pub fn validate_delete_notifications_settings( "NotificationsSettings cannot be deleted", ))) } -pub fn validate_create_link_agent_to_notifications_settings( - _action: CreateLink, - _base_address: AnyLinkableHash, +pub fn validate_create_link_profile_to_notifications_settings( + action_hash: ActionHash, + action: CreateLink, + base_address: AnyLinkableHash, target_address: AnyLinkableHash, _tag: LinkTag, ) -> ExternResult { // Check the entry type for the given action hash - let action_hash = + let target_action_hash = target_address .into_action_hash() .ok_or(wasm_error!(WasmErrorInner::Guest( "No action hash associated with link".to_string() )))?; - let record = must_get_valid_record(action_hash)?; + let record = must_get_valid_record(target_action_hash)?; let _notification: crate::NotificationsSettings = record .entry() .to_app_option() @@ -61,16 +65,56 @@ pub fn validate_create_link_agent_to_notifications_settings( .ok_or(wasm_error!(WasmErrorInner::Guest( "Linked action must reference an entry".to_string() )))?; - // TODO: add the appropriate validation rules + + let profile_hash = + base_address + .into_action_hash() + .ok_or(wasm_error!(WasmErrorInner::Guest( + "No action hash associated with link".to_string() + )))?; + + let result = validate_profile_for_agent( + action.author, + action_hash, + profile_hash, + &profiles_zome_name(), + )?; + + let ValidateCallbackResult::Valid = result else { + return Ok(ValidateCallbackResult::Invalid(String::from( + "Only agents with the same associated profile can mark their notifications as read.", + ))); + }; + Ok(ValidateCallbackResult::Valid) } -pub fn validate_delete_link_agent_to_notifications_settings( - _action: DeleteLink, +pub fn validate_delete_link_profile_to_notifications_settings( + action_hash: ActionHash, + action: DeleteLink, _original_action: CreateLink, - _base: AnyLinkableHash, + base_address: AnyLinkableHash, _target: AnyLinkableHash, _tag: LinkTag, ) -> ExternResult { - // TODO: add the appropriate validation rules + let profile_hash = + base_address + .into_action_hash() + .ok_or(wasm_error!(WasmErrorInner::Guest( + "No action hash associated with link".to_string() + )))?; + + let result = validate_profile_for_agent( + action.author, + action_hash, + profile_hash, + &profiles_zome_name(), + )?; + + let ValidateCallbackResult::Valid = result else { + return Ok(ValidateCallbackResult::Invalid(String::from( + "Only agents with the same associated profile can mark their notifications as read.", + ))); + }; + Ok(ValidateCallbackResult::Valid) } diff --git a/zomes/integrity/notifications/src/profiles.rs b/zomes/integrity/notifications/src/profiles.rs new file mode 100644 index 00000000..e39fa2a3 --- /dev/null +++ b/zomes/integrity/notifications/src/profiles.rs @@ -0,0 +1,8 @@ +use hdi::prelude::*; + +pub fn profiles_zome_name() -> ZomeName { + match std::option_env!("PROFILES_INTEGRITY_ZOME_NAME") { + Some(zome_name) => zome_name.into(), + None => ZomeName::from("profiles_integrity"), + } +} diff --git a/zomes/integrity/notifications/src/read_notifications.rs b/zomes/integrity/notifications/src/read_notifications.rs index a8a95699..273fb82a 100644 --- a/zomes/integrity/notifications/src/read_notifications.rs +++ b/zomes/integrity/notifications/src/read_notifications.rs @@ -1,51 +1,77 @@ use hdi::prelude::*; +use profiles_types::validate_profile_for_agent; + +use crate::profiles::profiles_zome_name; pub fn validate_create_link_read_notifications( + action_hash: ActionHash, action: CreateLink, base_address: AnyLinkableHash, target_address: AnyLinkableHash, _tag: LinkTag, ) -> ExternResult { // Check the entry type for the given action hash - let base_agent = + let base_profile_hash = base_address - .into_agent_pub_key() + .into_action_hash() .ok_or(wasm_error!(WasmErrorInner::Guest( - "Base of a ReadNotifications link must be an agent".to_string() + "Base of a ReadNotifications link must be a profile ActionHash".to_string() )))?; - let target_agent = + let target_profile_hash = target_address - .into_agent_pub_key() + .into_action_hash() .ok_or(wasm_error!(WasmErrorInner::Guest( - "Target of a ReadNotifications link must be an agent".to_string() + "Target of a ReadNotifications link must be a profile ActionHash".to_string() )))?; - if !base_agent.eq(&target_agent) { + if !target_profile_hash.eq(&base_profile_hash) { return Ok(ValidateCallbackResult::Invalid(String::from( "Base and target must be the same for a ReadNotifications link.", ))); } - if !base_agent.eq(&action.author) { + let result = validate_profile_for_agent( + action.author, + action_hash, + base_profile_hash, + &profiles_zome_name(), + )?; + + let ValidateCallbackResult::Valid = result else { return Ok(ValidateCallbackResult::Invalid(String::from( - "Only a given agent can mark their own notifications as read.", + "Only agents with the same associated profile can mark their notifications as read.", ))); - } + }; Ok(ValidateCallbackResult::Valid) } pub fn validate_delete_link_read_notifications( + action_hash: ActionHash, action: DeleteLink, original_action: CreateLink, _base: AnyLinkableHash, _target: AnyLinkableHash, _tag: LinkTag, ) -> ExternResult { - if !action.author.eq(&original_action.author) { + // Check the entry type for the given action hash + let profile_hash = original_action + .base_address + .into_action_hash() + .ok_or(wasm_error!(WasmErrorInner::Guest( + "Base of a ReadNotifications link must be a profile ActionHash".to_string() + )))?; + + let result = validate_profile_for_agent( + action.author, + action_hash, + profile_hash, + &profiles_zome_name(), + )?; + let ValidateCallbackResult::Valid = result else { return Ok(ValidateCallbackResult::Invalid(String::from( - "Only a given agent can delete their own ReadNotifications links.", + "Only the agents with the same associated profile can mark their notifications as read.", ))); - } + }; Ok(ValidateCallbackResult::Valid) }