diff --git a/Cargo.lock b/Cargo.lock index eb13126..ab666aa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] @@ -87,10 +87,10 @@ checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", - "cfg-if", + "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.32.0", + "object 0.32.1", "rustc-demangle", ] @@ -170,9 +170,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecheck" @@ -228,7 +228,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.18", + "semver 1.0.19", "serde", "serde_json", "thiserror", @@ -243,6 +243,12 @@ dependencies = [ "libc", ] +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + [[package]] name = "cfg-if" version = "1.0.0" @@ -251,15 +257,14 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.28" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "time", "windows-targets", ] @@ -299,7 +304,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 1.0.0", "libc", "scopeguard", "windows-sys 0.33.0", @@ -379,17 +384,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", + "cfg-if 1.0.0", ] [[package]] @@ -398,7 +393,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", ] @@ -410,7 +405,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 1.0.0", "crossbeam-utils", "memoffset 0.9.0", "scopeguard", @@ -422,7 +417,7 @@ version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -479,7 +474,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -501,7 +496,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -538,6 +533,12 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + [[package]] name = "either" version = "1.9.0" @@ -582,7 +583,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -620,9 +621,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fnv" @@ -692,7 +693,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -753,9 +754,9 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -801,9 +802,9 @@ checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[package]] name = "hdi" -version = "0.3.2-beta-rc.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2443eeec2e6d77d8417d12c3caefd6185692ea9b10bdd4667900cf4ed7615ce9" +checksum = "9b12f620a0d22b7dcd534a849f0024b0b47c4343b15f1c0ec02e37f4990f6f16" dependencies = [ "hdk_derive", "holo_hash", @@ -818,9 +819,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.2.2-beta-rc.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86c382d785534a3a61277e48a943973f16021a70f738e950ddae53d6817d2519" +checksum = "8d50da8f292a1b819ae6a7651e9c3cb2ec97f00729125ad9ec3d31df8154eef7" dependencies = [ "getrandom", "hdi", @@ -838,9 +839,9 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.2.2-beta-rc.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbdc88b91edecccec250134e63b244d275ba28336e982ae6a5f227a1148a76fe" +checksum = "fc855dc170fec9ca44d2b21cba90fb961ef92acadaae0f0c7d090312a6212552" dependencies = [ "darling 0.14.4", "heck", @@ -860,9 +861,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -872,14 +873,15 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a39f740985893adf2be5ad75987456ed2ce2f1d6d53cdf534e4fbe96ebae0940" +checksum = "2a5aa5c7b7c2d99ba6769e58ead10d5d4ead9036724a54a7fcea1c0203aac00e" dependencies = [ "base64", "blake2b_simd", "derive_more", "holochain_serialized_bytes", + "holochain_util", "holochain_wasmer_common", "kitsune_p2p_dht_arc", "serde", @@ -889,12 +891,13 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.2.2-beta-rc.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f782f25d9720ca8cae2dfee12110f6ef547dd70e27450df39ffcf5e3e57d418c" +checksum = "fdfffeca0c6dea328a1ff7097946a951035dd137f4b9ad0db00f5377cd6c9326" dependencies = [ "holo_hash", "holochain_serialized_bytes", + "holochain_util", "kitsune_p2p_dht", "kitsune_p2p_timestamp", "paste", @@ -929,6 +932,20 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "holochain_util" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c507f39c150414b64bb2fe8da311dc4e925435be887f8dfc3a97f8183d829878" +dependencies = [ + "cfg-if 0.1.10", + "derive_more", + "dunce", + "futures", + "num_cpus", + "once_cell", +] + [[package]] name = "holochain_wasmer_common" version = "0.0.84" @@ -960,9 +977,9 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.2.2-beta-rc.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ae391667386c28aace432af2b146171dd390a04144f42f800acc181e751965d" +checksum = "7b77f5caa760c7b34019739fb3b0a986a235fa0a09086b8eaff8cf7a72a2a6ce" dependencies = [ "holo_hash", "holochain_integrity_types", @@ -1037,9 +1054,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "ad227c3af19d4914570ad36d30409928b75967c298feb9ea1969db3a610bb14e" dependencies = [ "equivalent", "hashbrown 0.14.0", @@ -1095,12 +1112,13 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9845f57ef9189f403609ada819b26ca87e96ccf95fef02bebcdf83faa65b1924" +checksum = "cb0b2032c0ee5683bc4d4c7c705f545992655bd5dc6235e62d0f916197a5c0af" dependencies = [ "base64", "derive_more", + "holochain_util", "kitsune_p2p_dht_arc", "serde", "serde_bytes", @@ -1109,9 +1127,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a29e6b5eeb78b37d9d0040855603f3a00c6c7055d933a6e5b6b31aa9529b326" +checksum = "e15586a9b4f1ec2190d1b92b706995f15a871003955548e6be434cadd75413dd" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1121,9 +1139,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb834fef2af5271ec002e2726b2be7755e9d7b7b666a5dcfa3847b3a3a89cfd" +checksum = "bf6ff683970365a1c3b71192a116abeb986512ced906e4e25cc7ad40bf65b1b3" dependencies = [ "colored", "derivative", @@ -1145,9 +1163,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2d4d68c154cdc5391ea986eb278f5b34707908cf63674d9fe8e7142d49c449" +checksum = "f71f358459319708884f9295f122cb7b69a8589300fb232b573a36af04d0a7bc" dependencies = [ "derive_more", "gcollections", @@ -1158,9 +1176,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46a356525779ac9b2b4956cee7ea523c8723f1955596d5e070faac2723a0b65" +checksum = "3e173408aabd1fccedec2ba096b8feac7ef769c435294607f4ae5bc5b83ebc9e" dependencies = [ "chrono", "derive_more", @@ -1181,9 +1199,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "libloading" @@ -1191,7 +1209,7 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "winapi", ] @@ -1203,9 +1221,9 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "lock_api" @@ -1255,9 +1273,9 @@ dependencies = [ [[package]] name = "matrixmultiply" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" dependencies = [ "autocfg", "rawpointer", @@ -1265,9 +1283,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.2" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memmap2" @@ -1414,9 +1432,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -1443,7 +1461,7 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "redox_syscall", "smallvec", @@ -1458,9 +1476,9 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pest" -version = "2.7.3" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a4d085fd991ac8d5b05a147b437791b4260b76326baf0fc60cf7c9c27ecd33" +checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4" dependencies = [ "memchr", "thiserror", @@ -1511,9 +1529,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] @@ -1601,9 +1619,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -1611,14 +1629,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -1643,9 +1659,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", @@ -1655,9 +1671,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -1684,9 +1700,9 @@ dependencies = [ [[package]] name = "rend" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab" +checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" dependencies = [ "bytecheck", ] @@ -1759,14 +1775,14 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.18", + "semver 1.0.19", ] [[package]] name = "rustix" -version = "0.38.10" +version = "0.38.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" +checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" dependencies = [ "bitflags 2.4.0", "errno", @@ -1819,9 +1835,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" dependencies = [ "serde", ] @@ -1870,16 +1886,16 @@ checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.1", "itoa", "ryu", "serde", @@ -1891,7 +1907,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest", ] @@ -1938,9 +1954,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "stable_deref_trait" @@ -2009,9 +2025,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" dependencies = [ "proc-macro2", "quote", @@ -2036,7 +2052,7 @@ version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "fastrand", "redox_syscall", "rustix", @@ -2120,33 +2136,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", + "syn 2.0.37", ] [[package]] @@ -2183,7 +2188,7 @@ version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "log", "pin-project-lite", "tracing-attributes", @@ -2198,7 +2203,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -2219,9 +2224,9 @@ checksum = "683ba5022fe6dbd7133cad150478ccf51bdb6d861515181e5fc6b4323d4fa424" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" @@ -2231,15 +2236,15 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unzip-n" @@ -2272,20 +2277,14 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", ] -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2298,7 +2297,7 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "wasm-bindgen-macro", ] @@ -2313,7 +2312,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", "wasm-bindgen-shared", ] @@ -2335,7 +2334,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2348,9 +2347,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-encoder" -version = "0.32.0" +version = "0.33.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba64e81215916eaeb48fee292f29401d69235d62d8b8fd92a7b2844ec5ae5f7" +checksum = "34180c89672b3e4825c3a8db4b61a674f1447afd5fe2445b2d22c3d8b6ea086c" dependencies = [ "leb128", ] @@ -2361,7 +2360,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea8d8361c9d006ea3d7797de7bd6b1492ffd0f91a22430cfda6c1658ad57bedf" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "indexmap 1.9.3", "js-sys", "loupe", @@ -2474,7 +2473,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0358af9c154724587731175553805648d9acb8f6657880d165e378672b7e53" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "enum-iterator", "enumset", "leb128", @@ -2500,7 +2499,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "440dc3d93c9ca47865a4f4edd037ea81bf983b5796b59b3d712d844b32dbef15" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "enumset", "leb128", "loupe", @@ -2566,7 +2565,7 @@ checksum = "30d965fa61f4dc4cdb35a54daaf7ecec3563fbb94154a6c35433f879466247dd" dependencies = [ "backtrace", "cc", - "cfg-if", + "cfg-if 1.0.0", "corosensei", "enum-iterator", "indexmap 1.9.3", @@ -2594,9 +2593,9 @@ checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" [[package]] name = "wast" -version = "64.0.0" +version = "65.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a259b226fd6910225aa7baeba82f9d9933b6d00f2ce1b49b80fa4214328237cc" +checksum = "a55a88724cf8c2c0ebbf32c8e8f4ac0d6aa7ba6d73a1cfd94b254aa8f894317e" dependencies = [ "leb128", "memchr", @@ -2606,22 +2605,23 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.71" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53253d920ab413fca1c7dc2161d601c79b4fdf631d0ba51dd4343bf9b556c3f6" +checksum = "d83e1a8d86d008adc7bafa5cf4332d448699a08fcf2a715a71fbb75e2c5ca188" dependencies = [ "wast", ] [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix", ] [[package]] @@ -2642,9 +2642,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] diff --git a/Makefile b/Makefile index c80baac..2ad6ae1 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ version: update: rm -f Cargo.lock echo '⚙️ Updating hdk and hdi crate...' - cargo upgrade hdk@=$(shell jq .hdk ./version-manager.json) hdi@=$(shell jq .hdi ./version-manager.json) --workspace --pinned + cargo upgrade -p hdk@=$(shell jq .hdk ./version-manager.json) -p hdi@=$(shell jq .hdi ./version-manager.json) --pinned echo '⚙️ Updating holochain_version in nix...' # nix flake lock --override-input holochain github:holochain/holochain/$(HOLOCHAIN_REV) echo '⚙️ Building dnas and happ...' diff --git a/flake.lock b/flake.lock index a3fd6f2..9ab6c0b 100644 --- a/flake.lock +++ b/flake.lock @@ -17,23 +17,6 @@ "type": "github" } }, - "cargo-chef_2": { - "flake": false, - "locked": { - "lastModified": 1672901199, - "narHash": "sha256-MHTuR4aQ1rQaBKx1vWDy2wbvcT0ZAzpkVB2zylSC+k0=", - "owner": "LukeMathWalker", - "repo": "cargo-chef", - "rev": "5c9f11578a2e0783cce27666737d50f84510b8b5", - "type": "github" - }, - "original": { - "owner": "LukeMathWalker", - "ref": "main", - "repo": "cargo-chef", - "type": "github" - } - }, "cargo-rdme": { "flake": false, "locked": { @@ -51,29 +34,12 @@ "type": "github" } }, - "cargo-rdme_2": { - "flake": false, - "locked": { - "lastModified": 1675118998, - "narHash": "sha256-lrYWqu3h88fr8gG3Yo5GbFGYaq5/1Os7UtM+Af0Bg4k=", - "owner": "orium", - "repo": "cargo-rdme", - "rev": "f9dbb6bccc078f4869f45ae270a2890ac9a75877", - "type": "github" - }, - "original": { - "owner": "orium", - "ref": "v1.1.0", - "repo": "cargo-rdme", - "type": "github" - } - }, "crane": { "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", "nixpkgs": [ - "holochain", + "holochain-flake", "nixpkgs" ], "rust-overlay": "rust-overlay" @@ -92,55 +58,14 @@ "type": "github" } }, - "crane_2": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "holochain", - "holochain", - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1675475924, - "narHash": "sha256-KWdfV9a6+zG6Ij/7PZYLnomjBZZUu8gdRy+hfjGrrJQ=", - "owner": "ipetkov", - "repo": "crane", - "rev": "1bde9c762ebf26de9f8ecf502357c92105bc4577", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "crate2nix": { "flake": false, "locked": { - "lastModified": 1675642992, - "narHash": "sha256-uDBDZuiq7qyg82Udp82/r4zg5HKfIzBQqgl2U9THiQM=", + "lastModified": 1693149153, + "narHash": "sha256-HUszQcnIal1FFRAWraODDbxTp0HECwczRTD+Zf0v9o0=", "owner": "kolloch", "repo": "crate2nix", - "rev": "45fc83132c8c91c77a1cd61fe0c945411d1edba8", - "type": "github" - }, - "original": { - "owner": "kolloch", - "repo": "crate2nix", - "type": "github" - } - }, - "crate2nix_2": { - "flake": false, - "locked": { - "lastModified": 1675642992, - "narHash": "sha256-uDBDZuiq7qyg82Udp82/r4zg5HKfIzBQqgl2U9THiQM=", - "owner": "kolloch", - "repo": "crate2nix", - "rev": "45fc83132c8c91c77a1cd61fe0c945411d1edba8", + "rev": "8749f46953b46d44fd181b002399e4a20371f323", "type": "github" }, "original": { @@ -165,22 +90,6 @@ "type": "github" } }, - "empty_2": { - "flake": false, - "locked": { - "lastModified": 1683792623, - "narHash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=", - "owner": "steveej", - "repo": "empty", - "rev": "8e328e450e4cd32e072eba9e99fe92cf2a1ef5cf", - "type": "github" - }, - "original": { - "owner": "steveej", - "repo": "empty", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -213,38 +122,6 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -262,23 +139,6 @@ "type": "indirect" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1675295133, - "narHash": "sha256-dU8fuLL98WFXG0VnRgM00bqKX6CEPBLybhiIDIgO45o=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "bf53492df08f3178ce85e0c9df8ed8d03c030c9f", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -295,21 +155,6 @@ } }, "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "inputs": { "systems": "systems" }, @@ -327,25 +172,24 @@ "type": "github" } }, - "flake-utils_4": { - "inputs": { - "systems": "systems_2" - }, + "holochain": { + "flake": false, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "lastModified": 1694632043, + "narHash": "sha256-5QWUpWnwuzUi3hROrOZyQNla8iGdr+oGCH2nniRePBE=", + "owner": "holochain", + "repo": "holochain", + "rev": "1f59d33623031eefe76b5f3573970c9c33f21877", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "holochain", + "ref": "holochain-0.2.2", + "repo": "holochain", "type": "github" } }, - "holochain": { + "holochain-flake": { "inputs": { "cargo-chef": "cargo-chef", "cargo-rdme": "cargo-rdme", @@ -354,119 +198,41 @@ "empty": "empty", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "holochain": "holochain_2", - "lair": [ - "holochain", - "empty" - ], - "launcher": [ - "holochain", - "empty" - ], - "nix-filter": "nix-filter_2", - "nixpkgs": "nixpkgs_2", - "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", - "rust-overlay": "rust-overlay_4", - "scaffolding": [ - "holochain", - "empty" - ], - "versions": "versions_2" - }, - "locked": { - "lastModified": 1691105558, - "narHash": "sha256-Z2RFJUtoyr3146AzJQu2H3QR8Pws+bbkD8SauzCyBKA=", - "owner": "holochain", - "repo": "holochain", - "rev": "eda045eb4f72b450d07f6b54488a89809cc4ba79", - "type": "github" - }, - "original": { - "owner": "holochain", - "repo": "holochain", - "type": "github" - } - }, - "holochain_2": { - "inputs": { - "cargo-chef": "cargo-chef_2", - "cargo-rdme": "cargo-rdme_2", - "crane": "crane_2", - "crate2nix": "crate2nix_2", - "empty": "empty_2", - "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_2", "holochain": [ - "holochain", - "holochain", + "holochain-flake", "empty" ], "lair": [ - "holochain", - "holochain", + "holochain-flake", "empty" ], "launcher": [ - "holochain", - "holochain", + "holochain-flake", "empty" ], "nix-filter": "nix-filter", "nixpkgs": "nixpkgs", "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_3", + "repo-git": "repo-git", + "rust-overlay": "rust-overlay_2", "scaffolding": [ - "holochain", - "holochain", + "holochain-flake", "empty" ], - "versions": "versions" - }, - "locked": { - "lastModified": 1693408556, - "narHash": "sha256-GMTwHBFXNtJZpXOzw1YUcy08XLJAAKs6jXc3uMymhuw=", - "owner": "holochain", - "repo": "holochain", - "rev": "73e98ef459b59945f0c066ae660ef2b502a69da9", - "type": "github" - }, - "original": { - "owner": "holochain", - "ref": "holochain-0.2.2-beta-rc.0", - "repo": "holochain", - "type": "github" - } - }, - "holochain_3": { - "flake": false, - "locked": { - "lastModified": 1686257124, - "narHash": "sha256-SvXGHOr96ob/NfQCeVJ2J4LWc83qkZn+/pnE9qVNB+I=", - "owner": "holochain", - "repo": "holochain", - "rev": "db5b8b27da3bf296958c3bf54ac3950dc60a39c8", - "type": "github" + "versions": [ + "versions" + ] }, - "original": { - "owner": "holochain", - "ref": "holochain-0.1.5", - "repo": "holochain", - "type": "github" - } - }, - "holochain_4": { - "flake": false, "locked": { - "lastModified": 1690227710, - "narHash": "sha256-HRVEz5Ldg2+pqciOpZ9fNdMfU93r/3LmUsbTA9jfDIY=", + "lastModified": 1695549655, + "narHash": "sha256-nFC6bO1riBMiBiTuRRnRDPPlIDANhkUOupzI2GMlzl0=", "owner": "holochain", "repo": "holochain", - "rev": "3f594f1a5cef41e896b99b6b46d336d54da3299d", + "rev": "b72ada91c9153a53f3db5abdbf4de29de1ae2697", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.2.1", "repo": "holochain", "type": "github" } @@ -474,55 +240,21 @@ "lair": { "flake": false, "locked": { - "lastModified": 1682356264, - "narHash": "sha256-5ZYJ1gyyL3hLR8hCjcN5yremg8cSV6w1iKCOrpJvCmc=", - "owner": "holochain", - "repo": "lair", - "rev": "43be404da0fd9d57bf4429c44def405bd6490f61", - "type": "github" - }, - "original": { - "owner": "holochain", - "ref": "lair_keystore-v0.2.4", - "repo": "lair", - "type": "github" - } - }, - "lair_2": { - "flake": false, - "locked": { - "lastModified": 1682356264, - "narHash": "sha256-5ZYJ1gyyL3hLR8hCjcN5yremg8cSV6w1iKCOrpJvCmc=", + "lastModified": 1691746070, + "narHash": "sha256-CHsTI4yIlkfnYWx2sNgzAoDBvKTLIChybzyJNbB1sMU=", "owner": "holochain", "repo": "lair", - "rev": "43be404da0fd9d57bf4429c44def405bd6490f61", + "rev": "6ab41b60744515f1760669db6fc5272298a5f324", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.2.4", + "ref": "lair_keystore-v0.3.0", "repo": "lair", "type": "github" } }, "launcher": { - "flake": false, - "locked": { - "lastModified": 1677270906, - "narHash": "sha256-/xT//6nqhjpKLMMv41JE0W3H5sE9jKMr8Dedr88D4N8=", - "owner": "holochain", - "repo": "launcher", - "rev": "1ad188a43900c139e52df10a21e3722f41dfb967", - "type": "github" - }, - "original": { - "owner": "holochain", - "ref": "holochain-0.1", - "repo": "launcher", - "type": "github" - } - }, - "launcher_2": { "flake": false, "locked": { "lastModified": 1684183666, @@ -554,28 +286,13 @@ "type": "github" } }, - "nix-filter_2": { - "locked": { - "lastModified": 1675361037, - "narHash": "sha256-CTbDuDxFD3U3g/dWUB+r+B/snIe+qqP1R+1myuFGe2I=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "e1b2f96c2a31415f362268bc48c3fccf47dff6eb", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1686869522, - "narHash": "sha256-tbJ9B8WLCTnVP/LwESRlg0dII6Zyg2LmUU/mB9Lu98E=", + "lastModified": 1695145219, + "narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c67f006ea0e7d0265f16d7df07cc076fdffd91f", + "rev": "5ba549eafcf3e33405e5f66decd1a72356632b96", "type": "github" }, "original": { @@ -602,39 +319,6 @@ "type": "github" } }, - "nixpkgs-lib_2": { - "locked": { - "dir": "lib", - "lastModified": 1675183161, - "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1686869522, - "narHash": "sha256-tbJ9B8WLCTnVP/LwESRlg0dII6Zyg2LmUU/mB9Lu98E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7c67f006ea0e7d0265f16d7df07cc076fdffd91f", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "pre-commit-hooks-nix": { "flake": false, "locked": { @@ -651,40 +335,41 @@ "type": "github" } }, - "pre-commit-hooks-nix_2": { + "repo-git": { "flake": false, "locked": { - "lastModified": 1676513100, - "narHash": "sha256-MK39nQV86L2ag4TmcK5/+r1ULpzRLPbbfvWbPvIoYJE=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "5f0cba88ac4d6dd8cad5c6f6f1540b3d6a21a798", - "type": "github" + "narHash": "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY=", + "type": "file", + "url": "file:/dev/null" }, "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" + "type": "file", + "url": "file:/dev/null" } }, "root": { "inputs": { - "holochain": "holochain", + "flake-parts": [ + "holochain-flake", + "flake-parts" + ], + "holochain-flake": "holochain-flake", "nixpkgs": [ - "holochain", + "holochain-flake", "nixpkgs" - ] + ], + "versions": "versions" } }, "rust-overlay": { "inputs": { "flake-utils": [ - "holochain", + "holochain-flake", "crane", "flake-utils" ], "nixpkgs": [ - "holochain", + "holochain-flake", "crane", "nixpkgs" ] @@ -705,70 +390,18 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": [ - "holochain", - "holochain", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "holochain", - "holochain", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1675391458, - "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "holochain", - "holochain", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1689647697, - "narHash": "sha256-8ZX/DVpKLmr85FRKILb+2p+JuxfLQ49LjXG/gmwsoIU=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "ed2774a9131ddad12e552ba04bd92f87df04a28b", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_4": { - "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_2", "nixpkgs": [ - "holochain", + "holochain-flake", "nixpkgs" ] }, "locked": { - "lastModified": 1691029059, - "narHash": "sha256-QwVeE9YTgH3LmL7yw2V/hgswL6yorIvYSp4YGI8lZYM=", + "lastModified": 1695521529, + "narHash": "sha256-iTQGb6DNZPOg1C6DG4daXFKFiuUffl2rZ5YKzi0LK+4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "99df4908445be37ddb2d332580365fce512a7dcf", + "rev": "164b96162f83ae3be6a9f5577053e0d53e5f4e6a", "type": "github" }, "original": { @@ -780,28 +413,11 @@ "scaffolding": { "flake": false, "locked": { - "lastModified": 1692137048, - "narHash": "sha256-YfW4pthiUXJbP0ribr0fvCo9P/cB7xfhpB8MwfQ/JLI=", + "lastModified": 1695218406, + "narHash": "sha256-GInxKmQAuTTidJJilLclXwPgGftTSCzRCq1iTLEoTCI=", "owner": "holochain", "repo": "scaffolding", - "rev": "104a269d91c8935ded04c44f950b055b0ad39f94", - "type": "github" - }, - "original": { - "owner": "holochain", - "ref": "holochain-0.1", - "repo": "scaffolding", - "type": "github" - } - }, - "scaffolding_2": { - "flake": false, - "locked": { - "lastModified": 1690403339, - "narHash": "sha256-uML7Z/fJhv67HuoGaqEtYPKSjwnVPkY19SVgzX1lWZk=", - "owner": "holochain", - "repo": "scaffolding", - "rev": "dfac899a30e015a998c5e896cfd3552c050e95ae", + "rev": "34fb08b56a250c0825308e8d09780263fd15bdb1", "type": "github" }, "original": { @@ -826,62 +442,24 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "versions": { "inputs": { - "holochain": "holochain_3", + "holochain": "holochain", "lair": "lair", "launcher": "launcher", "scaffolding": "scaffolding" }, - "locked": { - "dir": "versions/0_1", - "lastModified": 1693290112, - "narHash": "sha256-jTxQx47Yq0gxySR7rG4zcdkZCGAotAEYxUmnlTU4N44=", - "owner": "holochain", - "repo": "holochain", - "rev": "83810feb3cc86f86cf71368767e6d25509c34479", - "type": "github" - }, - "original": { - "dir": "versions/0_1", - "owner": "holochain", - "repo": "holochain", - "type": "github" - } - }, - "versions_2": { - "inputs": { - "holochain": "holochain_4", - "lair": "lair_2", - "launcher": "launcher_2", - "scaffolding": "scaffolding_2" - }, "locked": { "dir": "versions/0_2", - "lastModified": 1693421895, - "narHash": "sha256-hQpaccN0Hn4AAZM3zLzqkCjjC3o/i6so9RLF426fvsE=", + "lastModified": 1695549655, + "narHash": "sha256-nFC6bO1riBMiBiTuRRnRDPPlIDANhkUOupzI2GMlzl0=", "owner": "holochain", "repo": "holochain", - "rev": "997962fc9246e33643ee33cfc1fc44db21afb53e", + "rev": "b72ada91c9153a53f3db5abdbf4de29de1ae2697", "type": "github" }, "original": { - "dir": "versions/0_1", + "dir": "versions/0_2", "owner": "holochain", "repo": "holochain", "type": "github" diff --git a/flake.nix b/flake.nix index 5b8f9e3..de610d4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,26 +1,36 @@ { + description = "Template for Holochain app development"; + inputs = { - nixpkgs.follows = "holochain/nixpkgs"; - holochain = { - url = "github:holochain/holochain"; - inputs.versions.url = "github:holochain/holochain?dir=versions/0_2"; - inputs.holochain.url = "github:holochain/holochain/holochain-0.2.2-beta-rc.0"; - }; + versions.url = "github:holochain/holochain?dir=versions/0_2"; + + holochain-flake.url = "github:holochain/holochain"; + holochain-flake.inputs.versions.follows = "versions"; + + nixpkgs.follows = "holochain-flake/nixpkgs"; + flake-parts.follows = "holochain-flake/flake-parts"; }; - outputs = inputs @ { ... }: - inputs.holochain.inputs.flake-parts.lib.mkFlake { inherit inputs; } + outputs = inputs: + inputs.flake-parts.lib.mkFlake { inherit inputs; } { - systems = builtins.attrNames inputs.holochain.devShells; + systems = builtins.attrNames inputs.holochain-flake.devShells; + perSystem = - { config + { inputs' + , config , pkgs , system , ... }: { + devShells.default = pkgs.mkShell { - inputsFrom = [ inputs.holochain.devShells.${system}.holonix ]; - packages = [ pkgs.nodejs-18_x pkgs.binaryen ]; + inputsFrom = [ inputs'.holochain-flake.devShells.holonix ]; + packages = [ + pkgs.nodejs-18_x + pkgs.binaryen + # more packages go here + ]; }; }; }; diff --git a/tests/unit-tests/endpoints.ts b/tests/unit-tests/endpoints.ts index 19b9c17..e4f3bb6 100644 --- a/tests/unit-tests/endpoints.ts +++ b/tests/unit-tests/endpoints.ts @@ -48,14 +48,7 @@ test('basic app functions', async (t) => { }) } catch (e) { console.log('return_failure response:', e) - t.deepEqual(e, { - type: 'error', - data: { - type: 'ribosome_error', - data: 'Wasm runtime error while working with Ribosome: RuntimeError: WasmError { file: "zomes/test/src/lib.rs", line: 62, error: Deserialize([192]) }', - }, - }) - t.pass() + t.true(JSON.stringify(e).includes("Deserialize([192])")) } let link_hash_1, link_hash_2, link_hash_3 diff --git a/tests/unit-tests/validation.ts b/tests/unit-tests/validation.ts index 859adfb..5344598 100644 --- a/tests/unit-tests/validation.ts +++ b/tests/unit-tests/validation.ts @@ -12,7 +12,7 @@ test('bad membrane proof', async (t) => { }) t.fail('App installation passed genesis with an invalid proof.') } catch (e) { - t.true(e.message.includes('Joining code invalid: passed failing string')) + t.true(JSON.stringify(e).includes('Joining code invalid: passed failing string')) } }) }) diff --git a/version-manager.json b/version-manager.json index 78c4e7a..85ce8a8 100644 --- a/version-manager.json +++ b/version-manager.json @@ -1,6 +1,6 @@ { - "version": "0.6.8", - "hdk": "0.2.2-beta-rc.0", - "hdi": "0.3.2-beta-rc.0", - "holochain_rev": "holochain-0.2.2-beta-rc.0" + "version": "0.6.9", + "hdk": "0.2.2", + "hdi": "0.3.2", + "holochain_rev": "holochain-0.2.2" } diff --git a/zomes/test-integrity/Cargo.toml b/zomes/test-integrity/Cargo.toml index 4ebfed3..0d37056 100644 --- a/zomes/test-integrity/Cargo.toml +++ b/zomes/test-integrity/Cargo.toml @@ -10,4 +10,4 @@ crate-type = [ "cdylib", "rlib" ] [dependencies] serde = "1.0" -hdi = "=0.3.2-beta-rc.0" +hdi = "=0.3.2" diff --git a/zomes/test/Cargo.toml b/zomes/test/Cargo.toml index 354b93e..f48f2e3 100644 --- a/zomes/test/Cargo.toml +++ b/zomes/test/Cargo.toml @@ -9,7 +9,7 @@ name = "test" crate-type = [ "cdylib", "rlib" ] [dependencies] -hdk = "=0.2.2-beta-rc.0" +hdk = "=0.2.2" serde = "1.0" thiserror = "1.0.22" test_integrity ={ path = "../test-integrity" }