diff --git a/Cargo.lock b/Cargo.lock index 3967854..7eaaf53 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -53,16 +53,16 @@ dependencies = [ ] [[package]] -name = "arrayref" -version = "0.3.7" +name = "anyhow" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] -name = "arrayvec" -version = "0.5.2" +name = "arrayref" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -84,7 +84,7 @@ checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object", @@ -93,9 +93,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bincode" @@ -127,6 +127,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + [[package]] name = "bitvec" version = "1.0.1" @@ -141,12 +147,12 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "0.5.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec", "constant_time_eq", ] @@ -198,6 +204,18 @@ name = "bytes" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +dependencies = [ + "serde", +] + +[[package]] +name = "bytesize" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" +dependencies = [ + "serde", +] [[package]] name = "camino" @@ -237,12 +255,6 @@ version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" -[[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" @@ -262,11 +274,21 @@ dependencies = [ "windows-targets 0.52.4", ] +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", +] + [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convert_case" @@ -287,7 +309,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "libc", "scopeguard", "windows-sys 0.33.0", @@ -317,7 +339,7 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98b022ed2a5913a38839dfbafe6cf135342661293b08049843362df4301261dc" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", @@ -385,6 +407,15 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "393bc73c451830ff8dbb3a07f61843d6cb41a084f9996319917c0b291ed785bb" +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + [[package]] name = "crossbeam-deque" version = "0.8.5" @@ -504,7 +535,7 @@ version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "hashbrown 0.14.3", "lock_api", "once_cell", @@ -522,6 +553,37 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -545,12 +607,27 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + [[package]] name = "dunce" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + [[package]] name = "either" version = "1.10.0" @@ -604,12 +681,50 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "fallible-iterator" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.52.0", +] + +[[package]] +name = "flate2" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "fnv" version = "1.0.7" @@ -753,13 +868,15 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -779,6 +896,12 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +[[package]] +name = "half" +version = "1.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + [[package]] name = "hashbrown" version = "0.12.3" @@ -835,9 +958,9 @@ dependencies = [ [[package]] name = "hdi" -version = "0.4.0-beta-dev.30" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9b10e28b62f081933f7c176ec16a2924afb05c74b56197882cff3b7ca24f84c" +checksum = "ece9b147d5e9ebc0a1f47a180a31436f4390a060ad46aa325d1fb851321ec3c7" dependencies = [ "getrandom", "hdk_derive", @@ -853,9 +976,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.3.0-beta-dev.34" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dbd50ff3d475e269285f01e04ad1bd341a7ce8c0619d1985e7de25fbd125094" +checksum = "01ba518e916e7eb29cf4a3b4c0d853fefab76bffc19939f8e0e5925581c67da7" dependencies = [ "getrandom", "hdi", @@ -873,12 +996,12 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.3.0-beta-dev.28" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0459e3e35a7b07477102c110d7d4fbe184b7ceb2e8212c43f04fcf58b268a1c0" +checksum = "93b26f45db67e2619836cd70a880bcf46d40ef844cd838d99ef6008e0f84e86c" dependencies = [ "darling 0.14.4", - "heck", + "heck 0.5.0", "holochain_integrity_types", "paste", "proc-macro-error", @@ -894,10 +1017,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.3.9" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hex" @@ -907,9 +1030,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.3.0-beta-dev.24" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9830117eeb0163bec46835d876f4ae4e463fb1331071d76a3f4fc49f54991546" +checksum = "acfa694a0138aafda54ce76033168cf182158b7628f7e70b12af0ea0ad20d896" dependencies = [ "base64", "blake2b_simd", @@ -925,16 +1048,15 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.3.0-beta-dev.28" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3e8650ee8b7d19e26bc769c0831a55e89acf54b480f122d7378b52f4a7a322" +checksum = "cc3c84cd0ee02fa15e037df4fd81c170cb956792732823416c61b0f4e3d2e177" dependencies = [ "holo_hash", "holochain_secure_primitive", "holochain_serialized_bytes", "holochain_util", "kitsune_p2p_timestamp", - "paste", "serde", "serde_bytes", "subtle", @@ -943,9 +1065,9 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.3.0-beta-dev.25" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fa99c5d38bb8fe463dd0284e2123ad14405f2a62146c4aaa809d5b24134711" +checksum = "cbbb63a7658f55a0640a04ad675d7dc6979b7eb7f0a889882efa6e9ac95fd606" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -954,9 +1076,9 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.3.0-beta-dev.22" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc25ba91f7898688245db538693d7b26504f91df24709111bb3b1d7506af01a" +checksum = "d2495193fe4700ccd3fda02acc7f982890938b28deb264c9212df3868efd9e0e" dependencies = [ "paste", "serde", @@ -965,9 +1087,9 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes" -version = "0.0.53" +version = "0.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7a5fc7c745a107f8ebcb04caab7a6b7a8463e2811f07ced19c281977583de7" +checksum = "719fa847cf9f772f7e8e1a6f11d801e1383cc5af043292042665da9a6ce5c742" dependencies = [ "holochain_serialized_bytes_derive", "rmp-serde", @@ -980,9 +1102,9 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes_derive" -version = "0.0.53" +version = "0.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3e0cf02005cbf0f514476d40e02125b26df6d4922d7a2c48a84fc588539d71" +checksum = "3e6a221b5650251e09ef0b9223cf39e72b5222492cffc6bb4bdf36b2a6bc91aa" dependencies = [ "quote", "syn 1.0.109", @@ -990,24 +1112,23 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.3.0-beta-dev.5" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6225aded80caf004c2214e38b39fb2459ee9a7a8fcd0d09146f49ae0771f0" +checksum = "df91c909ed1bcf3dfc55db8dfa8361dba9c4e518c80f9cd30b5c00a3e9c84c62" dependencies = [ - "cfg-if 0.1.10", - "derive_more", + "cfg-if", + "colored", "dunce", "futures", - "getrandom", - "num_cpus", "once_cell", + "tracing", ] [[package]] name = "holochain_wasmer_common" -version = "0.0.92" +version = "0.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72007fd2a72d77e76ffa494e5847bf6e893e25e73fe1d1de902e1b8d5033a64e" +checksum = "81862ba8234412864273d21983c99af4e8b97739a5e4c354030470acdc6b431c" dependencies = [ "holochain_serialized_bytes", "serde", @@ -1019,9 +1140,9 @@ dependencies = [ [[package]] name = "holochain_wasmer_guest" -version = "0.0.92" +version = "0.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c429e84a19ee446f47541a6fed10e1a4376a8a8ba6d3dbff7d07e4a7bb4c85f" +checksum = "fce20cd8eb137a355394e57612cf2cf7836dab57948d56af9f9fe080ea168d41" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", @@ -1033,21 +1154,18 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.3.0-beta-dev.30" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a05fba98a0c43609c39df2c93d109d9e845eb30663476cb031588122ba5854a4" +checksum = "526a51ed0b962c2579ff57106fe2dd032a9a1cf2e4820f3dc2f2b37a59b0cc66" dependencies = [ "derive_more", "holo_hash", "holochain_integrity_types", "holochain_nonce", - "holochain_secure_primitive", "holochain_serialized_bytes", "holochain_wasmer_common", - "kitsune_p2p_bin_data", "kitsune_p2p_block", "kitsune_p2p_timestamp", - "paste", "serde", "serde_bytes", "subtle", @@ -1117,6 +1235,7 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", + "serde", ] [[package]] @@ -1127,6 +1246,7 @@ checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", "hashbrown 0.14.3", + "serde", ] [[package]] @@ -1177,9 +1297,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.3.0-beta-dev.18" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396bb848a20db92dfcf7d712a73a82fc2c88f7206479136247e8363f1f635b21" +checksum = "e5d57481371cae8f3afdc4f8b0791aa04c70afe375c8678ca2bf966637220b6a" dependencies = [ "base64", "derive_more", @@ -1192,9 +1312,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.3.0-beta-dev.20" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb1fc5e712ee62d90b98a37accfee799fdd90e212532f6f4840f7e2e08cf25c" +checksum = "10105ffc84c408d89a39180460fa9adcfcff09dedb511703efdab050fdbfe40c" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1203,9 +1323,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.3.0-beta-dev.17" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5128eb7823b352d0bc24038960c36717510d773e754476b45515d8eec4d1646" +checksum = "6be19fb54f5f3adb7ef461d51d073f22f3e7343952a31523d04799bceb695ee2" dependencies = [ "derive_more", "gcollections", @@ -1217,9 +1337,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.3.0-beta-dev.8" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d587124090ca8e4ab28f3dd3d65aa35fcc72403b7dad4fc790751efd04fbe3" +checksum = "4f0ae9c213de76b54f2a7fcfd1f379b106b45efef1c4365110d7df96a531d69e" dependencies = [ "chrono", "serde", @@ -1239,9 +1359,21 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litrs" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" [[package]] name = "lock_api" @@ -1334,16 +1466,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "object" version = "0.32.2" @@ -1375,7 +1497,7 @@ version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", @@ -1530,7 +1652,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1580,7 +1702,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "mach", "winapi", @@ -1627,9 +1749,9 @@ dependencies = [ [[package]] name = "rmp" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -1638,9 +1760,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "0.15.5" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723ecff9ad04f4ad92fe1c8ca6c20d2196d9286e9c60727c4cb5511629260e9d" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" dependencies = [ "byteorder", "rmp", @@ -1662,6 +1784,19 @@ dependencies = [ "semver 1.0.22", ] +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -1683,6 +1818,31 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schemars" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" +dependencies = [ + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "schemars_derive" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.53", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -1730,9 +1890,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -1766,11 +1926,32 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", +] + [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "serde_derive_internals" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", @@ -1789,13 +1970,46 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap 2.2.5", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + [[package]] name = "sha-1" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", "cpufeatures", "digest", ] @@ -1816,7 +2030,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e63e6744142336dfb606fe2b068afa2e1cca1ee6a5d8377277a92945d81fa331" dependencies = [ - "bitflags", + "bitflags 1.3.2", "itertools 0.8.2", "proc-macro2", "quote", @@ -1868,7 +2082,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -1919,12 +2133,36 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "tar" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +dependencies = [ + "filetime", + "libc", + "xattr", +] + [[package]] name = "target-lexicon" version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +[[package]] +name = "tempfile" +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.52.0", +] + [[package]] name = "test-fuzz" version = "3.0.4" @@ -2017,6 +2255,40 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap 2.2.5", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "toolchain_find" version = "0.2.0" @@ -2107,6 +2379,12 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + [[package]] name = "unzip-n" version = "0.1.2" @@ -2127,6 +2405,7 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] @@ -2169,7 +2448,7 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -2228,12 +2507,12 @@ dependencies = [ [[package]] name = "wasmer" -version = "4.2.4" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce45cc009177ca345a6d041f9062305ad467d15e7d41494f5b81ab46d62d7a58" +checksum = "6ce4a267a570e121c9375136adefa2c48810273907de9c6817bc19db4d6144bc" dependencies = [ "bytes", - "cfg-if 1.0.0", + "cfg-if", "derivative", "indexmap 1.9.3", "js-sys", @@ -2244,6 +2523,7 @@ dependencies = [ "shared-buffer", "target-lexicon", "thiserror", + "tracing", "wasm-bindgen", "wasmer-compiler", "wasmer-compiler-cranelift", @@ -2256,13 +2536,13 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "4.2.4" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e044f6140c844602b920deb4526aea3cc9c0d7cf23f00730bb9b2034669f522a" +checksum = "b9c23098e86ef1038155684fe50f0c1079a0e2a2e70f115b789df17e6ba98d20" dependencies = [ "backtrace", "bytes", - "cfg-if 1.0.0", + "cfg-if", "enum-iterator", "enumset", "lazy_static", @@ -2279,13 +2559,14 @@ dependencies = [ "wasmer-vm", "wasmparser", "winapi", + "xxhash-rust", ] [[package]] name = "wasmer-compiler-cranelift" -version = "4.2.4" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ce02358eb44a149d791c1d6648fb7f8b2f99cd55e3c4eef0474653ec8cc889" +checksum = "95287b79973ad5f485215733ef9f0d4bb951a6b7e655585d2bd3d4a4ba1253c9" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2300,11 +2581,33 @@ dependencies = [ "wasmer-types", ] +[[package]] +name = "wasmer-config" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b4a632496950fde9ad821e195ef1a301440076f7c7d80de55239a140359bcbd" +dependencies = [ + "anyhow", + "bytesize", + "derive_builder", + "hex", + "indexmap 2.2.5", + "schemars", + "semver 1.0.22", + "serde", + "serde_cbor", + "serde_json", + "serde_yaml", + "thiserror", + "toml", + "url", +] + [[package]] name = "wasmer-derive" -version = "4.2.4" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c782d80401edb08e1eba206733f7859db6c997fc5a7f5fb44edc3ecd801468f6" +checksum = "e48f36aeeecb655f15fdd358bdf6e4cec27df181468fa4226084157e8462bd5e" dependencies = [ "proc-macro-error", "proc-macro2", @@ -2314,29 +2617,34 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "4.2.4" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd09e80d4d74bb9fd0ce6c3c106b1ceba1a050f9948db9d9b78ae53c172d6157" +checksum = "83cb97b6b20084757a2a8d548dc0d4179c3fe9e2d711740423a1e6aa3f8b9091" dependencies = [ "bytecheck", "enum-iterator", "enumset", + "getrandom", + "hex", "indexmap 1.9.3", "more-asserts", "rkyv", + "sha2", "target-lexicon", "thiserror", + "webc", + "xxhash-rust", ] [[package]] name = "wasmer-vm" -version = "4.2.4" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcd8a4fd36414a7b6a003dbfbd32393bce3e155d715dd877c05c1b7a41d224d" +checksum = "bc1e19d986844b17b927ec8b0c7f3da6a7a2c2cb3b0f8ca5d4cb1a1f71bfb124" dependencies = [ "backtrace", "cc", - "cfg-if 1.0.0", + "cfg-if", "corosensei", "crossbeam-queue", "dashmap", @@ -2358,12 +2666,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.6.0", + "indexmap 2.2.5", + "semver 1.0.22", ] [[package]] @@ -2387,6 +2696,35 @@ dependencies = [ "wast", ] +[[package]] +name = "webc" +version = "6.0.0-rc2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb3e2ccb43d303c5bd48f31db7a129481a9aaa5343d623f92951751df190df81" +dependencies = [ + "anyhow", + "base64", + "bytes", + "cfg-if", + "document-features", + "flate2", + "indexmap 1.9.3", + "libc", + "once_cell", + "semver 1.0.22", + "serde", + "serde_cbor", + "serde_json", + "sha2", + "shared-buffer", + "tar", + "tempfile", + "thiserror", + "toml", + "url", + "wasmer-config", +] + [[package]] name = "winapi" version = "0.3.9" @@ -2440,6 +2778,15 @@ dependencies = [ "windows_x86_64_msvc 0.33.0", ] +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + [[package]] name = "windows-sys" version = "0.52.0" @@ -2593,6 +2940,15 @@ version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + [[package]] name = "wyz" version = "0.5.1" @@ -2601,3 +2957,20 @@ checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + +[[package]] +name = "xxhash-rust" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" diff --git a/Cargo.toml b/Cargo.toml index bbfa84f..2bf1784 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,8 +3,8 @@ members = ["zomes/*/*"] resolver = "2" [workspace.dependencies] -hdi = "0.4.0-beta-dev.30" -hdk = "0.3.0-beta-dev.34" +hdi = "0.4.2" +hdk = "0.3.2" [profile.dev] opt-level = "z" diff --git a/flake.lock b/flake.lock index 8cce201..9f006db 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "cargo-chef": { "flake": false, "locked": { - "lastModified": 1695999026, - "narHash": "sha256-UtLoZd7YBRSF9uXStfC3geEFqSqZXFh1rLHaP8hre0Y=", + "lastModified": 1716357509, + "narHash": "sha256-7iSxwTaJnDLqaFu4ydxkx7ivhDvSQQcXWKawv/e4NHE=", "owner": "LukeMathWalker", "repo": "cargo-chef", - "rev": "6e96ae5cd023b718ae40d608981e50a6e7d7facf", + "rev": "b468537839bfc7c23d744b85d7a5090954626550", "type": "github" }, "original": { @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1707363936, - "narHash": "sha256-QbqyvGFYt84QNOQLOOTWplZZkzkyDhYrAl/N/9H0vFM=", + "lastModified": 1721322122, + "narHash": "sha256-a0G1NvyXGzdwgu6e1HQpmK5R5yLsfxeBe07nNDyYd+g=", "owner": "ipetkov", "repo": "crane", - "rev": "9107434eda6991e9388ad87b815dafa337446d16", + "rev": "8a68b987c476a33e90f203f0927614a75c3f47ea", "type": "github" }, "original": { @@ -58,11 +58,11 @@ "crate2nix": { "flake": false, "locked": { - "lastModified": 1706909251, - "narHash": "sha256-T7G9Uhh77P0kKri/u+Mwa/4YnXwdPsJSwYCiJCCW+fs=", + "lastModified": 1719760654, + "narHash": "sha256-L3VIJ9182wsYJqP27xO5qiWwfK+a00x0JHiy8ns3NQE=", "owner": "kolloch", "repo": "crate2nix", - "rev": "15656bb6cb15f55ee3344bf4362e6489feb93db6", + "rev": "a6ca1e58132bab26fc08572f22a34bbb86f4d91d", "type": "github" }, "original": { @@ -108,11 +108,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -120,24 +120,6 @@ "type": "indirect" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "holochain": { "inputs": { "cargo-chef": "cargo-chef", @@ -173,11 +155,11 @@ ] }, "locked": { - "lastModified": 1710852754, - "narHash": "sha256-SOLQaEm17wIWIA4l9uAZ06tKcM84pMtJtVUQofKiDeU=", + "lastModified": 1723014224, + "narHash": "sha256-C+RlNvxUjBSoKH6gksLUklRePVpcgIFMCDvuDMJiduM=", "owner": "holochain", "repo": "holochain", - "rev": "ddeb601b7276db57990a76defbb2966229cc6f3d", + "rev": "6c25427ead470e72d785a26a26f3a2e0e7154d0e", "type": "github" }, "original": { @@ -189,16 +171,16 @@ "holochain_2": { "flake": false, "locked": { - "lastModified": 1710291013, - "narHash": "sha256-etoY8oXg3PXFMeZgkixxsKJjH1Uauua366y2TN8+fms=", + "lastModified": 1722347117, + "narHash": "sha256-Jv4DxaVtdbO+fOD4woFoepCCOtRN/HF94xJSwViz3ck=", "owner": "holochain", "repo": "holochain", - "rev": "15516823c6f5e0ec7f032e614d804b2376fe0867", + "rev": "97d86050b177829b623461970db5c3b64fbd74c1", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3.0-beta-dev.40", + "ref": "holochain-0.3.2", "repo": "holochain", "type": "github" } @@ -206,16 +188,16 @@ "lair": { "flake": false, "locked": { - "lastModified": 1709335027, - "narHash": "sha256-rKMhh7TLuR1lqze2YFWZCGYKZQoB4dZxjpX3sb7r7Jk=", + "lastModified": 1717684904, + "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", "owner": "holochain", "repo": "lair", - "rev": "826be915efc839d1d1b8a2156b158999b8de8d5b", + "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.4.4", + "ref": "lair_keystore-v0.4.5", "repo": "lair", "type": "github" } @@ -223,27 +205,27 @@ "launcher": { "flake": false, "locked": { - "lastModified": 1706294585, - "narHash": "sha256-92Qc6hBMFfHo3w1m1+EpNAAV+7whpkgRHiGqNiXaMCg=", + "lastModified": 1717431387, + "narHash": "sha256-+VvWwBmxcgePV1L6kU2mSkg3emMiMgpdQnCqvQJkRPk=", "owner": "holochain", - "repo": "launcher", - "rev": "51a45a7141abc98a861b34b288b384f50f359485", + "repo": "hc-launch", + "rev": "9d9cab5e6b57e1c278113921ff203e515c8bbd2e", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-weekly", - "repo": "launcher", + "ref": "holochain-0.3", + "repo": "hc-launch", "type": "github" } }, "nix-filter": { "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", "owner": "numtide", "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", "type": "github" }, "original": { @@ -254,11 +236,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710631334, - "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", + "lastModified": 1722630782, + "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", + "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", "type": "github" }, "original": { @@ -269,30 +251,24 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", - "type": "github" + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, "pre-commit-hooks-nix": { "flake": false, "locked": { - "lastModified": 1707297608, - "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=", + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "0db2e67ee49910adfa13010e7f012149660af7f0", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", "type": "github" }, "original": { @@ -325,18 +301,17 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": [ "holochain", "nixpkgs" ] }, "locked": { - "lastModified": 1710814282, - "narHash": "sha256-nWaKhMQackiO0M8504HSx/E7I76C2r0/g4wqZf4hp24=", + "lastModified": 1722738111, + "narHash": "sha256-cWD5pCs9AYb+512/yCx9D0Pl5KcmyuXHeJpsDw/D1vs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8c72f33c23c8e537dd59088c4560222c43eedaca", + "rev": "27ec296d93cb4b2d03e8cbd019b1b4cde8c34280", "type": "github" }, "original": { @@ -348,35 +323,20 @@ "scaffolding": { "flake": false, "locked": { - "lastModified": 1710798431, - "narHash": "sha256-bKrJo25rGGxgq7hgpEbx9ATBkfTsuNdj9DuRrD7bWSQ=", + "lastModified": 1722862548, + "narHash": "sha256-8FXBPbL2qXiDAhQbbPehRDuauEUb9V3Uc7K4YjC0ev4=", "owner": "holochain", "repo": "scaffolding", - "rev": "2524ee6d1cdd9ff09223f80601b23473a8b279cd", + "rev": "fc557aa8164d23c5638faa5fe5ed99d30e8404b7", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-weekly", + "ref": "holochain-0.3", "repo": "scaffolding", "type": "github" } }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "versions": { "inputs": { "holochain": "holochain_2", @@ -385,16 +345,16 @@ "scaffolding": "scaffolding" }, "locked": { - "dir": "versions/weekly", - "lastModified": 1710852754, - "narHash": "sha256-SOLQaEm17wIWIA4l9uAZ06tKcM84pMtJtVUQofKiDeU=", + "dir": "versions/0_3", + "lastModified": 1723014224, + "narHash": "sha256-C+RlNvxUjBSoKH6gksLUklRePVpcgIFMCDvuDMJiduM=", "owner": "holochain", "repo": "holochain", - "rev": "ddeb601b7276db57990a76defbb2966229cc6f3d", + "rev": "6c25427ead470e72d785a26a26f3a2e0e7154d0e", "type": "github" }, "original": { - "dir": "versions/weekly", + "dir": "versions/0_3", "owner": "holochain", "repo": "holochain", "type": "github" diff --git a/flake.nix b/flake.nix index 0624d92..47f5d03 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { description = "Template for Holochain app development"; - + inputs = { nixpkgs.follows = "holochain/nixpkgs"; - versions.url = "github:holochain/holochain?dir=versions/weekly"; + versions.url = "github:holochain/holochain?dir=versions/0_3"; holochain = { url = "github:holochain/holochain"; @@ -12,34 +12,18 @@ }; }; - outputs = inputs @ { ... }: - inputs.holochain.inputs.flake-parts.lib.mkFlake - { - inherit inputs; - } - { - systems = builtins.attrNames inputs.holochain.devShells; - perSystem = - { inputs' - , config - , pkgs - , system - , lib - , ... - }: { - devShells.default = pkgs.mkShell { - inputsFrom = [ inputs'.holochain.devShells.holonix ]; - packages = [ - pkgs.nodejs-18_x - # more packages go here - pkgs.cargo-nextest - ]; - - shellHook = '' - unset CARGO_TARGET_DIR - unset CARGO_HOME - ''; - }; - }; + outputs = inputs@{ ... }: + inputs.holochain.inputs.flake-parts.lib.mkFlake { inherit inputs; } { + systems = builtins.attrNames inputs.holochain.devShells; + perSystem = { inputs', config, pkgs, system, lib, ... }: { + devShells.default = pkgs.mkShell { + inputsFrom = [ inputs'.holochain.devShells.holonix ]; + packages = [ + pkgs.nodejs-18_x + # more packages go here + pkgs.cargo-nextest + ]; + }; }; + }; } diff --git a/package-lock.json b/package-lock.json index b1d86b8..1405c71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1070,9 +1070,9 @@ "link": true }, "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.1", + "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.17.1.tgz", + "integrity": "sha512-Jvh6DN+OdktV3KQH+tioRzvPT+LWJFBp1klMFG9vaccphIVvJN1LepJfRB8OyxW5iGAZ/TFCTwF19XSJuM1fQQ==", "dependencies": { "@bitgo/blake2b": "^3.2.4", "@holochain/serialization": "^0.1.0-beta-rc.3", @@ -1195,11 +1195,11 @@ "integrity": "sha512-DJx4V2KXHVLciyOGjOYKTM/JLBpBEZ3RsPIRCgf7qmwhQdxXvhi2p+oFFRD51yUT5uC1/MzIVeJCl/R60PwFbw==" }, "node_modules/@holochain/tryorama": { - "version": "0.16.0-dev.6", - "resolved": "https://registry.npmjs.org/@holochain/tryorama/-/tryorama-0.16.0-dev.6.tgz", - "integrity": "sha512-5ltiUWqGze+530tlspIvoGBQ2TUp3pru7MX2ywY9XfCsuiPXrOANeOBe1Y9GnqtMX2GGqCiQ9NrAJUfIqg4N2w==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@holochain/tryorama/-/tryorama-0.16.0.tgz", + "integrity": "sha512-5cp01iHqj/DL7cujXanZ85x4M9LZj27k333qGJUg1JfBJ5kfS89kdQLGIM6h97lvuBqqkhTL4pq7M2Mo6MLe8A==", "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", @@ -1274,6 +1274,14 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "node_modules/@lit-labs/router": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@lit-labs/router/-/router-0.1.3.tgz", + "integrity": "sha512-G+HHo57KsArG58LOI8DLtipFfC9tVV4lGaDy2I8hYQvS2P/pV5wQObrpFYPZswse8D47y8VuHNXNdVPQOVc5MA==", + "dependencies": { + "lit": "^2.0.0 || ^3.0.0" + } + }, "node_modules/@lit-labs/ssr-dom-shim": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.2.0.tgz", @@ -8237,10 +8245,10 @@ }, "packages/client": { "name": "@holochain-syn/client", - "version": "0.300.0-dev.0", + "version": "0.300.0", "dependencies": { - "@holochain-open-dev/utils": "^0.300.0-dev.0", - "@holochain/client": "=0.17.0-dev.7", + "@holochain-open-dev/utils": "^0.300.0", + "@holochain/client": "^0.17.0", "@msgpack/msgpack": "^2.7.0", "automerge": "^1.0.1-preview.7" }, @@ -8250,36 +8258,30 @@ "typescript": "^4.7.4" } }, - "packages/client/node_modules/@holochain/client": { - "version": "0.17.0-dev.7", - "license": "CAL-1.0", + "packages/client/node_modules/@holochain-open-dev/utils": { + "version": "0.300.2", + "resolved": "https://registry.npmjs.org/@holochain-open-dev/utils/-/utils-0.300.2.tgz", + "integrity": "sha512-wdJtqUAsiYmKNPLVfrAX6rP+ufF844v7bKGu1y5l1zQuMdGWPGkH43FUIy5xe6NrWWY2pz3W8D/IyXc8mnBc1w==", "dependencies": { - "@bitgo/blake2b": "^3.2.4", - "@holochain/serialization": "^0.1.0-beta-rc.3", + "@holochain/client": "^0.17.1", "@msgpack/msgpack": "^2.8.0", - "@tauri-apps/api": "^1.4.0", + "blakejs": "^1.2.1", "emittery": "^1.0.1", - "isomorphic-ws": "^5.0.0", - "js-base64": "^3.7.5", - "libsodium-wrappers": "^0.7.13", "lodash-es": "^4.17.21", - "ws": "^8.14.2" - }, - "engines": { - "node": ">=18.0.0 || >=20.0.0" + "sort-keys": "^5.0.0" } }, "packages/core": { "name": "@holochain-syn/core", - "version": "0.300.0-dev.1", - "dependencies": { - "@holochain-open-dev/elements": "=0.300.0-dev.0", - "@holochain-open-dev/profiles": "^0.300.0-dev.0", - "@holochain-open-dev/stores": "=0.300.0-dev.1", - "@holochain-open-dev/utils": "^0.16.5", - "@holochain-syn/client": "^0.300.0-dev.0", - "@holochain-syn/store": "^0.300.0-dev.1", - "@holochain/client": "=0.17.0-dev.7", + "version": "0.300.0", + "dependencies": { + "@holochain-open-dev/elements": "^0.300.0", + "@holochain-open-dev/profiles": "^0.300.0-dev", + "@holochain-open-dev/stores": "^0.300.0", + "@holochain-open-dev/utils": "^0.300.0", + "@holochain-syn/client": "^0.300.0", + "@holochain-syn/store": "^0.300.0", + "@holochain/client": "^0.17.0", "@lit/context": "^1.0.0", "@lit/localize": "^0.12.0", "@scoped-elements/cytoscape": "^0.2.0", @@ -8294,66 +8296,60 @@ "typescript": "^4.7.4" } }, - "packages/core/node_modules/@holochain-open-dev/utils": { - "version": "0.16.5", - "resolved": "https://registry.npmjs.org/@holochain-open-dev/utils/-/utils-0.16.5.tgz", - "integrity": "sha512-sLP0a+v2osR7ra8ZYadLrmSdzBV3rEl/1qKlnY2PEWJ014KK4MVC08FyJ5hu4JSzeZMhEEUkB3AELuONvcGhHA==", + "packages/core/node_modules/@holochain-open-dev/elements": { + "version": "0.300.1", + "resolved": "https://registry.npmjs.org/@holochain-open-dev/elements/-/elements-0.300.1.tgz", + "integrity": "sha512-i0BYvrM+aKFlyiNQ02mkqTElLxQ4AFM0nBs4whXrb/p7XU/SQm0dApieEGMsTgtZu8cI/ZgmPzi6qQSduXXLPA==", "dependencies": { - "@holochain/client": "^0.16.2", - "@msgpack/msgpack": "^2.7.2", - "blakejs": "^1.2.1", - "emittery": "^1.0.1", - "lodash-es": "^4.17.21", - "sort-keys": "^5.0.0" + "@holo-host/identicon": "^0.1.0", + "@holochain/client": "^0.17.1", + "@lit-labs/router": "^0.1.3", + "@lit/localize": "^0.12.0", + "@mdi/js": "^7.1.96", + "@shoelace-style/shoelace": "^2.11.0", + "lit": "^3.0.2", + "prosemirror-commands": "^1.5.2", + "prosemirror-keymap": "^1.2.2", + "prosemirror-state": "^1.4.3", + "prosemirror-view": "^1.31.3" } }, - "packages/core/node_modules/@holochain-open-dev/utils/node_modules/@holochain/client": { - "version": "0.16.11", - "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.16.11.tgz", - "integrity": "sha512-QXPQeV6poCXedqpPxjAnYJcZE53Z4v/lbkeXfdxTcZRYjRILuxsT40zLDRWQR5A+NH+Cz0iTnLPmi4v9vpZY8g==", + "packages/core/node_modules/@holochain-open-dev/stores": { + "version": "0.300.0", + "resolved": "https://registry.npmjs.org/@holochain-open-dev/stores/-/stores-0.300.0.tgz", + "integrity": "sha512-xRnW9/zo1ejCwJhk2ZjZAX/TRUhQ4ygy1dnB38lz9Y8RQhkgvnMGFpJ96qZ74cip/XIsdt2hJJnpac2/lqJ/HA==", "dependencies": { - "@bitgo/blake2b": "^3.2.4", - "@holochain/serialization": "^0.1.0-beta-rc.3", - "@msgpack/msgpack": "^2.8.0", - "@tauri-apps/api": "^1.4.0", - "emittery": "^1.0.1", - "isomorphic-ws": "^5.0.0", - "js-base64": "^3.7.5", - "libsodium-wrappers": "^0.7.13", - "lodash-es": "^4.17.21", - "ws": "^8.14.2" - }, - "engines": { - "node": ">=18.0.0 || >=20.0.0" + "@alenaksu/json-viewer": "^2.0.1", + "@holochain-open-dev/utils": "^0.300.0", + "@holochain/client": "^0.17.0", + "@scoped-elements/cytoscape": "^0.2.0", + "@shoelace-style/shoelace": "^2.11.2", + "lit": "^3.0.2", + "lit-svelte-stores": "^0.3.0", + "svelte": "^3.53.1" } }, - "packages/core/node_modules/@holochain/client": { - "version": "0.17.0-dev.7", - "license": "CAL-1.0", + "packages/core/node_modules/@holochain-open-dev/utils": { + "version": "0.300.2", + "resolved": "https://registry.npmjs.org/@holochain-open-dev/utils/-/utils-0.300.2.tgz", + "integrity": "sha512-wdJtqUAsiYmKNPLVfrAX6rP+ufF844v7bKGu1y5l1zQuMdGWPGkH43FUIy5xe6NrWWY2pz3W8D/IyXc8mnBc1w==", "dependencies": { - "@bitgo/blake2b": "^3.2.4", - "@holochain/serialization": "^0.1.0-beta-rc.3", + "@holochain/client": "^0.17.1", "@msgpack/msgpack": "^2.8.0", - "@tauri-apps/api": "^1.4.0", + "blakejs": "^1.2.1", "emittery": "^1.0.1", - "isomorphic-ws": "^5.0.0", - "js-base64": "^3.7.5", - "libsodium-wrappers": "^0.7.13", "lodash-es": "^4.17.21", - "ws": "^8.14.2" - }, - "engines": { - "node": ">=18.0.0 || >=20.0.0" + "sort-keys": "^5.0.0" } }, "packages/store": { "name": "@holochain-syn/store", - "version": "0.300.0-dev.1", + "version": "0.300.0", "dependencies": { - "@holochain-open-dev/stores": "=0.300.0-dev.1", - "@holochain-open-dev/utils": "^0.300.0-dev.0", - "@holochain-syn/client": "^0.300.0-dev.0", - "@holochain/client": "=0.17.0-dev.7", + "@holochain-open-dev/stores": "^0.300.0", + "@holochain-open-dev/utils": "^0.300.0", + "@holochain-syn/client": "^0.300.0", + "@holochain/client": "^0.17.0", "@msgpack/msgpack": "^2.7.2", "automerge": "^1.0.1-preview.7", "lodash-es": "^4.17.21" @@ -8365,35 +8361,44 @@ "typescript": "^4.7.4" } }, - "packages/store/node_modules/@holochain/client": { - "version": "0.17.0-dev.7", - "license": "CAL-1.0", + "packages/store/node_modules/@holochain-open-dev/stores": { + "version": "0.300.0", + "resolved": "https://registry.npmjs.org/@holochain-open-dev/stores/-/stores-0.300.0.tgz", + "integrity": "sha512-xRnW9/zo1ejCwJhk2ZjZAX/TRUhQ4ygy1dnB38lz9Y8RQhkgvnMGFpJ96qZ74cip/XIsdt2hJJnpac2/lqJ/HA==", "dependencies": { - "@bitgo/blake2b": "^3.2.4", - "@holochain/serialization": "^0.1.0-beta-rc.3", + "@alenaksu/json-viewer": "^2.0.1", + "@holochain-open-dev/utils": "^0.300.0", + "@holochain/client": "^0.17.0", + "@scoped-elements/cytoscape": "^0.2.0", + "@shoelace-style/shoelace": "^2.11.2", + "lit": "^3.0.2", + "lit-svelte-stores": "^0.3.0", + "svelte": "^3.53.1" + } + }, + "packages/store/node_modules/@holochain-open-dev/utils": { + "version": "0.300.2", + "resolved": "https://registry.npmjs.org/@holochain-open-dev/utils/-/utils-0.300.2.tgz", + "integrity": "sha512-wdJtqUAsiYmKNPLVfrAX6rP+ufF844v7bKGu1y5l1zQuMdGWPGkH43FUIy5xe6NrWWY2pz3W8D/IyXc8mnBc1w==", + "dependencies": { + "@holochain/client": "^0.17.1", "@msgpack/msgpack": "^2.8.0", - "@tauri-apps/api": "^1.4.0", + "blakejs": "^1.2.1", "emittery": "^1.0.1", - "isomorphic-ws": "^5.0.0", - "js-base64": "^3.7.5", - "libsodium-wrappers": "^0.7.13", "lodash-es": "^4.17.21", - "ws": "^8.14.2" - }, - "engines": { - "node": ">=18.0.0 || >=20.0.0" + "sort-keys": "^5.0.0" } }, "packages/text-editor": { "name": "@holochain-syn/text-editor", - "version": "0.300.0-dev.0", - "dependencies": { - "@holochain-open-dev/elements": "=0.300.0-dev.0", - "@holochain-open-dev/profiles": "=0.300.0-dev.0", - "@holochain-open-dev/stores": "^0.300.0-dev.1", - "@holochain-open-dev/utils": "^0.16.0", - "@holochain-syn/core": "^0.300.0-dev.0", - "@holochain/client": "=0.17.0-dev.7", + "version": "0.300.0", + "dependencies": { + "@holochain-open-dev/elements": "^0.300.0", + "@holochain-open-dev/profiles": "^0.300.0-dev", + "@holochain-open-dev/stores": "^0.300.0", + "@holochain-open-dev/utils": "^0.300.0", + "@holochain-syn/core": "^0.300.0", + "@holochain/client": "^0.17.0", "@lit/context": "^1.0.0", "@lit/localize": "^0.12.0", "@shoelace-style/shoelace": "^2.3.0", @@ -8406,85 +8411,88 @@ "typescript": "^4.7.4" } }, - "packages/text-editor/node_modules/@holochain-open-dev/utils": { - "version": "0.16.5", - "resolved": "https://registry.npmjs.org/@holochain-open-dev/utils/-/utils-0.16.5.tgz", - "integrity": "sha512-sLP0a+v2osR7ra8ZYadLrmSdzBV3rEl/1qKlnY2PEWJ014KK4MVC08FyJ5hu4JSzeZMhEEUkB3AELuONvcGhHA==", + "packages/text-editor/node_modules/@holochain-open-dev/elements": { + "version": "0.300.1", + "resolved": "https://registry.npmjs.org/@holochain-open-dev/elements/-/elements-0.300.1.tgz", + "integrity": "sha512-i0BYvrM+aKFlyiNQ02mkqTElLxQ4AFM0nBs4whXrb/p7XU/SQm0dApieEGMsTgtZu8cI/ZgmPzi6qQSduXXLPA==", "dependencies": { - "@holochain/client": "^0.16.2", - "@msgpack/msgpack": "^2.7.2", - "blakejs": "^1.2.1", - "emittery": "^1.0.1", - "lodash-es": "^4.17.21", - "sort-keys": "^5.0.0" + "@holo-host/identicon": "^0.1.0", + "@holochain/client": "^0.17.1", + "@lit-labs/router": "^0.1.3", + "@lit/localize": "^0.12.0", + "@mdi/js": "^7.1.96", + "@shoelace-style/shoelace": "^2.11.0", + "lit": "^3.0.2", + "prosemirror-commands": "^1.5.2", + "prosemirror-keymap": "^1.2.2", + "prosemirror-state": "^1.4.3", + "prosemirror-view": "^1.31.3" } }, - "packages/text-editor/node_modules/@holochain-open-dev/utils/node_modules/@holochain/client": { - "version": "0.16.11", - "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.16.11.tgz", - "integrity": "sha512-QXPQeV6poCXedqpPxjAnYJcZE53Z4v/lbkeXfdxTcZRYjRILuxsT40zLDRWQR5A+NH+Cz0iTnLPmi4v9vpZY8g==", + "packages/text-editor/node_modules/@holochain-open-dev/stores": { + "version": "0.300.0", + "resolved": "https://registry.npmjs.org/@holochain-open-dev/stores/-/stores-0.300.0.tgz", + "integrity": "sha512-xRnW9/zo1ejCwJhk2ZjZAX/TRUhQ4ygy1dnB38lz9Y8RQhkgvnMGFpJ96qZ74cip/XIsdt2hJJnpac2/lqJ/HA==", "dependencies": { - "@bitgo/blake2b": "^3.2.4", - "@holochain/serialization": "^0.1.0-beta-rc.3", - "@msgpack/msgpack": "^2.8.0", - "@tauri-apps/api": "^1.4.0", - "emittery": "^1.0.1", - "isomorphic-ws": "^5.0.0", - "js-base64": "^3.7.5", - "libsodium-wrappers": "^0.7.13", - "lodash-es": "^4.17.21", - "ws": "^8.14.2" - }, - "engines": { - "node": ">=18.0.0 || >=20.0.0" + "@alenaksu/json-viewer": "^2.0.1", + "@holochain-open-dev/utils": "^0.300.0", + "@holochain/client": "^0.17.0", + "@scoped-elements/cytoscape": "^0.2.0", + "@shoelace-style/shoelace": "^2.11.2", + "lit": "^3.0.2", + "lit-svelte-stores": "^0.3.0", + "svelte": "^3.53.1" } }, - "packages/text-editor/node_modules/@holochain/client": { - "version": "0.17.0-dev.7", - "license": "CAL-1.0", + "packages/text-editor/node_modules/@holochain-open-dev/utils": { + "version": "0.300.2", + "resolved": "https://registry.npmjs.org/@holochain-open-dev/utils/-/utils-0.300.2.tgz", + "integrity": "sha512-wdJtqUAsiYmKNPLVfrAX6rP+ufF844v7bKGu1y5l1zQuMdGWPGkH43FUIy5xe6NrWWY2pz3W8D/IyXc8mnBc1w==", "dependencies": { - "@bitgo/blake2b": "^3.2.4", - "@holochain/serialization": "^0.1.0-beta-rc.3", + "@holochain/client": "^0.17.1", "@msgpack/msgpack": "^2.8.0", - "@tauri-apps/api": "^1.4.0", + "blakejs": "^1.2.1", "emittery": "^1.0.1", - "isomorphic-ws": "^5.0.0", - "js-base64": "^3.7.5", - "libsodium-wrappers": "^0.7.13", "lodash-es": "^4.17.21", - "ws": "^8.14.2" - }, - "engines": { - "node": ">=18.0.0 || >=20.0.0" + "sort-keys": "^5.0.0" } }, "tests": { "version": "0.0.0", "dependencies": { - "@holochain-open-dev/stores": "=0.300.0-dev.1", - "@holochain/client": "=0.17.0-dev.7", - "@holochain/tryorama": "^0.16.0-dev.1", + "@holochain-open-dev/stores": "^0.300.0", + "@holochain/client": "^0.17.0", + "@holochain/tryorama": "^0.16.0", "@msgpack/msgpack": "^2.7.0", "vitest": "^0.28.4" } }, - "tests/node_modules/@holochain/client": { - "version": "0.17.0-dev.7", - "license": "CAL-1.0", + "tests/node_modules/@holochain-open-dev/stores": { + "version": "0.300.0", + "resolved": "https://registry.npmjs.org/@holochain-open-dev/stores/-/stores-0.300.0.tgz", + "integrity": "sha512-xRnW9/zo1ejCwJhk2ZjZAX/TRUhQ4ygy1dnB38lz9Y8RQhkgvnMGFpJ96qZ74cip/XIsdt2hJJnpac2/lqJ/HA==", "dependencies": { - "@bitgo/blake2b": "^3.2.4", - "@holochain/serialization": "^0.1.0-beta-rc.3", + "@alenaksu/json-viewer": "^2.0.1", + "@holochain-open-dev/utils": "^0.300.0", + "@holochain/client": "^0.17.0", + "@scoped-elements/cytoscape": "^0.2.0", + "@shoelace-style/shoelace": "^2.11.2", + "lit": "^3.0.2", + "lit-svelte-stores": "^0.3.0", + "svelte": "^3.53.1" + } + }, + "tests/node_modules/@holochain-open-dev/utils": { + "version": "0.300.2", + "resolved": "https://registry.npmjs.org/@holochain-open-dev/utils/-/utils-0.300.2.tgz", + "integrity": "sha512-wdJtqUAsiYmKNPLVfrAX6rP+ufF844v7bKGu1y5l1zQuMdGWPGkH43FUIy5xe6NrWWY2pz3W8D/IyXc8mnBc1w==", + "dependencies": { + "@holochain/client": "^0.17.1", "@msgpack/msgpack": "^2.8.0", - "@tauri-apps/api": "^1.4.0", + "blakejs": "^1.2.1", "emittery": "^1.0.1", - "isomorphic-ws": "^5.0.0", - "js-base64": "^3.7.5", - "libsodium-wrappers": "^0.7.13", "lodash-es": "^4.17.21", - "ws": "^8.14.2" - }, - "engines": { - "node": ">=18.0.0 || >=20.0.0" + "sort-keys": "^5.0.0" } } } diff --git a/packages/client/package.json b/packages/client/package.json index 2f7aaa2..f3c5a7f 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@holochain-syn/client", - "version": "0.300.0-dev.0", + "version": "0.300.0", "main": "./dist/index.js", "module": "./dist/index.js", "type": "module", @@ -16,8 +16,8 @@ "build:watch": "tsc -w --preserveWatchOutput" }, "dependencies": { - "@holochain/client": "=0.17.0-dev.7", - "@holochain-open-dev/utils": "^0.300.0-dev.0", + "@holochain/client": "^0.17.0", + "@holochain-open-dev/utils": "^0.300.0", "@msgpack/msgpack": "^2.7.0", "automerge": "^1.0.1-preview.7" }, diff --git a/packages/client/src/client.ts b/packages/client/src/client.ts index 367c0e9..c67b6b5 100644 --- a/packages/client/src/client.ts +++ b/packages/client/src/client.ts @@ -2,10 +2,10 @@ import { AgentPubKey, EntryHash, Record, - AppAgentClient, + AppClient, AnyDhtHash, Link, - ActionHash + ActionHash, } from '@holochain/client'; import { EntryRecord, ZomeClient } from '@holochain-open-dev/utils'; import { cleanNodeDecoding } from '@holochain-open-dev/utils/dist/clean-node-decoding.js'; @@ -21,7 +21,7 @@ import { export class SynClient extends ZomeClient { constructor( - public client: AppAgentClient, + public client: AppClient, public roleName: string, public zomeName = 'syn' ) { @@ -53,8 +53,9 @@ export class SynClient extends ZomeClient { return new EntryRecord(record); } - - public async getAuthorsForDocument(documentHash: AnyDhtHash): Promise> { + public async getAuthorsForDocument( + documentHash: AnyDhtHash + ): Promise> { return this.callZome('get_authors_for_document', documentHash); } @@ -91,7 +92,7 @@ export class SynClient extends ZomeClient { signal.type === 'EntryCreated' && signal.app_entry.type === 'Commit' && cleanNodeDecoding(commit.document_hash).toString() === - cleanNodeDecoding(signal.app_entry.document_hash).toString() + cleanNodeDecoding(signal.app_entry.document_hash).toString() ) { unsubs(); @@ -123,10 +124,15 @@ export class SynClient extends ZomeClient { public async getCommitsForDocument( documentHash: AnyDhtHash ): Promise> { - const commits: Array = await this.callZome('get_commits_for_document', documentHash); + const commits: Array = await this.callZome( + 'get_commits_for_document', + documentHash + ); if (commits.length > 600) { - console.warn(`THERE ARE ${commits.length} FOR THIS DOCUMENT. THIS SHOULDN'T HAPPEN! REPORT TO THE SYN DEVS ABOUT THIS (guillemcordoba)`); + console.warn( + `THERE ARE ${commits.length} FOR THIS DOCUMENT. THIS SHOULDN'T HAPPEN! REPORT TO THE SYN DEVS ABOUT THIS (guillemcordoba)` + ); } return commits; diff --git a/packages/core/package.json b/packages/core/package.json index 6d53bf2..2ac28f3 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@holochain-syn/core", - "version": "0.300.0-dev.1", + "version": "0.300.0", "main": "./dist/index.js", "module": "./dist/index.js", "type": "module", @@ -14,13 +14,13 @@ "build:watch": "tsc -w --preserveWatchOutput" }, "dependencies": { - "@holochain-open-dev/elements": "=0.300.0-dev.0", - "@holochain-open-dev/profiles": "^0.300.0-dev.0", - "@holochain-open-dev/stores": "=0.300.0-dev.1", - "@holochain-open-dev/utils": "^0.16.5", - "@holochain-syn/client": "^0.300.0-dev.0", - "@holochain-syn/store": "^0.300.0-dev.1", - "@holochain/client": "=0.17.0-dev.7", + "@holochain-open-dev/elements": "^0.300.0", + "@holochain-open-dev/profiles": "^0.300.0-dev", + "@holochain-open-dev/stores": "^0.300.0", + "@holochain-open-dev/utils": "^0.300.0", + "@holochain-syn/client": "^0.300.0", + "@holochain-syn/store": "^0.300.0", + "@holochain/client": "^0.17.0", "@lit/context": "^1.0.0", "@lit/localize": "^0.12.0", "@scoped-elements/cytoscape": "^0.2.0", diff --git a/packages/store/package.json b/packages/store/package.json index 479e0de..0bcb4e2 100644 --- a/packages/store/package.json +++ b/packages/store/package.json @@ -1,6 +1,6 @@ { "name": "@holochain-syn/store", - "version": "0.300.0-dev.1", + "version": "0.300.0", "main": "./dist/index.js", "types": "./dist/index.d.ts", "type": "module", @@ -16,10 +16,10 @@ "build:watch": "tsc -w --preserveWatchOutput" }, "dependencies": { - "@holochain-open-dev/stores": "=0.300.0-dev.1", - "@holochain-open-dev/utils": "^0.300.0-dev.0", - "@holochain-syn/client": "^0.300.0-dev.0", - "@holochain/client": "=0.17.0-dev.7", + "@holochain-open-dev/stores": "^0.300.0", + "@holochain-open-dev/utils": "^0.300.0", + "@holochain-syn/client": "^0.300.0", + "@holochain/client": "^0.17.0", "@msgpack/msgpack": "^2.7.2", "automerge": "^1.0.1-preview.7", "lodash-es": "^4.17.21" diff --git a/packages/text-editor/package.json b/packages/text-editor/package.json index dd2863a..8715aeb 100644 --- a/packages/text-editor/package.json +++ b/packages/text-editor/package.json @@ -1,6 +1,6 @@ { "name": "@holochain-syn/text-editor", - "version": "0.300.0-dev.0", + "version": "0.300.0", "main": "./dist/index.js", "module": "./dist/index.js", "files": ["dist"], @@ -14,12 +14,12 @@ }, "type": "module", "dependencies": { - "@holochain-open-dev/elements": "=0.300.0-dev.0", - "@holochain-open-dev/profiles": "=0.300.0-dev.0", - "@holochain-open-dev/stores": "^0.300.0-dev.1", - "@holochain-open-dev/utils": "^0.16.0", - "@holochain-syn/core": "^0.300.0-dev.0", - "@holochain/client": "=0.17.0-dev.7", + "@holochain-open-dev/elements": "^0.300.0", + "@holochain-open-dev/profiles": "^0.300.0-dev", + "@holochain-open-dev/stores": "^0.300.0", + "@holochain-open-dev/utils": "^0.300.0", + "@holochain-syn/core": "^0.300.0", + "@holochain/client": "^0.17.0", "@lit/context": "^1.0.0", "@lit/localize": "^0.12.0", "@shoelace-style/shoelace": "^2.3.0", diff --git a/tests/package.json b/tests/package.json index e7d8ca6..c5ef0ff 100644 --- a/tests/package.json +++ b/tests/package.json @@ -6,9 +6,9 @@ "test": "vitest run" }, "dependencies": { - "@holochain-open-dev/stores": "=0.300.0-dev.1", - "@holochain/client": "=0.17.0-dev.7", - "@holochain/tryorama": "^0.16.0-dev.1", + "@holochain-open-dev/stores": "^0.300.0", + "@holochain/client": "^0.17.0", + "@holochain/tryorama": "^0.16.0", "@msgpack/msgpack": "^2.7.0", "vitest": "^0.28.4" }, diff --git a/tests/src/lib/concurrent.test.ts b/tests/src/lib/concurrent.test.ts index e604a68..f7b1776 100644 --- a/tests/src/lib/concurrent.test.ts +++ b/tests/src/lib/concurrent.test.ts @@ -37,11 +37,9 @@ test('the state of two agents making lots of concurrent changes converges', asyn ]); await scenario.shareAllAgents(); const aliceSyn = new SynStore( - new SynClient(alice.appAgentWs as any, 'syn-test') - ); - const bobSyn = new SynStore( - new SynClient(bob.appAgentWs as any, 'syn-test') + new SynClient(alice.appWs as any, 'syn-test') ); + const bobSyn = new SynStore(new SynClient(bob.appWs as any, 'syn-test')); const workspaceName = 'main'; diff --git a/tests/src/lib/deterministic.test.ts b/tests/src/lib/deterministic.test.ts index f12168c..1fd8dbc 100644 --- a/tests/src/lib/deterministic.test.ts +++ b/tests/src/lib/deterministic.test.ts @@ -21,11 +21,9 @@ test('two agents creating the same deterministic root get the same root hash', a await scenario.shareAllAgents(); await scenario.shareAllAgents(); const aliceSyn = new SynStore( - new SynClient(alice.appAgentWs as any, 'syn-test') - ); - const bobSyn = new SynStore( - new SynClient(bob.appAgentWs as any, 'syn-test') + new SynClient(alice.appWs as any, 'syn-test') ); + const bobSyn = new SynStore(new SynClient(bob.appWs as any, 'syn-test')); const aliceDocumentStore = await aliceSyn.createDocument( sampleGrammar.initialState() diff --git a/tests/src/lib/merge.test.ts b/tests/src/lib/merge.test.ts index 3290e91..19f4b3e 100644 --- a/tests/src/lib/merge.test.ts +++ b/tests/src/lib/merge.test.ts @@ -23,9 +23,7 @@ test('check that the state of disconnected agents making changes converges after // can be destructured. const [alice] = await scenario.addPlayersWithApps([appSource]); - let aliceSyn = new SynStore( - new SynClient(alice.appAgentWs as any, 'syn-test') - ); + let aliceSyn = new SynStore(new SynClient(alice.appWs as any, 'syn-test')); // Alice creates a root commit let aliceDocumentStore = await aliceSyn.createDeterministicDocument( @@ -61,9 +59,7 @@ test('check that the state of disconnected agents making changes converges after await delay(100); const [bob] = await scenario.addPlayersWithApps([appSource]); - const bobSyn = new SynStore( - new SynClient(bob.appAgentWs as any, 'syn-test') - ); + const bobSyn = new SynStore(new SynClient(bob.appWs as any, 'syn-test')); // Bob goes online and joins the same workspace let bobDocumentStore = await bobSyn.createDeterministicDocument( diff --git a/tests/src/lib/syn-store.test.ts b/tests/src/lib/syn-store.test.ts index dfb4b84..c61fe01 100644 --- a/tests/src/lib/syn-store.test.ts +++ b/tests/src/lib/syn-store.test.ts @@ -27,11 +27,9 @@ test('SynStore, DocumentStore, WorkspaceStore and SessionStore work', async () = ]); await scenario.shareAllAgents(); const aliceSyn = new SynStore( - new SynClient(alice.appAgentWs as any, 'syn-test') - ); - const bobSyn = new SynStore( - new SynClient(bob.appAgentWs as any, 'syn-test') + new SynClient(alice.appWs as any, 'syn-test') ); + const bobSyn = new SynStore(new SynClient(bob.appWs as any, 'syn-test')); const aliceDocumentStore = await aliceSyn.createDocument( sampleGrammar.initialState() diff --git a/zomes/syn/coordinator/src/lib.rs b/zomes/syn/coordinator/src/lib.rs index aee5f9d..9a8f633 100644 --- a/zomes/syn/coordinator/src/lib.rs +++ b/zomes/syn/coordinator/src/lib.rs @@ -49,6 +49,7 @@ pub enum Signal { }, LinkDeleted { action: SignedActionHashed, + create_link_action: SignedActionHashed, link_type: LinkTypes, }, EntryCreated { @@ -91,10 +92,15 @@ fn signal_action(action: SignedActionHashed) -> ExternResult<()> { )?; match record.action() { Action::CreateLink(create_link) => { - if let Ok(Some(link_type)) = - LinkTypes::from_type(create_link.zome_index, create_link.link_type) - { - emit_signal(Signal::LinkDeleted { action, link_type })?; + if let Ok(Some(link_type)) = LinkTypes::from_type( + create_link.zome_index, + create_link.link_type, + ) { + emit_signal(Signal::LinkDeleted { + action, + link_type, + create_link_action: record.signed_action.clone(), + })?; } Ok(()) } diff --git a/zomes/syn/integrity/src/lib.rs b/zomes/syn/integrity/src/lib.rs index 1ed2953..5a95c5c 100644 --- a/zomes/syn/integrity/src/lib.rs +++ b/zomes/syn/integrity/src/lib.rs @@ -19,7 +19,6 @@ pub enum EntryTypes { } #[derive(Serialize, Deserialize)] -#[serde(tag = "type")] #[hdk_link_types] pub enum LinkTypes { TagToDocument,