diff --git a/.github/workflows/flake_update.yaml b/.github/workflows/flake_update.yaml index a4ba67a..034e4af 100644 --- a/.github/workflows/flake_update.yaml +++ b/.github/workflows/flake_update.yaml @@ -13,9 +13,9 @@ jobs: - uses: actions/checkout@v4 - name: Install nix - uses: cachix/install-nix-action@v25 + uses: cachix/install-nix-action@v27 with: - install_url: https://releases.nixos.org/nix/nix-2.20.4/install + install_url: https://releases.nixos.org/nix/nix-2.23.3/install - name: Flake update run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5a56dd2..e82b897 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,9 +33,9 @@ jobs: remove-docker-images: "true" - name: Install nix - uses: cachix/install-nix-action@v25 + uses: cachix/install-nix-action@v27 with: - install_url: https://releases.nixos.org/nix/nix-2.20.4/install + install_url: https://releases.nixos.org/nix/nix-2.23.3/install - name: Set up cachix uses: cachix/cachix-action@v14 diff --git a/CHANGELOG.md b/CHANGELOG.md index d62b793..d08b3ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## \[Unreleased\] ### Added +- New value `NotStartedAfterProvidingMemproofs` for type `DisabledAppReason` which effectively allows a new app status, corresponding to the specific state where a UI has just called AppRequest::ProvideMemproofs, but the app has not yet been enabled for the first time. +- New `AppWebsocket` call `EnableAfterMemproofsProvided`, which allows enabling an app only if the app is in the `AppStatus::Disabled(DisabledAppReason::NotStartedAfterProvidingMemproofs)` state. Attempting to enable the app from other states (other than Running) will fail. +- New field `lineage` to the DNA manifest, which declares forward compatibility for any hash in that list with this DNA. +- New `AdminWebsocket` call `GetCompatibleCells`, which returns `CellId` for all installed cells which use a DNA that is forward-compatible with a given DNA hash. This can be used to find a compatible cell for use with the UseExisting cell provisioning method. ### Changed ### Fixed ### Removed diff --git a/Cargo.lock b/Cargo.lock index b842468..3a11097 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -282,9 +282,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ "async-task", "concurrent-queue", @@ -398,7 +398,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -476,13 +476,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -735,9 +735,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" dependencies = [ "serde", ] @@ -812,13 +812,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.104" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" +checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052" dependencies = [ "jobserver", "libc", - "once_cell", ] [[package]] @@ -881,9 +880,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.8" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" +checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" dependencies = [ "clap_builder", "clap_derive", @@ -891,9 +890,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.8" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" +checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" dependencies = [ "anstream", "anstyle", @@ -911,7 +910,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -1246,7 +1245,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -1261,12 +1260,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.9", - "darling_macro 0.20.9", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -1285,16 +1284,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -1310,13 +1309,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.9", + "darling_core 0.20.10", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -1348,6 +1347,20 @@ dependencies = [ "parking_lot_core 0.9.10", ] +[[package]] +name = "dashmap" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core 0.9.10", +] + [[package]] name = "data-encoding" version = "2.6.0" @@ -1356,9 +1369,9 @@ checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "deflate64" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83ace6c86376be0b6cdcf3fb41882e81d94b31587573d1cfa9d01cd06bba210d" +checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" [[package]] name = "der" @@ -1399,7 +1412,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -1438,10 +1451,10 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ - "darling 0.20.9", + "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -1461,7 +1474,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core 0.20.0", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -1474,7 +1487,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -1529,7 +1542,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -1544,9 +1557,9 @@ dependencies = [ [[package]] name = "document-features" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" dependencies = [ "litrs", ] @@ -1644,18 +1657,28 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" dependencies = [ - "darling 0.20.9", + "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", ] [[package]] name = "env_logger" -version = "0.10.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ + "env_filter", "log", ] @@ -1978,7 +2001,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -2252,7 +2275,7 @@ checksum = "3a95a4a8a02468f63e725a3881594a6720933f4e620087e5c2e34681d14cef05" dependencies = [ "r2d2", "rusqlite", - "uuid 1.9.1", + "uuid 1.10.0", ] [[package]] @@ -2272,9 +2295,9 @@ dependencies = [ [[package]] name = "hc_sleuth" -version = "0.4.0-dev.11" +version = "0.4.0-dev.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efb77b9b731033bdda265575129edacce63f16c8f48bd4c72e7d00c7c66cdf6" +checksum = "0337881e0e595f327105cd4a7571e2f08799fee7275d68f2cd67e90c79747eb3" dependencies = [ "aitia", "anyhow", @@ -2295,9 +2318,9 @@ dependencies = [ [[package]] name = "hdi" -version = "0.5.0-dev.8" +version = "0.5.0-dev.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cda38da483998a1c52bae72763db47d12bfc8704ac22732969a106555d1878d" +checksum = "496fab25a7da57d4473ec3afd676c097fa6b1e579e7f97cf7ccfe409b391f079" dependencies = [ "getrandom 0.2.15", "hdk_derive", @@ -2313,9 +2336,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.4.0-dev.9" +version = "0.4.0-dev.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1da08d3cd82147cc35ce3942124ce8472291e69d41391a2f02956d91a3ac26" +checksum = "4c64cad926b27bbf72c447f8f8e3b53946458c0987a5b09f40d894aaa2bb143b" dependencies = [ "getrandom 0.2.15", "hdi", @@ -2333,9 +2356,9 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.4.0-dev.8" +version = "0.4.0-dev.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d220b05422a60bb6243ba0947328a98f11674f70840d00f99110301f83778d" +checksum = "ec8a4f51a32c79ec338daaec277c46ecb51f6b5f65517894c43cb012c6864efe" dependencies = [ "darling 0.14.4", "heck 0.5.0", @@ -2436,9 +2459,9 @@ dependencies = [ [[package]] name = "holo_hash" -version = "0.4.0-dev.7" +version = "0.4.0-dev.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82bdcf579b92545f0513f1ebf720e93c64585fd42baa43b1b560b6ab7b2d9249" +checksum = "4be7094460e2cbf0f2092fb7158ca5c0aeaa6e225fdcf417f091bb994dc8c919" dependencies = [ "arbitrary", "base64 0.22.1", @@ -2462,9 +2485,9 @@ dependencies = [ [[package]] name = "holochain" -version = "0.4.0-dev.11" +version = "0.4.0-dev.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0078c013b6d7ac4b91551aa80d6140c3da33ee6eb3cbd4b9cf3271edcb29e1" +checksum = "5984d6480554d9bd14ae5e3c48fc7ee2852d84d962eca79b1aa94d3881e6823c" dependencies = [ "aitia", "anyhow", @@ -2555,16 +2578,16 @@ dependencies = [ "unwrap_to", "url", "url2", - "uuid 1.9.1", + "uuid 1.10.0", "wasmer", "wasmer-middlewares", ] [[package]] name = "holochain_cascade" -version = "0.4.0-dev.11" +version = "0.4.0-dev.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd05f5c11f4c3f302d19184d4bd53738999ae303b9c3cb741104d619af7a9f4" +checksum = "4e828231e90df7e732d902eef0bc9accf39e086ddb29e652f623aef8e48b8a6c" dependencies = [ "async-trait", "fixt", @@ -2615,9 +2638,9 @@ dependencies = [ [[package]] name = "holochain_conductor_api" -version = "0.4.0-dev.11" +version = "0.4.0-dev.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79751caf273d2ae13e74c00339023957af6c6e99c2845838d657cc68f95923d7" +checksum = "7dd3aabbd5bc3b2161136016c1572547f665d18f612180a98e24ae7ab5e9f207" dependencies = [ "derive_more", "holo_hash", @@ -2638,9 +2661,9 @@ dependencies = [ [[package]] name = "holochain_conductor_services" -version = "0.3.0-dev.11" +version = "0.3.0-dev.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a700a5bfeae61f9f3ac00067a29000f20647d50c1fc45135c00c58d1c207f51" +checksum = "afbc233d3a4b5a8b5029e358edbd73d79a324ae6832b419f279ea9817d605bae" dependencies = [ "anyhow", "async-trait", @@ -2654,9 +2677,9 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.4.0-dev.8" +version = "0.4.0-dev.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3249f0f72d07b9ae58a2583b1d531d39382b89ca69291d074db79a429727fe75" +checksum = "048f0ba891006a949a244543954977612b17a0acd7efbeac1914d0e7a119cf8b" dependencies = [ "arbitrary", "derive_builder 0.20.0", @@ -2676,9 +2699,9 @@ dependencies = [ [[package]] name = "holochain_keystore" -version = "0.4.0-dev.11" +version = "0.4.0-dev.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e304d9c1f731288cc7088a2acc159dbd0dac683ac6dd8575a53a0e26e3f5a7d9" +checksum = "50203763524fc888d73b449f657fb4c403eaf9e0653029d912e095ecd184ac2a" dependencies = [ "base64 0.22.1", "derive_more", @@ -2705,9 +2728,9 @@ dependencies = [ [[package]] name = "holochain_metrics" -version = "0.4.0-dev.3" +version = "0.4.0-dev.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f02248cbe1e64d17239366a37e2f3c32a4382b84101d9dd7f9e0bb1dc9789a2c" +checksum = "97f1e76a5cc221de42f55e068689874e0691f7f36ade21d4a5c7820ba3b3dc60" dependencies = [ "influxive", "opentelemetry_api", @@ -2727,9 +2750,9 @@ dependencies = [ [[package]] name = "holochain_p2p" -version = "0.4.0-dev.11" +version = "0.4.0-dev.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111c4b693a02b40eef8bf3c272f92c4b48641fe63292bc1ff2fa15b75d7157c2" +checksum = "9410a660f06728332b6466282408d86293b3c9139a70d387acfac87a93880e07" dependencies = [ "aitia", "async-trait", @@ -2798,9 +2821,9 @@ dependencies = [ [[package]] name = "holochain_sqlite" -version = "0.4.0-dev.11" +version = "0.4.0-dev.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b13b1d64248de2657ef90dcc579ce5c1984e21123d40b8d9b42fb907315cec" +checksum = "451cef8386abbb3b33324bb97988d2722c6cab7d75de977ca4839f6633d14043" dependencies = [ "anyhow", "async-trait", @@ -2841,9 +2864,9 @@ dependencies = [ [[package]] name = "holochain_state" -version = "0.4.0-dev.11" +version = "0.4.0-dev.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a14be2ef843b65bd18d857b0ab9ed721ae544a263b83cd90e0173c227ed32683" +checksum = "a3569950589cded14de212760bd6489b73343012e4d5ac22a723f6a62fa263eb" dependencies = [ "aitia", "async-recursion", @@ -2877,9 +2900,9 @@ dependencies = [ [[package]] name = "holochain_state_types" -version = "0.4.0-dev.8" +version = "0.4.0-dev.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9a871e799e74b5ef1679a32375039f47cbb67e359fc9641fd659da5823878a" +checksum = "426e26174cbd8a48c17bb16b99537e13df4eb735f7acdb91c96a7ef0cb41293a" dependencies = [ "holo_hash", "holochain_integrity_types", @@ -2888,9 +2911,9 @@ dependencies = [ [[package]] name = "holochain_test_wasm_common" -version = "0.4.0-dev.9" +version = "0.4.0-dev.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a50aed107f946cc0ecba08371dfc5963083aeac36d2bb350246be496e361e50" +checksum = "681d815fc5028bca1805ca361436be4006d65602a15991a525a8a31c01020909" dependencies = [ "hdk", "serde", @@ -2916,9 +2939,9 @@ dependencies = [ [[package]] name = "holochain_types" -version = "0.4.0-dev.11" +version = "0.4.0-dev.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "868daeab948d21f2bf979491ab2839d38af87ca2f9780ff945c640173abf24fd" +checksum = "dac8dd94259b1a620a895e78f454b346f2eeadb09628dab3b8eb59e9241791c2" dependencies = [ "anyhow", "arbitrary", @@ -2970,9 +2993,9 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.4.0-dev.1" +version = "0.4.0-dev.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9e2622406b6150319518901f1d4ecbb58a3f16ec097cba3ac898a18ff7900c1" +checksum = "79b89c3542e1fe783d9505d14a83497abadcf84d5d87e73fe1dbff3ac21cfce8" dependencies = [ "backtrace", "cfg-if 1.0.0", @@ -2988,9 +3011,9 @@ dependencies = [ [[package]] name = "holochain_wasm_test_utils" -version = "0.4.0-dev.11" +version = "0.4.0-dev.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade0c38336680a8639a9fe4391084bc76ea2bf8bae376be11d30b004deab5a6c" +checksum = "d6e3fc495faf5d2ab0d7e8671c8c8d7d70b65cae175437758fc2513993378def" dependencies = [ "holochain_types", "holochain_util", @@ -3049,9 +3072,9 @@ dependencies = [ [[package]] name = "holochain_websocket" -version = "0.4.0-dev.11" +version = "0.4.0-dev.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dedab66701398f8354dcba051ca05eecdffa76d80863938042899799ea29baf" +checksum = "3b97be832d7e3d99bc16c925fa14865d45ae3c9cc0027db3b1b3e3ed73e76d7d" dependencies = [ "async-trait", "futures", @@ -3066,9 +3089,9 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.4.0-dev.9" +version = "0.4.0-dev.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b030ef01ef923c284f1a57638c8a44adbb60f39c75dc424988c6a890cda198" +checksum = "c9338e9b985d6af6e788aa0036040dc98996ddbc7156a9240dc31d87adf81a9a" dependencies = [ "arbitrary", "contrafact", @@ -3167,9 +3190,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http 1.1.0", @@ -3184,7 +3207,7 @@ dependencies = [ "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "pin-project-lite", ] @@ -3213,14 +3236,14 @@ dependencies = [ "serde", "serde_derive", "toml 0.8.14", - "uuid 1.9.1", + "uuid 1.10.0", ] [[package]] name = "hyper" -version = "0.14.29" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -3242,16 +3265,16 @@ dependencies = [ [[package]] name = "hyper" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4fe55fb7a772d59a5ff1dfbff4fe0258d19b89fec4b233e75d35d5d2316badc" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", "futures-util", "h2 0.4.5", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "httparse", "itoa", "pin-project-lite", @@ -3268,7 +3291,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper 0.14.29", + "hyper 0.14.30", "rustls 0.21.12", "tokio", "tokio-rustls 0.24.1", @@ -3282,9 +3305,9 @@ checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.4.0", + "hyper 1.4.1", "hyper-util", - "rustls 0.23.10", + "rustls 0.23.11", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -3299,7 +3322,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.4.0", + "hyper 1.4.1", "hyper-util", "native-tls", "tokio", @@ -3317,8 +3340,8 @@ dependencies = [ "futures-channel", "futures-util", "http 1.1.0", - "http-body 1.0.0", - "hyper 1.4.0", + "http-body 1.0.1", + "hyper 1.4.1", "pin-project-lite", "socket2 0.5.7", "tokio", @@ -3416,15 +3439,15 @@ dependencies = [ [[package]] name = "inferno" -version = "0.11.19" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9" +checksum = "7c77a3ae7d4761b9c64d2c030f70746ceb8cfba32dce0325a56792e0a4816c31" dependencies = [ "ahash 0.8.11", - "clap 4.5.8", + "clap 4.5.9", "crossbeam-channel", "crossbeam-utils", - "dashmap 5.5.3", + "dashmap 6.0.1", "env_logger", "indexmap 2.2.6", "is-terminal", @@ -3690,9 +3713,9 @@ dependencies = [ [[package]] name = "kitsune_p2p" -version = "0.4.0-dev.10" +version = "0.4.0-dev.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aca5e4e460b2ee83f63f120a393ae62b15c0200383eb01ab47983a9d496cd5b1" +checksum = "d648a85179ac1fb08c6addd03d777b20846022657d4a35e895fef442910b5b4b" dependencies = [ "arrayref", "base64 0.22.1", @@ -3736,9 +3759,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.4.0-dev.7" +version = "0.4.0-dev.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c230415427f4b8893f1a4a3a8837fcd0e2768a349984d56f41fb86dc566220f7" +checksum = "df3f80a3c52eef16808c654490e65d3403b7d2c958ab886e0bc1c74dfb1fb488" dependencies = [ "arbitrary", "base64 0.22.1", @@ -3755,9 +3778,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.4.0-dev.7" +version = "0.4.0-dev.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "033a2be2e25fdf5d1d4f83c35df185f060d8a4f4263dab74d7f174aa913771cf" +checksum = "70ada912be6060d3602b2b5d02edc5ae5e655a6f96ba225b237e5645c9416e65" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -3766,11 +3789,11 @@ dependencies = [ [[package]] name = "kitsune_p2p_bootstrap" -version = "0.3.0-dev.9" +version = "0.3.0-dev.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3c7bed1cc187ce1cfcbc988add222b7cbfc8e2dc50c18a8472324d9c84410bc" +checksum = "8ac7204800bdee3593f82891ec3adc5a6702014395f3654475e1eaf3270e3675" dependencies = [ - "clap 4.5.8", + "clap 4.5.9", "futures", "kitsune_p2p_bin_data", "kitsune_p2p_types", @@ -3786,9 +3809,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bootstrap_client" -version = "0.4.0-dev.9" +version = "0.4.0-dev.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07503aa9207b5335f4229e6070afd5f6f5c9ea3802627be5e27371c468b0b58a" +checksum = "e5631b7a44270a25284b67a72e3c2a69047dad4e88b1c0c3fc365f57a1186058" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_bootstrap", @@ -3843,9 +3866,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_fetch" -version = "0.4.0-dev.8" +version = "0.4.0-dev.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f54a4722002a544819ddbfcd9c8b783f936439efcbf0987d13a37a1ada5ad98" +checksum = "9c2702d618e6446fe82e292793186f89e80b4660dc1f07ff7448a6d575bee1b8" dependencies = [ "backon", "derive_more", @@ -3874,9 +3897,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_proxy" -version = "0.4.0-dev.8" +version = "0.4.0-dev.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ae9d38efbd2816ab41f9255dc1fde7520c0f0041f003466fa315676e54bfae6" +checksum = "6d42d614278ec11f9b424f37dab3db3c7601101415b308b8b4eeb268c1d32212" dependencies = [ "base64 0.22.1", "derive_more", @@ -3907,9 +3930,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_types" -version = "0.4.0-dev.8" +version = "0.4.0-dev.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c28817caf0554232352fd31dbf380108bec173859397cc6dc0363d73e2d4780" +checksum = "e5c87e769391648c0717996646bd4ccddacbcff1a050589f7ea65229834a9c8f" dependencies = [ "arbitrary", "base64 0.22.1", @@ -3930,7 +3953,7 @@ dependencies = [ "proptest", "proptest-derive 0.5.0", "rmp-serde", - "rustls 0.20.9", + "rustls 0.21.12", "serde", "serde_bytes", "serde_json", @@ -4367,9 +4390,9 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "mr_bundle" -version = "0.4.0-dev.4" +version = "0.4.0-dev.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4eff246b94358f8fd81abfd492b0d19e2f5535aef805348cea087200c7c5778" +checksum = "ecba74b5293658685ec724bbe6baced8b4ff86e7bbea69a787de085d1f90b38d" dependencies = [ "arbitrary", "derive_more", @@ -4677,7 +4700,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -4730,7 +4753,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -4872,7 +4895,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.5.2", + "redox_syscall 0.5.3", "smallvec", "windows-targets 0.52.6", ] @@ -4947,7 +4970,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -5167,7 +5190,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -5524,9 +5547,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ "bitflags 2.6.0", ] @@ -5633,7 +5656,7 @@ dependencies = [ "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.29", + "hyper 0.14.30", "hyper-rustls 0.24.2", "ipnet", "js-sys", @@ -5673,9 +5696,9 @@ dependencies = [ "futures-util", "h2 0.4.5", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", - "hyper 1.4.0", + "hyper 1.4.1", "hyper-rustls 0.27.2", "hyper-tls", "hyper-util", @@ -5707,9 +5730,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.40" +version = "0.8.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7439be6844e40133eda024efd85bf07f59d0dd2f59b10c00dd6cfb92cc5c741" +checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523" dependencies = [ "bytemuck", ] @@ -5760,7 +5783,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.9.1", + "uuid 1.10.0", ] [[package]] @@ -5891,18 +5914,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring 0.16.20", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.21.12" @@ -5931,9 +5942,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.10" +version = "0.23.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" +checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" dependencies = [ "once_cell", "rustls-pki-types", @@ -6083,7 +6094,7 @@ dependencies = [ "anstyle", "base64 0.22.1", "bytes", - "clap 4.5.8", + "clap 4.5.9", "ed25519-dalek", "futures", "rand 0.8.5", @@ -6135,7 +6146,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -6174,9 +6185,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", "core-foundation", @@ -6187,9 +6198,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -6284,7 +6295,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -6295,7 +6306,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -6333,9 +6344,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.3" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e73139bc5ec2d45e6c5fd85be5a46949c1c39a4c18e56915f5eb4c12f975e377" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" dependencies = [ "base64 0.22.1", "chrono", @@ -6351,14 +6362,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.3" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b80d3d6b56b64335c0180e5ffde23b3c5e08c14c585b51a15bd0e95393f46703" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" dependencies = [ - "darling 0.20.9", + "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -6641,7 +6652,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -6652,7 +6663,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -6748,9 +6759,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.68" +version = "2.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" dependencies = [ "proc-macro2", "quote", @@ -6783,9 +6794,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.12" +version = "0.30.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae" +checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" dependencies = [ "cfg-if 1.0.0", "core-foundation-sys", @@ -6836,9 +6847,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" [[package]] name = "task-motel" @@ -6946,7 +6957,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -6969,22 +6980,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -7039,9 +7050,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -7079,7 +7090,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -7119,7 +7130,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.10", + "rustls 0.23.11", "rustls-pki-types", "tokio", ] @@ -7185,7 +7196,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.14", + "toml_edit 0.22.15", ] [[package]] @@ -7223,9 +7234,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" dependencies = [ "indexmap 2.2.6", "serde", @@ -7294,7 +7305,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -7615,9 +7626,9 @@ dependencies = [ [[package]] name = "ureq" -version = "2.9.7" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" dependencies = [ "base64 0.22.1", "log", @@ -7676,9 +7687,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom 0.2.15", "rand 0.8.5", @@ -7760,7 +7771,7 @@ dependencies = [ "futures-util", "headers", "http 0.2.12", - "hyper 0.14.29", + "hyper 0.14.30", "log", "mime", "mime_guess", @@ -7811,7 +7822,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", "wasm-bindgen-shared", ] @@ -7845,7 +7856,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8134,16 +8145,6 @@ dependencies = [ "wasmer-config", ] -[[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - [[package]] name = "webpki-roots" version = "0.25.4" @@ -8575,7 +8576,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -8595,7 +8596,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.71", ] [[package]] @@ -8655,27 +8656,27 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.1.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" +checksum = "fa556e971e7b568dc775c136fc9de8c779b1c2fc3a63defaafadffdbd3181afa" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.11+zstd.1.5.6" +version = "2.0.12+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" +checksum = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index e03b288..02032d2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ version = "0.6.0-dev.2" members = ["fixture/zomes/foo"] [workspace.dependencies] -holochain_zome_types = "0.4.0-dev.9" +holochain_zome_types = "0.4.0-dev.10" [dependencies] again = "0.1" @@ -27,23 +27,23 @@ rand = { version = "0.8" } async-trait = "0.1" parking_lot = "0.12.1" -holo_hash = { version = "0.4.0-dev.7", features = ["encoding"] } -holochain_conductor_api = "0.4.0-dev.11" -holochain_websocket = "0.4.0-dev.11" +holo_hash = { version = "0.4.0-dev.8", features = ["encoding"] } +holochain_conductor_api = "0.4.0-dev.12" +holochain_websocket = "0.4.0-dev.12" holochain_serialized_bytes = "0.0.55" -holochain_types = "0.4.0-dev.11" +holochain_types = "0.4.0-dev.12" holochain_nonce = "0.4.0-dev.4" holochain_zome_types = { workspace = true } -lair_keystore_api = { version = "0.4.0", optional = true } +lair_keystore_api = { version = "0.4.5", optional = true } tokio = { version = "1.36", features = ["rt"] } [dev-dependencies] arbitrary = "1.2" -holochain = { version = "0.4.0-dev.11", features = ["test_utils"] } +holochain = { version = "0.4.0-dev.12", features = ["test_utils"] } rand = "0.8" -kitsune_p2p_types = "0.4.0-dev.8" +kitsune_p2p_types = "0.4.0-dev.9" [features] default = ["lair_signing"] diff --git a/fixture/dna.yaml b/fixture/dna.yaml index 97b7252..da9ebcb 100644 --- a/fixture/dna.yaml +++ b/fixture/dna.yaml @@ -1,6 +1,8 @@ --- manifest_version: "1" name: test-dna +lineage: + - uhC0kDYtR49WteLI9NStqJ6wezkFQU3Z71o7NM5-P5gzsjhlVzKoM integrity: origin_time: "2022-09-30T00:00:00.000000Z" zomes: diff --git a/flake.lock b/flake.lock index 7263445..f425d6e 100644 --- a/flake.lock +++ b/flake.lock @@ -1,39 +1,5 @@ { "nodes": { - "cargo-chef": { - "flake": false, - "locked": { - "lastModified": 1695999026, - "narHash": "sha256-UtLoZd7YBRSF9uXStfC3geEFqSqZXFh1rLHaP8hre0Y=", - "owner": "LukeMathWalker", - "repo": "cargo-chef", - "rev": "6e96ae5cd023b718ae40d608981e50a6e7d7facf", - "type": "github" - }, - "original": { - "owner": "LukeMathWalker", - "ref": "main", - "repo": "cargo-chef", - "type": "github" - } - }, - "cargo-rdme": { - "flake": false, - "locked": { - "lastModified": 1675118998, - "narHash": "sha256-lrYWqu3h88fr8gG3Yo5GbFGYaq5/1Os7UtM+Af0Bg4k=", - "owner": "orium", - "repo": "cargo-rdme", - "rev": "f9dbb6bccc078f4869f45ae270a2890ac9a75877", - "type": "github" - }, - "original": { - "owner": "orium", - "ref": "v1.1.0", - "repo": "cargo-rdme", - "type": "github" - } - }, "crane": { "inputs": { "nixpkgs": [ @@ -42,11 +8,11 @@ ] }, "locked": { - "lastModified": 1707363936, - "narHash": "sha256-QbqyvGFYt84QNOQLOOTWplZZkzkyDhYrAl/N/9H0vFM=", + "lastModified": 1720546058, + "narHash": "sha256-iU2yVaPIZm5vMGdlT0+57vdB/aPq/V5oZFBRwYw+HBM=", "owner": "ipetkov", "repo": "crane", - "rev": "9107434eda6991e9388ad87b815dafa337446d16", + "rev": "2d83156f23c43598cf44e152c33a59d3892f8b29", "type": "github" }, "original": { @@ -55,137 +21,102 @@ "type": "github" } }, - "crate2nix": { - "flake": false, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, "locked": { - "lastModified": 1706909251, - "narHash": "sha256-T7G9Uhh77P0kKri/u+Mwa/4YnXwdPsJSwYCiJCCW+fs=", - "owner": "kolloch", - "repo": "crate2nix", - "rev": "15656bb6cb15f55ee3344bf4362e6489feb93db6", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { - "owner": "kolloch", - "repo": "crate2nix", + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, - "empty": { + "hc-launch": { "flake": false, "locked": { - "lastModified": 1683792623, - "narHash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=", - "owner": "steveej", - "repo": "empty", - "rev": "8e328e450e4cd32e072eba9e99fe92cf2a1ef5cf", + "lastModified": 1720810416, + "narHash": "sha256-PgykEezr0yrUAPQcmVJdR8M4PiKDzLCL/RS67RFeu/A=", + "owner": "holochain", + "repo": "hc-launch", + "rev": "b788d346491f4749949ae1710d51508920b6ea07", "type": "github" }, "original": { - "owner": "steveej", - "repo": "empty", + "owner": "holochain", + "ref": "holochain-weekly", + "repo": "hc-launch", "type": "github" } }, - "flake-compat": { + "hc-scaffold": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "lastModified": 1720709716, + "narHash": "sha256-JrUNDbAiSPl11L8JxtgNfKXV13bWgCD+Xd0hNy8nK9A=", + "owner": "holochain", + "repo": "scaffolding", + "rev": "3241aaaf52589ced9e29bf616407b867f6927c44", "type": "github" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "owner": "holochain", + "ref": "holochain-weekly", + "repo": "scaffolding", "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" } }, "holochain": { "flake": false, "locked": { - "lastModified": 1719968525, - "narHash": "sha256-smpK/6bTj6rz4L5JE4LNEPXKS2FHX9TuMj2hg473ggI=", + "lastModified": 1721178546, + "narHash": "sha256-BSizIg/FSELpbxK4QMBrMC1iJzfDUk0D0BV3Zf73RtY=", "owner": "holochain", "repo": "holochain", - "rev": "31c75c07234a573b18f07cb05c2961809bf1c0a1", + "rev": "d7ef2a0947908ba1f859a535ef9ea31f89c2d355", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.4.0-dev.11", + "ref": "holochain-0.4.0-dev.13", "repo": "holochain", "type": "github" } }, "holonix": { "inputs": { - "cargo-chef": "cargo-chef", - "cargo-rdme": "cargo-rdme", "crane": "crane", - "crate2nix": "crate2nix", - "empty": "empty", - "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "holochain": [ - "holonix", - "empty" - ], - "lair": [ - "holonix", - "empty" - ], - "launcher": [ - "holonix", - "empty" - ], - "nix-filter": "nix-filter", + "hc-launch": "hc-launch", + "hc-scaffold": "hc-scaffold", + "holochain": "holochain", + "lair-keystore": "lair-keystore", "nixpkgs": "nixpkgs", - "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "repo-git": "repo-git", - "rust-overlay": "rust-overlay", - "scaffolding": [ - "holonix", - "empty" - ], - "versions": [ - "versions" - ] + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1720108358, - "narHash": "sha256-gXhphrxVUfIIht9iR0DD1UWu/XwMrC+3LLsTvBBA5pQ=", + "lastModified": 1721249726, + "narHash": "sha256-kwgTA8i9meztf3vLT9VdMLSAvbm/ym0p8Rssvine61I=", "owner": "holochain", - "repo": "holochain", - "rev": "01570f0e096fa18f0cca9db63b618edf7e566293", + "repo": "holonix", + "rev": "0d47eac78a632699add6e03bfff9f69d729b1c76", "type": "github" }, "original": { "owner": "holochain", - "repo": "holochain", + "ref": "main", + "repo": "holonix", "type": "github" } }, - "lair": { + "lair-keystore": { "flake": false, "locked": { "lastModified": 1717684904, @@ -202,97 +133,32 @@ "type": "github" } }, - "launcher": { - "flake": false, - "locked": { - "lastModified": 1715106263, - "narHash": "sha256-a7iQ8pKGz6fghJrtXq0Xamp57GE8Hd3w5YQASzz5Wlk=", - "owner": "holochain", - "repo": "launcher", - "rev": "92bd39e1c66912d61c35c4725d7b106959888670", - "type": "github" - }, - "original": { - "owner": "holochain", - "ref": "holochain-weekly", - "repo": "launcher", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1716293225, - "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", - "owner": "NixOS", + "lastModified": 1720542800, + "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "rev": "feb2849fdeb70028c70d73b848214b00d324a497", "type": "github" }, "original": { - "dir": "lib", - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "pre-commit-hooks-nix": { - "flake": false, - "locked": { - "lastModified": 1707297608, - "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "0db2e67ee49910adfa13010e7f012149660af7f0", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "repo-git": { - "flake": false, + "nixpkgs-lib": { "locked": { - "narHash": "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY=", - "type": "file", - "url": "file:/dev/null" + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" }, "original": { - "type": "file", - "url": "file:/dev/null" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, "root": { @@ -301,8 +167,7 @@ "nixpkgs": [ "holonix", "nixpkgs" - ], - "versions": "versions" + ] } }, "rust-overlay": { @@ -313,11 +178,11 @@ ] }, "locked": { - "lastModified": 1719714047, - "narHash": "sha256-MeNPopLLv63EZj5L43j4TZkmW4wj1ouoc/h/E20sl/U=", + "lastModified": 1720664424, + "narHash": "sha256-+odiMNHRYdvzL1ewl41UVFxsjmdoXfH+maQ8xvUoR4g=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cb216719ce89a43dfb3d1b86a9575e89f4b727a4", + "rev": "fec97e65fcbaab0decccba740ac8688f61dadd70", "type": "github" }, "original": { @@ -325,46 +190,6 @@ "repo": "rust-overlay", "type": "github" } - }, - "scaffolding": { - "flake": false, - "locked": { - "lastModified": 1719577631, - "narHash": "sha256-LPdMm14MPEQBbt6NgzVtA5Z38tGC032G0dg90qgJZlo=", - "owner": "holochain", - "repo": "scaffolding", - "rev": "b481b2b3cb0a88bb01097dd26ea0dba84491c58a", - "type": "github" - }, - "original": { - "owner": "holochain", - "ref": "holochain-weekly", - "repo": "scaffolding", - "type": "github" - } - }, - "versions": { - "inputs": { - "holochain": "holochain", - "lair": "lair", - "launcher": "launcher", - "scaffolding": "scaffolding" - }, - "locked": { - "dir": "versions/weekly", - "lastModified": 1720108358, - "narHash": "sha256-gXhphrxVUfIIht9iR0DD1UWu/XwMrC+3LLsTvBBA5pQ=", - "owner": "holochain", - "repo": "holochain", - "rev": "01570f0e096fa18f0cca9db63b618edf7e566293", - "type": "github" - }, - "original": { - "dir": "versions/weekly", - "owner": "holochain", - "repo": "holochain", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7cacf10..2a32f3e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,6 @@ { inputs = { - holonix.url = "github:holochain/holochain"; - versions.url = "github:holochain/holochain?dir=versions/weekly"; - holonix.inputs.versions.follows = "versions"; + holonix.url = "github:holochain/holonix/main"; nixpkgs.follows = "holonix/nixpkgs"; }; @@ -11,13 +9,18 @@ # provide a dev shell for all systems that the holonix flake supports systems = builtins.attrNames holonix.devShells; - perSystem = { config, system, pkgs, ... }: + perSystem = { inputs', config, system, pkgs, ... }: { devShells.default = pkgs.mkShell { - inputsFrom = [ holonix.devShells.${system}.holochainBinaries ]; - packages = with pkgs; [ - # add further packages from nixpkgs - ]; + packages = [ + inputs'.holonix.packages.holochain + inputs'.holonix.packages.lair-keystore + inputs'.holonix.packages.rust + pkgs.go + ] ++ (pkgs.lib.optionals pkgs.stdenv.isDarwin [ + # needed to build Holochain on macos + pkgs.darwin.apple_sdk.frameworks.SystemConfiguration + ]); }; }; }; diff --git a/src/admin_websocket.rs b/src/admin_websocket.rs index b340338..4a62ff8 100644 --- a/src/admin_websocket.rs +++ b/src/admin_websocket.rs @@ -3,7 +3,7 @@ use anyhow::Result; use holo_hash::DnaHash; use holochain_conductor_api::{ AdminRequest, AdminResponse, AppAuthenticationTokenIssued, AppInfo, AppInterfaceInfo, - AppStatusFilter, IssueAppAuthenticationTokenPayload, StorageInfo, + AppStatusFilter, CompatibleCells, IssueAppAuthenticationTokenPayload, StorageInfo, }; use holochain_types::websocket::AllowedOrigins; use holochain_types::{ @@ -210,6 +210,18 @@ impl AdminWebsocket { } } + pub async fn get_compatible_cells( + &self, + dna_hash: DnaHash, + ) -> ConductorApiResult { + let msg = AdminRequest::GetCompatibleCells(dna_hash); + let response = self.send(msg).await?; + match response { + AdminResponse::CompatibleCells(compatible_cells) => Ok(compatible_cells), + _ => unreachable!("Unexpected response {:?}", response), + } + } + pub async fn grant_zome_call_capability( &self, payload: GrantZomeCallCapabilityPayload, diff --git a/src/app_websocket.rs b/src/app_websocket.rs index 03ee1f6..990f1ce 100644 --- a/src/app_websocket.rs +++ b/src/app_websocket.rs @@ -166,6 +166,15 @@ impl AppWebsocket { } } + pub async fn enable_app(&self) -> ConductorApiResult<()> { + let app_request = AppRequest::EnableApp; + let response = self.inner.send(app_request).await?; + match response { + AppResponse::Ok => Ok(()), + _ => unreachable!("Unexpected response {:?}", response), + } + } + pub async fn create_clone_cell( &self, msg: CreateCloneCellPayload, diff --git a/tests/admin.rs b/tests/admin.rs index 3e6e86e..4660d20 100644 --- a/tests/admin.rs +++ b/tests/admin.rs @@ -7,9 +7,12 @@ use holochain_client::{ use holochain_conductor_api::{CellInfo, StorageBlob}; use holochain_types::websocket::AllowedOrigins; use holochain_zome_types::prelude::ExternIO; +use std::collections::BTreeSet; use std::net::Ipv4Addr; use std::{collections::HashMap, path::PathBuf}; +const ROLE_NAME: &str = "foo"; + #[tokio::test(flavor = "multi_thread")] async fn app_interfaces() { let conductor = SweetConductor::from_standard_config().await; @@ -45,6 +48,7 @@ async fn signed_zome_call() { membrane_proofs: HashMap::new(), network_seed: None, source: AppBundleSource::Path(PathBuf::from("./fixture/test.happ")), + ignore_genesis_failure: false, }) .await .unwrap(); @@ -59,7 +63,7 @@ async fn signed_zome_call() { .issue_app_auth_token(app_id.clone().into()) .await .unwrap(); - let mut signer = ClientAgentSigner::default(); + let signer = ClientAgentSigner::default(); let app_ws = AppWebsocket::connect( (Ipv4Addr::LOCALHOST, app_ws_port), issued_token.token, @@ -119,6 +123,7 @@ async fn storage_info() { membrane_proofs: HashMap::new(), network_seed: None, source: AppBundleSource::Path(PathBuf::from("./fixture/test.happ")), + ignore_genesis_failure: false, }) .await .unwrap(); @@ -152,6 +157,7 @@ async fn dump_network_stats() { membrane_proofs: HashMap::new(), network_seed: None, source: AppBundleSource::Path(PathBuf::from("./fixture/test.happ")), + ignore_genesis_failure: false, }) .await .unwrap(); @@ -161,3 +167,47 @@ async fn dump_network_stats() { assert!(network_stats.contains("\"backend\": \"tx2-quic\"")); } + +#[tokio::test(flavor = "multi_thread")] +async fn get_compatible_cells() { + let conductor = SweetConductor::from_standard_config().await; + let admin_port = conductor.get_arbitrary_admin_websocket_port().unwrap(); + let admin_ws = AdminWebsocket::connect(format!("127.0.0.1:{}", admin_port)) + .await + .unwrap(); + let app_id: InstalledAppId = "test-app".into(); + let agent_key = admin_ws.generate_agent_pub_key().await.unwrap(); + let app_info = admin_ws + .install_app(InstallAppPayload { + agent_key: agent_key.clone(), + installed_app_id: Some(app_id.clone()), + membrane_proofs: HashMap::new(), + network_seed: None, + source: AppBundleSource::Path(PathBuf::from("./fixture/test.happ")), + ignore_genesis_failure: false, + }) + .await + .unwrap(); + let cell_id = if let CellInfo::Provisioned(provisioned_cell) = + &app_info.cell_info.get(ROLE_NAME).unwrap()[0] + { + provisioned_cell.cell_id.clone() + } else { + panic!("expected provisioned cell") + }; + let dna_hash = cell_id.dna_hash().clone(); + let mut compatible_cells = admin_ws.get_compatible_cells(dna_hash).await.unwrap(); + assert_eq!( + compatible_cells.len(), + 1, + "compatible cells set should have 1 element" + ); + let cell_1 = compatible_cells.pop_first().unwrap(); + let mut expected_cells = BTreeSet::new(); + expected_cells.insert(cell_id); + assert_eq!( + cell_1, + (app_id, expected_cells), + "only cell should be expected app cell" + ); +} diff --git a/tests/app.rs b/tests/app.rs index be4321d..8af815d 100644 --- a/tests/app.rs +++ b/tests/app.rs @@ -8,7 +8,7 @@ use holochain_client::{ }; use holochain_conductor_api::{AppInfoStatus, CellInfo, NetworkInfo}; use holochain_types::{ - app::{AppBundle, AppManifestV1}, + app::{AppBundle, AppManifestV1, DisabledAppReason}, websocket::AllowedOrigins, }; use holochain_zome_types::dependencies::holochain_integrity_types::ExternIO; @@ -41,6 +41,7 @@ async fn network_info() { membrane_proofs: HashMap::new(), network_seed: None, source: AppBundleSource::Path(PathBuf::from("./fixture/test.happ")), + ignore_genesis_failure: false, }) .await .unwrap(); @@ -114,6 +115,7 @@ async fn handle_signal() { membrane_proofs: HashMap::new(), network_seed: None, source: AppBundleSource::Path(PathBuf::from("./fixture/test.happ")), + ignore_genesis_failure: false, }) .await .unwrap(); @@ -128,7 +130,7 @@ async fn handle_signal() { .issue_app_auth_token(app_id.clone().into()) .await .unwrap(); - let mut signer = ClientAgentSigner::default(); + let signer = ClientAgentSigner::default(); let app_ws = AppWebsocket::connect( (Ipv4Addr::LOCALHOST, app_ws_port), token_issued.token, @@ -210,6 +212,7 @@ async fn close_on_drop_is_clone_safe() { membrane_proofs: HashMap::new(), network_seed: None, source: AppBundleSource::Path(PathBuf::from("./fixture/test.happ")), + ignore_genesis_failure: false, }) .await .unwrap(); @@ -277,6 +280,7 @@ async fn deferred_memproof_installation() { membrane_proofs: HashMap::new(), network_seed: None, source: AppBundleSource::Bundle(app_bundle_deferred_memproofs), + ignore_genesis_failure: false, }) .await .unwrap(); @@ -307,10 +311,25 @@ async fn deferred_memproof_installation() { .expect("app info must exist"); assert_eq!(app_info.status, AppInfoStatus::AwaitingMemproofs); + app_ws.enable_app().await.unwrap_err(); + let response = app_ws.provide_memproofs(HashMap::new()).await.unwrap(); assert_eq!(response, ()); - admin_ws.enable_app(app_id.clone()).await.unwrap(); + let app_info = app_ws + .app_info() + .await + .unwrap() + .expect("app info must exist"); + assert_eq!( + app_info.status, + AppInfoStatus::Disabled { + reason: DisabledAppReason::NotStartedAfterProvidingMemproofs + }, + "app status should be NotStartedAfterProvidingMemproofs" + ); + + app_ws.enable_app().await.unwrap(); // App status should be `Running` now. let app_info = app_ws diff --git a/tests/clone_cell.rs b/tests/clone_cell.rs index bc270af..fba7beb 100644 --- a/tests/clone_cell.rs +++ b/tests/clone_cell.rs @@ -36,6 +36,7 @@ async fn clone_cell_management() { membrane_proofs: HashMap::new(), network_seed: None, source: AppBundleSource::Path(PathBuf::from("./fixture/test.happ")), + ignore_genesis_failure: false, }) .await .unwrap(); @@ -50,7 +51,7 @@ async fn clone_cell_management() { .issue_app_auth_token(app_id.clone().into()) .await .unwrap(); - let mut signer = ClientAgentSigner::default(); + let signer = ClientAgentSigner::default(); let app_ws = AppWebsocket::connect( format!("127.0.0.1:{}", app_api_port), issued_token.token, @@ -189,12 +190,13 @@ pub async fn app_info_refresh() { membrane_proofs: HashMap::new(), network_seed: None, source: AppBundleSource::Path(PathBuf::from("./fixture/test.happ")), + ignore_genesis_failure: false, }) .await .unwrap(); admin_ws.enable_app(app_id.clone()).await.unwrap(); - let mut signer = ClientAgentSigner::default(); + let signer = ClientAgentSigner::default(); // Create an app interface and connect an app agent to it let app_api_port = admin_ws