diff --git a/Cargo.lock b/Cargo.lock index 73ad6988..7e9ecc1c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,11 +4,11 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ - "gimli 0.28.1", + "gimli 0.29.0", ] [[package]] @@ -86,15 +86,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" dependencies = [ "addr2line", "cc", @@ -202,7 +202,7 @@ version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", "syn 1.0.109", ] @@ -221,9 +221,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "camino" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" dependencies = [ "serde", ] @@ -245,7 +245,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.22", + "semver 1.0.23", "serde", "serde_json", "thiserror", @@ -253,9 +253,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.96" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" [[package]] name = "cfg-if" @@ -479,9 +479,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-common" @@ -505,12 +505,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ - "darling_core 0.20.8", - "darling_macro 0.20.8", + "darling_core 0.20.9", + "darling_macro 0.20.9", ] [[package]] @@ -521,7 +521,7 @@ checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", "strsim 0.10.0", "syn 1.0.109", @@ -529,15 +529,15 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -553,13 +553,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ - "darling_core 0.20.8", + "darling_core 0.20.9", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -587,7 +587,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", "syn 1.0.109", ] @@ -599,7 +599,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", "rustc_version", "syn 1.0.109", @@ -629,9 +629,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "enum-iterator" @@ -648,7 +648,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", "syn 1.0.109", ] @@ -668,10 +668,10 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" dependencies = [ - "darling 0.20.8", - "proc-macro2 1.0.81", + "darling 0.20.9", + "proc-macro2 1.0.84", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -761,9 +761,9 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -829,9 +829,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -851,9 +851,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "hashbrown" @@ -872,9 +872,9 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hdi" -version = "0.4.0-beta-dev.36" +version = "0.4.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f825dde020258d4af03ea8c0d899d8000ccac86da32f2233ce7abf4629639378" +checksum = "9d9802bc73fa25ee59642694fb90d8c98ba020c13db6f8d756f5cee709d4c3b5" dependencies = [ "getrandom", "hdk_derive", @@ -890,9 +890,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.3.0-beta-dev.41" +version = "0.3.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd3d886617f1d75d33ca49fbabf297b2829d1c7c9339564b82e4a1f4fa3d24f8" +checksum = "e060c511e60e21a34329ae58335a381b5468e066fd3bb16f5acf2860615f3f19" dependencies = [ "getrandom", "hdi", @@ -910,16 +910,16 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.3.0-beta-dev.34" +version = "0.3.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eef3b13c4bda147be17280e1d6e0cd7838f58775dddd85268386b3ac83b5501" +checksum = "fc35b42a7b7c52d2d16d7673cee932645230c6d7eb3f4c4b450bc2abeb311c12" dependencies = [ "darling 0.14.4", "heck 0.5.0", "holochain_integrity_types", "paste", "proc-macro-error", - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", "syn 1.0.109", ] @@ -968,9 +968,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.3.0-beta-dev.28" +version = "0.3.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af6e4370993eb87c131fea8637c29a976942172cc62476537f3a6d91e78c57ee" +checksum = "e06fe354e9a24ef08ea2f2a5b8660edb3e95ae1a3db0c1ea938a6f313e559047" dependencies = [ "base64", "blake2b_simd", @@ -986,9 +986,9 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.3.0-beta-dev.33" +version = "0.3.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "001d7a2fa9e6928f15f0b927de47f004a822e2d16f83c5851dc40fdb45b8f337" +checksum = "61c347e849b45ddceca322a9ce0c148a57955a8fd811cbc3b95ac57d325973dc" dependencies = [ "holo_hash", "holochain_secure_primitive", @@ -1003,9 +1003,9 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.3.0-beta-dev.27" +version = "0.3.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6f4c40ab91b6e5ac3b006a3c542888f37ae7527e55e8e22608b3acfe607b0f" +checksum = "981bf3c6b4bceace67e9e1598e7a761b0116c1761e94ffc4164cd9b3a21b8b2c" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -1014,9 +1014,9 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.3.0-dev.0" +version = "0.3.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c040651a49f5f91c6ca0b1ea80f9a7c5cc6e4516f73ccd1d1e67141b9ddb030d" +checksum = "7877034592d7f0c4ce9e52ad34e7289a1b9cf93d5292462b988fba2269406066" dependencies = [ "paste", "serde", @@ -1025,12 +1025,12 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes" -version = "0.0.53" +version = "0.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7a5fc7c745a107f8ebcb04caab7a6b7a8463e2811f07ced19c281977583de7" +checksum = "fad1068180811f3a23c340894cb98b0710244ffac76427664239545f162619c5" dependencies = [ "holochain_serialized_bytes_derive", - "rmp-serde", + "rmp-serde 1.1.2", "serde", "serde-transcode", "serde_bytes", @@ -1040,9 +1040,9 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes_derive" -version = "0.0.53" +version = "0.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3e0cf02005cbf0f514476d40e02125b26df6d4922d7a2c48a84fc588539d71" +checksum = "71cc7f19017233d644abc4a23cbe19220effc05aea057f93db1be00348b89464" dependencies = [ "quote 1.0.36", "syn 1.0.109", @@ -1050,9 +1050,9 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.3.0-dev.0" +version = "0.3.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf57140a57e9ee1278000c272080a67d971ea610081f3a7d5e960d747a6b00c5" +checksum = "6461b88941572dc5c9482874fea97ed7b5cd864bd623d096fa0a940ada98ac88" dependencies = [ "cfg-if", "colored", @@ -1064,9 +1064,9 @@ dependencies = [ [[package]] name = "holochain_wasmer_common" -version = "0.0.92" +version = "0.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72007fd2a72d77e76ffa494e5847bf6e893e25e73fe1d1de902e1b8d5033a64e" +checksum = "5e77c4d54b5bf86dfa0266588d43fc913b0442799f34c8fc04b0e8eda0260bd4" dependencies = [ "holochain_serialized_bytes", "serde", @@ -1078,9 +1078,9 @@ dependencies = [ [[package]] name = "holochain_wasmer_guest" -version = "0.0.92" +version = "0.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c429e84a19ee446f47541a6fed10e1a4376a8a8ba6d3dbff7d07e4a7bb4c85f" +checksum = "10fcb10d7d455c5222a13b2343e2a438bcbbf3f97ef79f16c9e01203f6616dd0" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", @@ -1092,9 +1092,9 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.3.0-beta-dev.36" +version = "0.3.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "116df2a3484fa77f251ca381f36cb6eba6403df577cad84aa0ed75f564e0fe88" +checksum = "ee2c24fe476406e9c23cefc1bffeae1c4dd2c0fadc73a832a4b26e379be15fc6" dependencies = [ "derive_more", "holo_hash", @@ -1198,9 +1198,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" dependencies = [ "bytes", "futures-channel", @@ -1336,9 +1336,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.3.0-beta-dev.21" +version = "0.3.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c26a2c48ad26f4be9c941b5e25a2a644b18fc9dcfca5e2ee3927610e8a5451" +checksum = "0afa937935e8d3eae00cc3b324988ced94d8efa8039550eeb3f0a89e3e181aee" dependencies = [ "base64", "derive_more", @@ -1351,9 +1351,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.3.0-beta-dev.23" +version = "0.3.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b49e275b16bae4db37bb5ef83f32d8426d04c387bcac3937841d4676436a80a5" +checksum = "77ca6d86228768cda5b6fc1646294fba6076a193017e813564fa3d0a4bc8691d" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1362,9 +1362,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.3.0-beta-dev.20" +version = "0.3.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071b2a8e6d47ef82fdab408083dd609d938c2944fb824412ec5d48f8795d31dd" +checksum = "5e06db37fa121dfa22ebde3271db5d385cd496ed03d915ad37104cceb87a22ca" dependencies = [ "derive_more", "gcollections", @@ -1376,9 +1376,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.3.0-beta-dev.10" +version = "0.3.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a046548b0a5922f552352206dd33072f080907bd2939b0cce20178b464448c3" +checksum = "9a1dcdf3cae376a56ab109908d72b9b678e95920c087e7b255c505c84cdb9787" dependencies = [ "chrono", "serde", @@ -1398,9 +1398,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "lock_api" @@ -1477,9 +1477,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] @@ -1524,9 +1524,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -1543,9 +1543,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" dependencies = [ "memchr", ] @@ -1564,9 +1564,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -1587,9 +1587,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" @@ -1623,9 +1623,9 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -1653,7 +1653,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", "syn 1.0.109", "version_check", @@ -1665,7 +1665,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", "version_check", ] @@ -1681,9 +1681,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" dependencies = [ "unicode-ident", ] @@ -1703,7 +1703,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", "syn 1.0.109", ] @@ -1723,7 +1723,7 @@ version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", ] [[package]] @@ -1935,7 +1935,7 @@ version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", "syn 1.0.109", ] @@ -1962,11 +1962,22 @@ dependencies = [ "serde", ] +[[package]] +name = "rmp-serde" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" @@ -1974,7 +1985,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.22", + "semver 1.0.23", ] [[package]] @@ -2016,15 +2027,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.3" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring", "rustls-pki-types", @@ -2033,15 +2044,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -2075,11 +2086,11 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -2088,9 +2099,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -2113,9 +2124,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] @@ -2131,9 +2142,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.200" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] @@ -2169,20 +2180,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "indexmap 2.2.6", "itoa", @@ -2242,7 +2253,7 @@ checksum = "e63e6744142336dfb606fe2b068afa2e1cca1ee6a5d8377277a92945d81fa331" dependencies = [ "bitflags 1.3.2", "itertools", - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", "syn 1.0.109", ] @@ -2299,7 +2310,7 @@ version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", "syn 1.0.109", ] @@ -2367,7 +2378,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", "rustversion", "syn 1.0.109", @@ -2406,18 +2417,18 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.60" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", "unicode-ident", ] @@ -2459,7 +2470,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58071dc2471840e9f374eeb0f6e405a31bccb3cc5d59bb4598f02cafc274b5c4" dependencies = [ "cargo_metadata", - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", "serde", "strum_macros", @@ -2474,7 +2485,7 @@ dependencies = [ "darling 0.14.4", "if_chain", "lazy_static", - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", "subprocess", "syn 1.0.109", @@ -2508,22 +2519,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -2565,9 +2576,9 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -2619,7 +2630,6 @@ dependencies = [ "tokio", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -2640,7 +2650,6 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2652,9 +2661,9 @@ version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -2688,7 +2697,7 @@ dependencies = [ "once_cell", "parking_lot", "reqwest", - "rmp-serde", + "rmp-serde 0.15.5", "serde", "serde_bytes", "slab", @@ -2781,7 +2790,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2e7e85a0596447f0f2ac090e16bc4c516c6fe91771fb0c0ccf7fa3dae896b9c" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", "syn 1.0.109", ] @@ -2871,9 +2880,9 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -2905,9 +2914,9 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2929,9 +2938,9 @@ dependencies = [ [[package]] name = "wasmer" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce45cc009177ca345a6d041f9062305ad467d15e7d41494f5b81ab46d62d7a58" +checksum = "4014573f108a246858299eb230031e268316fd57207bd2e8afc79b20fc7ce983" dependencies = [ "bytes", "cfg-if", @@ -2945,6 +2954,7 @@ dependencies = [ "shared-buffer", "target-lexicon", "thiserror", + "tracing", "wasm-bindgen", "wasmer-compiler", "wasmer-compiler-cranelift", @@ -2957,9 +2967,9 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e044f6140c844602b920deb4526aea3cc9c0d7cf23f00730bb9b2034669f522a" +checksum = "3a77bfe259f08e8ec9e77f8f772ebfb4149f799d1f637231c5a5a6a90c447256" dependencies = [ "backtrace", "bytes", @@ -2984,9 +2994,9 @@ dependencies = [ [[package]] name = "wasmer-compiler-cranelift" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ce02358eb44a149d791c1d6648fb7f8b2f99cd55e3c4eef0474653ec8cc889" +checksum = "9280c47ebc754f95357745a38a995dd766f149e16b26e1b7e35741eb23c03d12" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -3003,21 +3013,21 @@ dependencies = [ [[package]] name = "wasmer-derive" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c782d80401edb08e1eba206733f7859db6c997fc5a7f5fb44edc3ecd801468f6" +checksum = "e9352877c4f07fc59146d21b56ae6dc469caf342587f49c81b4fbeafead31972" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.81", + "proc-macro2 1.0.84", "quote 1.0.36", "syn 1.0.109", ] [[package]] name = "wasmer-types" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd09e80d4d74bb9fd0ce6c3c106b1ceba1a050f9948db9d9b78ae53c172d6157" +checksum = "749214b6170f2b2fbbfe5b7e7f8d381e64930ac4122f3abceb33cde0292d45d2" dependencies = [ "bytecheck", "enum-iterator", @@ -3031,9 +3041,9 @@ dependencies = [ [[package]] name = "wasmer-vm" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcd8a4fd36414a7b6a003dbfbd32393bce3e155d715dd877c05c1b7a41d224d" +checksum = "300215479de0deeb453e95aeb1b9c8ffd9bc7d9bd27c5f9e8a184e54db4d31a9" dependencies = [ "backtrace", "cc", @@ -3059,12 +3069,13 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.95.0" +version = "0.121.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a" +checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ - "indexmap 1.9.3", - "url", + "bitflags 2.5.0", + "indexmap 2.2.6", + "semver 1.0.23", ] [[package]] @@ -3341,6 +3352,6 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/Cargo.toml b/Cargo.toml index b6e8259b..b98e21a8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,8 +7,8 @@ members = [ resolver = "2" [workspace.dependencies] -hdi = "0.4.0-beta-dev.36" -hdk = "0.3.0-beta-dev.41" +hdi = "0.4.1-rc.0" +hdk = "0.3.1-rc.0" serde = "1.0.181" [profile.dev] diff --git a/flake.lock b/flake.lock index 9daaf7e1..706ec98a 100644 --- a/flake.lock +++ b/flake.lock @@ -141,16 +141,16 @@ "holochain": { "flake": false, "locked": { - "lastModified": 1714046698, - "narHash": "sha256-vGOWRJXR64qXRe4MCg13xNyww904KPFvYZIQyRhuPsU=", + "lastModified": 1715896367, + "narHash": "sha256-jRxb8HsXUV7Fba3hMCL+TycbvF7v+JT53eIryZPu878=", "owner": "holochain", "repo": "holochain", - "rev": "b48562aa081b1dd177ec43035650262fbdb40d0e", + "rev": "9f293072c41bd053e9cd88f746a456ee1dee1990", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3.0-beta-dev.48", + "ref": "holochain-0.3.1-rc.0", "repo": "holochain", "type": "github" } @@ -190,11 +190,11 @@ ] }, "locked": { - "lastModified": 1714741020, - "narHash": "sha256-RLv97XHe/Rk7/X7cFIUb4+igc7jAfHmMcu7j740dvEo=", + "lastModified": 1717008431, + "narHash": "sha256-cRPG2hDyFlxsT2bGlINJOjhZ4VXPBZ3lryXXXgKZ+rQ=", "owner": "holochain", "repo": "holochain", - "rev": "c863c05b44632db5d3761ec256f43932371925fd", + "rev": "54e08e370c674c87d2dcac3146cd0aff76df93aa", "type": "github" }, "original": { @@ -223,11 +223,11 @@ "launcher": { "flake": false, "locked": { - "lastModified": 1714396970, - "narHash": "sha256-I/Vpxtg8cwhrrD5JugEgE4Qk8fZR6VewGm5FX69vbm0=", + "lastModified": 1716406557, + "narHash": "sha256-6eWndYspznXKYIJcuPCWFZ3lxdh7TrlEUGP1zaE5Mgs=", "owner": "holochain", "repo": "launcher", - "rev": "b96d5aa790bf0da0a8f0c44741276f7f9c4b6b41", + "rev": "f20844aa5041432547c55176d71e67b32e302f77", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714635257, - "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", + "lastModified": 1716293225, + "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", "type": "github" }, "original": { @@ -332,11 +332,11 @@ ] }, "locked": { - "lastModified": 1714702555, - "narHash": "sha256-/NoUbE5S5xpK1FU3nlHhQ/tL126+JcisXdzy3Ng4pDU=", + "lastModified": 1716949111, + "narHash": "sha256-ms3aD3Z2jKd1dk8qd0D/N7C8vFxn6z6LQ1G7cvNTVJ8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7f0e3ef7b7fbed78e12e5100851175d28af4b7c6", + "rev": "2e7ccf572ce0f0547d4cf4426de4482936882d0e", "type": "github" }, "original": { @@ -348,11 +348,11 @@ "scaffolding": { "flake": false, "locked": { - "lastModified": 1714147981, - "narHash": "sha256-PIWouOg4W2jVFjsHexAqOCdnwy6gQgll7kWRHssiid0=", + "lastModified": 1716370784, + "narHash": "sha256-iCsenLqNBpKDfGGZuXbxH0BYjgrG5Me8dvzan7VIQ5Q=", "owner": "holochain", "repo": "scaffolding", - "rev": "6582621e73b5127ed863b13f5648d9a333542623", + "rev": "b4b1e0f8298551c44e99d3897eedd995b4b54314", "type": "github" }, "original": { @@ -386,11 +386,11 @@ }, "locked": { "dir": "versions/0_3_rc", - "lastModified": 1714741020, - "narHash": "sha256-RLv97XHe/Rk7/X7cFIUb4+igc7jAfHmMcu7j740dvEo=", + "lastModified": 1717008431, + "narHash": "sha256-cRPG2hDyFlxsT2bGlINJOjhZ4VXPBZ3lryXXXgKZ+rQ=", "owner": "holochain", "repo": "holochain", - "rev": "c863c05b44632db5d3761ec256f43932371925fd", + "rev": "54e08e370c674c87d2dcac3146cd0aff76df93aa", "type": "github" }, "original": { diff --git a/package-lock.json b/package-lock.json index 66ff5b2e..bf6b2717 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "@holochain/tryorama", - "version": "0.16.0-dev.6", + "version": "0.16.0-dev.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@holochain/tryorama", - "version": "0.16.0-dev.6", + "version": "0.16.0-dev.7", "license": "MIT", "dependencies": { - "@holochain/client": "^0.17.0-dev.12", + "@holochain/client": "^0.17.0-rc.0", "get-port": "^6.1.2", "lodash": "^4.17.21", "uuid": "^8.3.2", @@ -538,9 +538,9 @@ } }, "node_modules/@holochain/client": { - "version": "0.17.0-dev.12", - "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.17.0-dev.12.tgz", - "integrity": "sha512-aEOkD4wtFeHAv5AiEkBfsiGeAujCyQf1yfvmtcdERnv73zgZhxCiZ0ZrEi46kdJhRHMXX/1Qkqo6VY8afrepfQ==", + "version": "0.17.0-rc.0", + "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.17.0-rc.0.tgz", + "integrity": "sha512-DyoAe6Gf7Atpn5f+WO8Lj08G4Vfu5p5U9PuUlOkm5gjfwTxHU6rOTAmdEWz1QcA2Yne3cmUj+qqpofTSVqB/Eg==", "dependencies": { "@bitgo/blake2b": "^3.2.4", "@holochain/serialization": "^0.1.0-beta-rc.3", diff --git a/package.json b/package.json index 2119cef4..ece3b580 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@holochain/tryorama", "description": "Toolset to manage Holochain conductors and facilitate running test scenarios", - "version": "0.16.0-dev.6", + "version": "0.16.0-dev.7", "author": "Holochain Foundation", "license": "MIT", "keywords": [ @@ -43,7 +43,7 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@holochain/client": "^0.17.0-dev.12", + "@holochain/client": "^0.17.0-rc.0", "get-port": "^6.1.2", "lodash": "^4.17.21", "uuid": "^8.3.2", diff --git a/ts/src/trycp/conductor/conductor.ts b/ts/src/trycp/conductor/conductor.ts index 3720bf65..a2851275 100644 --- a/ts/src/trycp/conductor/conductor.ts +++ b/ts/src/trycp/conductor/conductor.ts @@ -30,7 +30,6 @@ import { GrantedFunctions, GrantedFunctionsType, GrantZomeCallCapabilityRequest, - HolochainError, InstallAppRequest, IssueAppAuthenticationTokenRequest, ListAppsRequest, @@ -371,7 +370,7 @@ export class TryCpConductor implements IConductor { type: { register_dna: null }, data: request, }); - assert("dna_registered" in response.type); + assert("dna_registered" === response.type); return (response as AdminApiResponseDnaRegistered).data; }; @@ -388,7 +387,7 @@ export class TryCpConductor implements IConductor { type: { get_dna_definition: null }, data: dnaHash, }); - assert("dna_definition_returned" in response.type); + assert("dna_definition_returned" === response.type); return (response as AdminApiResponseDnasDefinitionReturned).data; }; @@ -405,7 +404,7 @@ export class TryCpConductor implements IConductor { type: { grant_zome_call_capability: null }, data: request, }); - assert("zome_call_capability_granted" in response.type); + assert("zome_call_capability_granted" === response.type); }; /** @@ -417,7 +416,7 @@ export class TryCpConductor implements IConductor { const response = await this.callAdminApi({ type: { generate_agent_pub_key: null }, }); - assert("agent_pub_key_generated" in response.type); + assert("agent_pub_key_generated" === response.type); return (response as AdminApiResponseAgentPubKeyGenerated).data; }; @@ -432,7 +431,7 @@ export class TryCpConductor implements IConductor { type: { install_app: null }, data, }); - assert("app_installed" in response.type); + assert("app_installed" === response.type); return (response as AdminApiResponseAppInstalled).data; }; @@ -447,7 +446,7 @@ export class TryCpConductor implements IConductor { type: { enable_app: null }, data: request, }); - assert("app_enabled" in response.type); + assert("app_enabled" === response.type); return (response as AdminApiResponseAppEnabled).data; }; @@ -462,7 +461,7 @@ export class TryCpConductor implements IConductor { type: { disable_app: null }, data: request, }); - assert("app_disabled" in response.type); + assert("app_disabled" === response.type); return (response as AdminApiResponseAppDisabled).data; }; @@ -477,7 +476,7 @@ export class TryCpConductor implements IConductor { type: { start_app: null }, data: request, }); - assert("app_started" in response.type); + assert("app_started" === response.type); return (response as AdminApiResponseAppStarted).data; }; @@ -492,7 +491,7 @@ export class TryCpConductor implements IConductor { type: { uninstall_app: null }, data: request, }); - assert("app_uninstalled" in response.type); + assert("app_uninstalled" === response.type); return (response as AdminApiResponseAppUninstalled).data; }; @@ -507,7 +506,7 @@ export class TryCpConductor implements IConductor { type: { update_coordinators: null }, data: request, }); - assert("coordinators_updated" in response.type); + assert("coordinators_updated" === response.type); return (response as AdminApiResponseCoordinatorsUpdated).data; }; @@ -522,7 +521,7 @@ export class TryCpConductor implements IConductor { type: { list_apps: null }, data: request, }); - assert("apps_listed" in response.type); + assert("apps_listed" === response.type); return (response as AdminApiResponseAppsListed).data; }; @@ -535,7 +534,7 @@ export class TryCpConductor implements IConductor { const response = await this.callAdminApi({ type: { list_cell_ids: null }, }); - assert("cell_ids_listed" in response.type); + assert("cell_ids_listed" === response.type); return (response as AdminApiResponseCellIdsListed).data; }; @@ -546,7 +545,7 @@ export class TryCpConductor implements IConductor { */ const listDnas = async () => { const response = await this.callAdminApi({ type: { list_dnas: null } }); - assert("dnas_listed" in response.type); + assert("dnas_listed" === response.type); return (response as AdminApiResponseDnasListed).data; }; @@ -566,7 +565,7 @@ export class TryCpConductor implements IConductor { type: { attach_app_interface: null }, data: request, }); - assert("app_interface_attached" in response.type); + assert("app_interface_attached" === response.type); return { port: (response as AdminApiResponseAppInterfaceAttached).data.port, }; @@ -581,7 +580,7 @@ export class TryCpConductor implements IConductor { const response = await this.callAdminApi({ type: { list_app_interfaces: null }, }); - assert("app_interfaces_listed" in response.type); + assert("app_interfaces_listed" === response.type); return (response as AdminApiResponseAppInterfacesListed).data; }; @@ -598,7 +597,7 @@ export class TryCpConductor implements IConductor { cell_id: req.cell_id || null, }, }); - assert("agent_info" in response.type); + assert("agent_info" === response.type); return (response as AdminApiResponseAgentInfo).data; }; @@ -612,7 +611,7 @@ export class TryCpConductor implements IConductor { type: { add_agent_info: null }, data: request, }); - assert("agent_info_added" in response.type); + assert("agent_info_added" === response.type); }; /** @@ -625,7 +624,7 @@ export class TryCpConductor implements IConductor { type: { delete_clone_cell: null }, data: request, }); - assert("clone_cell_deleted" in response.type); + assert("clone_cell_deleted" === response.type); }; /** @@ -656,7 +655,7 @@ export class TryCpConductor implements IConductor { type: { dump_full_state: null }, data: request, }); - assert("full_state_dumped" in response.type); + assert("full_state_dumped" === response.type); return (response as AdminApiResponseFullStateDumped).data; }; @@ -671,7 +670,7 @@ export class TryCpConductor implements IConductor { type: { dump_network_stats: null }, data: request, }); - assert("network_stats_dumped" in response.type); + assert("network_stats_dumped" === response.type); return (response as AdminApiResponseNetworkStatsDumped).data; }; @@ -686,7 +685,7 @@ export class TryCpConductor implements IConductor { type: { storage_info: null }, data: request, }); - assert("storage_info" in response.type); + assert("storage_info" === response.type); return (response as AdminApiResponseStorageInfo).data; }; @@ -697,7 +696,7 @@ export class TryCpConductor implements IConductor { type: { issue_app_authentication_token: null }, data: request, }); - assert("app_authentication_token_issued" in response.type); + assert("app_authentication_token_issued" === response.type); return (response as AdminApiResponseAppAuthenticationTokenIssued).data; }; @@ -744,7 +743,7 @@ export class TryCpConductor implements IConductor { const [keyPair, signingKey] = await generateSigningKeyPair(); const capSecret = await grantSigningKey( cellId, - functions || { [GrantedFunctionsType.All]: null }, + functions || GrantedFunctionsType.All, signingKey ); setSigningCredentials(cellId, { capSecret, keyPair, signingKey }); @@ -813,7 +812,7 @@ export class TryCpConductor implements IConductor { const response = await this.callAppApi(port, { type: { app_info: null }, }); - assert("app_info" in response.type); + assert("app_info" === response.type); return (response as AppApiResponseAppInfo).data; }; @@ -869,7 +868,7 @@ export class TryCpConductor implements IConductor { type: { create_clone_cell: null }, data: request, }); - assert("clone_cell_created" in response.type); + assert("clone_cell_created" === response.type); return (response as AppApiResponseCloneCellCreated).data; }; @@ -885,7 +884,7 @@ export class TryCpConductor implements IConductor { type: { enable_clone_cell: null }, data: request, }); - assert("clone_cell_enabled" in response.type); + assert("clone_cell_enabled" === response.type); return (response as AppApiResponseCloneCellEnabled).data; }; @@ -900,7 +899,7 @@ export class TryCpConductor implements IConductor { type: { disable_clone_cell: null }, data: request, }); - assert("clone_cell_disabled" in response.type); + assert("clone_cell_disabled" === response.type); return (response as AppApiResponseCloneCellDisabled).data; }; @@ -915,7 +914,7 @@ export class TryCpConductor implements IConductor { type: { network_info: null }, data: request, }); - assert("network_info" in response.type); + assert("network_info" === response.type); return (response as AppApiResponseNetworkInfo).data; }; diff --git a/ts/src/trycp/trycp-client.ts b/ts/src/trycp/trycp-client.ts index 61492fa4..f969e068 100644 --- a/ts/src/trycp/trycp-client.ts +++ b/ts/src/trycp/trycp-client.ts @@ -270,7 +270,7 @@ export class TryCpClient { deserializeApiResponse(response); // when the request fails, the response's type is "error" - if ("error" in deserializedApiResponse.type) { + if ("error" === deserializedApiResponse.type) { const errorMessage = `error response from Admin API\n${JSON.stringify( (deserializedApiResponse as ApiErrorResponse).data, null, diff --git a/ts/src/trycp/types.ts b/ts/src/trycp/types.ts index 5551b4fb..31a2ea88 100644 --- a/ts/src/trycp/types.ts +++ b/ts/src/trycp/types.ts @@ -256,7 +256,7 @@ export type TryCpApiResponse = * @public */ export interface ApiErrorResponse { - type: { error: null }; + type: "error"; data: { type: string; data: string }; } @@ -397,7 +397,7 @@ export type AppApiResponse = * @public */ export interface AppApiResponseAppInfo { - type: { app_info: null }; + type: "app_info"; data: AppInfoResponse; } @@ -405,7 +405,7 @@ export interface AppApiResponseAppInfo { * @public */ export interface AppApiResponseZomeCall { - type: { zome_call: null }; + type: "zome_call"; data: Uint8Array; } @@ -413,7 +413,7 @@ export interface AppApiResponseZomeCall { * @public */ export interface AppApiResponseCloneCellCreated { - type: { clone_cell_created: null }; + type: "clone_cell_created"; data: CreateCloneCellResponse; } @@ -421,7 +421,7 @@ export interface AppApiResponseCloneCellCreated { * @public */ export interface AppApiResponseCloneCellEnabled { - type: { clone_cell_enabled: null }; + type: "clone_cell_enabled"; data: EnableCloneCellResponse; } @@ -429,7 +429,7 @@ export interface AppApiResponseCloneCellEnabled { * @public */ export interface AppApiResponseCloneCellDisabled { - type: { clone_cell_disabled: null }; + type: "clone_cell_disabled"; data: DisableCloneCellResponse; } @@ -437,7 +437,7 @@ export interface AppApiResponseCloneCellDisabled { * @public */ export interface AppApiResponseNetworkInfo { - type: { network_info: null }; + type: "network_info"; data: NetworkInfoResponse; } @@ -549,7 +549,7 @@ export type AdminApiResponse = * @public */ export interface AdminApiResponseAgentInfo { - type: { agent_info: null }; + type: "agent_info"; data: AgentInfoResponse; } @@ -559,7 +559,7 @@ export interface AdminApiResponseAgentInfo { * @public */ export interface RequestDeleteCloneCell { - type: { delete_clone_cell: null }; + type: "delete_clone_cell"; data: DeleteCloneCellRequest; } @@ -567,7 +567,7 @@ export interface RequestDeleteCloneCell { * @public */ export interface AdminApiResponseDnaRegistered { - type: { dna_registered: null }; + type: "dna_registered"; data: HoloHash; } @@ -575,7 +575,7 @@ export interface AdminApiResponseDnaRegistered { * @public */ export interface AdminApiResponseFullStateDumped { - type: { full_state_dumped: null }; + type: "full_state_dumped"; data: FullStateDump; } @@ -583,7 +583,7 @@ export interface AdminApiResponseFullStateDumped { * @public */ export interface AdminApiResponseNetworkStatsDumped { - type: { network_stats_dumped: null }; + type: "network_stats_dumped"; data: DumpNetworkStatsResponse; } @@ -591,7 +591,7 @@ export interface AdminApiResponseNetworkStatsDumped { * @public */ export interface AdminApiResponseStorageInfo { - type: { storage_info: null }; + type: "storage_info"; data: StorageInfoResponse; } @@ -599,7 +599,7 @@ export interface AdminApiResponseStorageInfo { * @public */ export interface AdminApiResponseAppAuthenticationTokenIssued { - type: { app_authentication_token_issued: null }; + type: "app_authentication_token_issued"; data: IssueAppAuthenticationTokenResponse; } @@ -607,7 +607,7 @@ export interface AdminApiResponseAppAuthenticationTokenIssued { * @public */ export interface AdminApiResponseStateDumped { - type: { state_dumped: null }; + type: "state_dumped"; data: DumpStateResponse; } @@ -615,14 +615,14 @@ export interface AdminApiResponseStateDumped { * @public */ export interface AdminApiResponseZomeCallCapabilityGranted { - type: { zome_call_capability_granted: null }; + type: "zome_call_capability_granted"; } /** * @public */ export interface AdminApiResponseAgentPubKeyGenerated { - type: { agent_pub_key_generated: null }; + type: "agent_pub_key_generated"; data: HoloHash; } @@ -630,7 +630,7 @@ export interface AdminApiResponseAgentPubKeyGenerated { * @public */ export interface AdminApiResponseAppInstalled { - type: { app_installed: null }; + type: "app_installed"; data: AppInfo; } @@ -638,7 +638,7 @@ export interface AdminApiResponseAppInstalled { * @public */ export interface AdminApiResponseAppEnabled { - type: { app_enabled: null }; + type: "app_enabled"; data: EnableAppResponse; } @@ -646,7 +646,7 @@ export interface AdminApiResponseAppEnabled { * @public */ export interface AdminApiResponseAppDisabled { - type: { app_disabled: null }; + type: "app_disabled"; data: DisableAppResponse; } @@ -654,7 +654,7 @@ export interface AdminApiResponseAppDisabled { * @public */ export interface AdminApiResponseAppStarted { - type: { app_started: null }; + type: "app_started"; data: StartAppResponse; } @@ -662,7 +662,7 @@ export interface AdminApiResponseAppStarted { * @public */ export interface AdminApiResponseAppUninstalled { - type: { app_uninstalled: null }; + type: "app_uninstalled"; data: UninstallAppResponse; } @@ -670,7 +670,7 @@ export interface AdminApiResponseAppUninstalled { * @public */ export interface AdminApiResponseCoordinatorsUpdated { - type: { coordinators_updated: null }; + type: "coordinators_updated"; data: UpdateCoordinatorsResponse; } @@ -678,7 +678,7 @@ export interface AdminApiResponseCoordinatorsUpdated { * @public */ export interface AdminApiResponseAppsListed { - type: { apps_listed: null }; + type: "apps_listed"; data: ListAppsResponse; } @@ -686,7 +686,7 @@ export interface AdminApiResponseAppsListed { * @public */ export interface AdminApiResponseAppInterfacesListed { - type: { app_interfaces_listed: null }; + type: "app_interfaces_listed"; data: ListAppInterfacesResponse; } @@ -694,7 +694,7 @@ export interface AdminApiResponseAppInterfacesListed { * @public */ export interface AdminApiResponseCellIdsListed { - type: { cell_ids_listed: null }; + type: "cell_ids_listed"; data: ListCellIdsResponse; } @@ -702,7 +702,7 @@ export interface AdminApiResponseCellIdsListed { * @public */ export interface AdminApiResponseDnasDefinitionReturned { - type: { dna_definition_returned: null }; + type: "dna_definition_returned"; data: DnaDefinition; } @@ -710,7 +710,7 @@ export interface AdminApiResponseDnasDefinitionReturned { * @public */ export interface AdminApiResponseDnasListed { - type: { dnas_listed: null }; + type: "dnas_listed"; data: ListDnasResponse; } @@ -718,7 +718,7 @@ export interface AdminApiResponseDnasListed { * @public */ export interface AdminApiResponseAppInterfaceAttached { - type: { app_interface_attached: null }; + type: "app_interface_attached"; data: AttachAppInterfaceResponse; } @@ -726,12 +726,12 @@ export interface AdminApiResponseAppInterfaceAttached { * @public */ export interface AdminApiResponseAgentInfoAdded { - type: { agent_info_added: null }; + type: "agent_info_added"; } /** * @public */ export interface AdminApiResponseCloneCellDeleted { - type: { clone_cell_deleted: null }; + type: "clone_cell_deleted"; } diff --git a/ts/test/local/conductor.ts b/ts/test/local/conductor.ts index 99d94420..fbcf034d 100644 --- a/ts/test/local/conductor.ts +++ b/ts/test/local/conductor.ts @@ -102,7 +102,7 @@ test("Local Conductor - get app info with app ws", async (t) => { const appWs = await conductor.connectAppWs(issued.token, port); const appInfo = await appWs.appInfo(); assert(appInfo); - t.deepEqual(appInfo.status, { running: null }); + t.deepEqual(appInfo.status, "running"); await conductor.shutDown(); await stopLocalServices(servicesProcess); await cleanAllConductors(); @@ -123,7 +123,7 @@ test("Local Conductor - get app info with app agent ws", async (t) => { .issueAppAuthenticationToken({ installed_app_id: app.installed_app_id }); const appWs = await conductor.connectAppWs(issued.token, port); const appInfo = await appWs.appInfo(); - t.deepEqual(appInfo.status, { running: null }); + t.deepEqual(appInfo.status, "running"); await conductor.shutDown(); await stopLocalServices(servicesProcess); await cleanAllConductors(); diff --git a/ts/test/trycp/client.ts b/ts/test/trycp/client.ts index 511d71bb..012df7bb 100644 --- a/ts/test/trycp/client.ts +++ b/ts/test/trycp/client.ts @@ -307,7 +307,7 @@ test("TryCP Server - App API - get app info", async (t) => { const appInfo = await appWs.appInfo(); assert(appInfo); - t.deepEqual(appInfo.status, { running: null }); + t.deepEqual(appInfo.status, "running"); await conductor.disconnectAppInterface(port); await conductor.shutDown(); diff --git a/ts/test/trycp/conductor.ts b/ts/test/trycp/conductor.ts index a3a2c746..74cecfa2 100644 --- a/ts/test/trycp/conductor.ts +++ b/ts/test/trycp/conductor.ts @@ -373,7 +373,7 @@ test("TryCP Conductor - create and read an entry using the entry zome", async (t }); t.deepEqual( enabledAppResponse.app.status, - { running: null }, + "running", "enabled app response matches 'running'" ); @@ -545,7 +545,7 @@ test("TryCP Conductor - create and read an entry using the entry zome, 1 conduct }); t.deepEqual( enabledAppResponse1.app.status, - { running: null }, + "running", "enabled app response 1 matches 'running'" ); const enabledAppResponse2 = await conductor.adminWs().enableApp({ @@ -553,7 +553,7 @@ test("TryCP Conductor - create and read an entry using the entry zome, 1 conduct }); t.deepEqual( enabledAppResponse2.app.status, - { running: null }, + "running", "enabled app response 2 matches 'running'" );