diff --git a/Cargo.lock b/Cargo.lock index 44c30634..426101e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -85,13 +85,12 @@ dependencies = [ [[package]] name = "aitia" -version = "0.3.0-dev.5" +version = "0.3.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf586cb9185c985fd25a4fae5cf2e8e2f590dd7c60beffd9cc62da64ac80d16a" +checksum = "aa6441219defcb93f3625601a0d3cc715ce1a0acecca9991247aff4fd7a4c1d4" dependencies = [ "anyhow", "derive_more", - "holochain_trace", "parking_lot 0.12.3", "petgraph", "regex", @@ -1754,9 +1753,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "fixt" -version = "0.4.0-dev.3" +version = "0.4.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f00f6a51bfb4b9f808a7fc2accb891682bda7cfcafbf08a283393f7db49a80" +checksum = "a61c0fd4010d5d20f6383c16c523159aa7e8513c2fb2fd79d6fb319831af7623" dependencies = [ "holochain_serialized_bytes", "lazy_static", @@ -2177,9 +2176,9 @@ dependencies = [ [[package]] name = "hc_deepkey_sdk" -version = "0.7.0-dev.6" +version = "0.7.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea908bf540cdceeac81a53e348a8bfb2e011ba8bd41aeaebe0cf826151152fa3" +checksum = "0cbf754afd67edfa4cdb72394876704668693c78505a2bc054759157f74c29f3" dependencies = [ "arbitrary", "hc_deepkey_types", @@ -2190,9 +2189,9 @@ dependencies = [ [[package]] name = "hc_deepkey_types" -version = "0.8.0-dev.6" +version = "0.8.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2df5dd06aea65209ee9c92cbb5b78f58dabcee44e67e2ce8ce72269c36e019" +checksum = "f4c994a7e2c1e3de03d5915945e4ca81687f1c5dd9ed0f24fc7d9cdb6c4e6acc" dependencies = [ "arbitrary", "hdi", @@ -2215,9 +2214,9 @@ dependencies = [ [[package]] name = "hc_seed_bundle" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "849aaef544dc9a561bcf1af4cbbc02e4cd24904b623aa1d0311f756fc2a96d38" +checksum = "4f930e251000e258ff14c36c4d045c9ec1dcbf2a6fff53b1432342b9a34df5ae" dependencies = [ "futures", "one_err", @@ -2230,14 +2229,13 @@ dependencies = [ [[package]] name = "hc_sleuth" -version = "0.4.0-dev.24" +version = "0.4.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace6050ba4dbb9b2be272c25312e540c12a967cfa0ae2f00cf624f67f027172d" +checksum = "44e729d2a4b4a05f1045ee5ff6f41529e0ae5c4f8d89e8260dcef7b8125c31b0" dependencies = [ "aitia", "anyhow", "derive_more", - "holochain_state_types", "holochain_trace", "holochain_types", "kitsune_p2p", @@ -2276,9 +2274,9 @@ dependencies = [ [[package]] name = "hdi" -version = "0.5.0-dev.15" +version = "0.5.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da97eabe84f2eccc10ffad392da05a1998e0b5df8eb35960cd30a1a1dbc7a96a" +checksum = "a11b9903154b2f80f0c4523bebe912a331c098a2d44cf0ba123c59dd71b6bbe3" dependencies = [ "getrandom 0.2.15", "hdk_derive", @@ -2294,9 +2292,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.4.0-dev.17" +version = "0.4.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d0362e8a94f17e3d050be68a83fe9313a950aebd345bae6db0f60a7eb6f93a" +checksum = "066fd837e5d9ef4d943350b4f45bad4078fe788e50682fb404e2cfc6b713fdcb" dependencies = [ "getrandom 0.2.15", "hdi", @@ -2314,9 +2312,9 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.4.0-dev.14" +version = "0.4.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379fea8efc247dec919950b52c8dd6cf184da2c72ab9a90a2994bfe50fc3496b" +checksum = "4103bbeaec462f7f0643a418823dad035ed8e108d6d36322d6544f7565b5dbf5" dependencies = [ "darling 0.14.4", "heck 0.5.0", @@ -2411,9 +2409,9 @@ dependencies = [ [[package]] name = "holo_hash" -version = "0.4.0-dev.12" +version = "0.4.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84ab790f4a750f08ff11824dd6bc13c1b091371b7b4bac92733b15bb135c2fa6" +checksum = "190c060ed23f60135e8ba0ff08c77a7ca283af35cc4aadf321433bfade7bcf5b" dependencies = [ "arbitrary", "base64 0.22.1", @@ -2437,9 +2435,9 @@ dependencies = [ [[package]] name = "holochain" -version = "0.4.0-dev.25" +version = "0.4.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771313f58af9d7c51962959507ad2e51ffcd2fc75a013041ad44c6a718cee2c4" +checksum = "7fc812cc54b84bde5f425e8ac14cfe925f0cb9a7ffdb80e2038dc59044c5043f" dependencies = [ "aitia", "anyhow", @@ -2448,7 +2446,6 @@ dependencies = [ "async-trait", "backtrace", "base64 0.22.1", - "bytes", "cfg-if 1.0.0", "chrono", "contrafact", @@ -2505,11 +2502,9 @@ dependencies = [ "opentelemetry_api", "parking_lot 0.12.3", "petgraph", - "predicates 3.1.2", "rand 0.8.5", "rand-utf8", "rand_chacha 0.3.1", - "reqwest 0.12.7", "rusqlite", "sbd-server", "sd-notify", @@ -2543,9 +2538,9 @@ dependencies = [ [[package]] name = "holochain_cascade" -version = "0.4.0-dev.25" +version = "0.4.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6715d1cbef3e5dd19fed9e5ae33c34de22077ddc5da4dcc39c64b262dcd0a3c2" +checksum = "3da613d2fb926182cfb7c974db9c5fb5e479c4f685a9bec1b1de5daf5275cf18" dependencies = [ "async-trait", "fixt", @@ -2571,9 +2566,9 @@ dependencies = [ [[package]] name = "holochain_chc" -version = "0.1.0-dev.5" +version = "0.1.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c51a47d4ed05689c741f41d5caf7d4dc2d36b9616a598612d04d326d7887622" +checksum = "fe0fc0dc7486f058cede7c895daa43056ba429b73273fdb2f2f6458c1b9594f3" dependencies = [ "async-trait", "derive_more", @@ -2597,10 +2592,11 @@ dependencies = [ [[package]] name = "holochain_conductor_api" -version = "0.4.0-dev.25" +version = "0.4.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f60e806482d1f927d472d2d9e52228a576a1bf1dec82a9e034668df6a3d8df" +checksum = "0be8f80ae5531305d48ef868cd5d71e58d9c4f348e7ca90bad072c3f57e503b4" dependencies = [ + "cfg-if 1.0.0", "derive_more", "holo_hash", "holochain_keystore", @@ -2621,9 +2617,9 @@ dependencies = [ [[package]] name = "holochain_conductor_services" -version = "0.3.0-dev.25" +version = "0.3.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "269aa50a8c56f05693b6c4cb4926ba3cef359296ef6645bdb7b65042b0e7104b" +checksum = "5d16457206d4848a68a661211fc63c9bfb85f46b3192af3f0c445ac6c331cbac" dependencies = [ "anyhow", "arbitrary", @@ -2631,7 +2627,6 @@ dependencies = [ "derive_more", "futures", "hc_deepkey_sdk", - "holochain_deepkey_dna", "holochain_keystore", "holochain_types", "holochain_util", @@ -2653,9 +2648,9 @@ checksum = "be0aa773b74c40ef5e4e02f414d8cbfc4e92520a93511055a3fbccc12d2dd045" [[package]] name = "holochain_integrity_types" -version = "0.4.0-dev.14" +version = "0.4.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b79568981a1da6981295b6b9d821d88b330afc262fb65693336dcacae20c9b9d" +checksum = "55fd6b8aa759be57a51c6af632d81e50e3200ac10d38dd35e094c1ed957591b9" dependencies = [ "arbitrary", "derive_builder 0.20.1", @@ -2675,9 +2670,9 @@ dependencies = [ [[package]] name = "holochain_keystore" -version = "0.4.0-dev.22" +version = "0.4.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c0c8cdaa7098a946ecd6ff4a8d6b5eb0e2a117c0b1d6b2db2946021596b0d34" +checksum = "3d8234a44c072aa8a3766e5f2686d9eea9c85507f6582951ddb0a660d6ef1802" dependencies = [ "base64 0.22.1", "derive_more", @@ -2704,9 +2699,9 @@ dependencies = [ [[package]] name = "holochain_metrics" -version = "0.4.0-dev.4" +version = "0.4.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97f1e76a5cc221de42f55e068689874e0691f7f36ade21d4a5c7820ba3b3dc60" +checksum = "00e87c8db537e3ab19713d613aacec0c7bc52acc7b0fc6edb15bd5ef37805e40" dependencies = [ "influxive", "opentelemetry_api", @@ -2715,9 +2710,9 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.4.0-dev.7" +version = "0.4.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bee65dd7e2558659687d7c8a02646739f1a6a9ebdc35015241a0bfdecf7fe5c" +checksum = "e1e9d716254b6d1eba405b5fc0f09dc8d4260482fa06dbe98a4c610b38fd83de" dependencies = [ "getrandom 0.2.15", "holochain_secure_primitive", @@ -2726,9 +2721,9 @@ dependencies = [ [[package]] name = "holochain_p2p" -version = "0.4.0-dev.25" +version = "0.4.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd19cb0e269c1d3d4fc44ba3454b408ff4428082e8c1d5c0a4a50789d6e2764" +checksum = "07068cc2c7574d9406d00daa1a8cb271e1e9de04b55955a81a00d9832257e116" dependencies = [ "aitia", "async-trait", @@ -2759,9 +2754,9 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.4.0-dev.1" +version = "0.4.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9c9cbba8effd767423fd69a65e4c4458f359b62aca46f2e3527406958cf26c7" +checksum = "3160015099d36ece72a40d78fe08033837dd5c8ea9cb23f01782986238a66480" dependencies = [ "paste", "serde", @@ -2798,9 +2793,9 @@ dependencies = [ [[package]] name = "holochain_sqlite" -version = "0.4.0-dev.21" +version = "0.4.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442cb846bf887b42ebf7636118b3c57145e140391990cbb727aa34273abbffbf" +checksum = "00c081bca17e6a58157b5f45abcfdfba1067c3b38e575bdd65871854e049b293" dependencies = [ "anyhow", "async-trait", @@ -2843,9 +2838,9 @@ dependencies = [ [[package]] name = "holochain_state" -version = "0.4.0-dev.25" +version = "0.4.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0766fbe46f99d4e568af6f387e5c0943a9bdcf1df35ac66c475153831c817ec3" +checksum = "ebccd79c8cdcae836f0ebba4f36d85e0ff4ad92fe63c6ec21ca443b3f87117c6" dependencies = [ "aitia", "async-recursion", @@ -2881,9 +2876,9 @@ dependencies = [ [[package]] name = "holochain_state_types" -version = "0.4.0-dev.14" +version = "0.4.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb4a2f32f44489d2154f9d9fb69df0ae3430be7c8cda1c4a5332f4d48344225" +checksum = "00c52e0c3b4c108692f376c67158c2d007253500a67b4fe53fe23177e7b632aa" dependencies = [ "holo_hash", "holochain_integrity_types", @@ -2892,9 +2887,9 @@ dependencies = [ [[package]] name = "holochain_test_wasm_common" -version = "0.4.0-dev.17" +version = "0.4.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0964534c6d4f3f9254eec306a4e19c8890ebea1f077d0b7ca83c50792d84e70" +checksum = "750adb191e8506f64496c0c4c582d8c2545c3f9c60f4f4eae51bcc077f3a0508" dependencies = [ "hdk", "serde", @@ -2902,9 +2897,9 @@ dependencies = [ [[package]] name = "holochain_trace" -version = "0.4.0-dev.5" +version = "0.4.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e00bdd969d61fab25573441a201ee8da89d34df655b4153e1d092e54dca29a" +checksum = "68bb7147e6ce0542c661706779541bead79ca6bc95540732384d8590a9ee875d" dependencies = [ "chrono", "derive_more", @@ -2920,9 +2915,9 @@ dependencies = [ [[package]] name = "holochain_types" -version = "0.4.0-dev.24" +version = "0.4.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "605386a24b66b4effc7057645b11e6cd62eec14a5ed88962417956bb700766b1" +checksum = "91090efe13869808982638d0bec270f5eeee7d2980b7bdd17ca5317853fb71db" dependencies = [ "anyhow", "arbitrary", @@ -2939,7 +2934,6 @@ dependencies = [ "flate2", "futures", "getrandom 0.2.15", - "hc_deepkey_sdk", "holo_hash", "holochain_keystore", "holochain_nonce", @@ -2978,9 +2972,9 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.4.0-dev.4" +version = "0.4.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1c491b6ba90c68041b393264b1e67c2990b68094caa7fdfe1ea5a959c82107" +checksum = "89b36a8bd9f79cbe6de5fded86b9074c54081a97367660c466d25f5ac6841dc1" dependencies = [ "backtrace", "cfg-if 1.0.0", @@ -2991,14 +2985,13 @@ dependencies = [ "rpassword", "sodoken 0.0.11", "tokio", - "tracing", ] [[package]] name = "holochain_wasm_test_utils" -version = "0.4.0-dev.24" +version = "0.4.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "315f0df41891674fba092b36ccd28c89a12e597d3ab6ca33fdb0b9e4259e3dd7" +checksum = "c1ddcba0c942540c105ea45e3e2bcd74b9991b1676befafcb75de15979e02ac1" dependencies = [ "holochain_types", "holochain_util", @@ -3057,9 +3050,9 @@ dependencies = [ [[package]] name = "holochain_websocket" -version = "0.4.0-dev.24" +version = "0.4.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b58d60f421cc793d999e6a0445a44061af0809569e522afcfca42b64d5602b" +checksum = "279012d7627062833a64c2421c01ab859adea518033c2c6f610418d4a8d28e21" dependencies = [ "async-trait", "futures", @@ -3075,9 +3068,9 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.4.0-dev.17" +version = "0.4.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64752eeef8c57e0549f09a9fac7b6fb73c94028bc021589f94c7cfd68b4b54c8" +checksum = "7c20154541de3704d11642fd43ad141b88a15ba481ea44b5bfc97831ba9e61fb" dependencies = [ "arbitrary", "contrafact", @@ -3105,7 +3098,6 @@ dependencies = [ "shrinkwraprs", "strum", "subtle", - "subtle-encoding", "thiserror", "tracing", ] @@ -3129,7 +3121,7 @@ checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" dependencies = [ "cfg-if 1.0.0", "libc", - "windows", + "windows 0.52.0", ] [[package]] @@ -3338,7 +3330,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -3682,9 +3674,9 @@ dependencies = [ [[package]] name = "kitsune_p2p" -version = "0.4.0-dev.21" +version = "0.4.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9daf4a7d6ba1b0e0aac0fad4cc9669760f2292eb571efddb6b27276cb57c057" +checksum = "fad569db6472637d688f856532f627659597a75ae371c6f05f3f048c761db8b4" dependencies = [ "arrayref", "base64 0.22.1", @@ -3697,7 +3689,6 @@ dependencies = [ "ghost_actor", "governor", "holochain_trace", - "itertools 0.12.1", "kitsune_p2p_bin_data", "kitsune_p2p_block", "kitsune_p2p_bootstrap_client", @@ -3728,9 +3719,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.4.0-dev.11" +version = "0.4.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5bc477873f3c25e263946caa431f236dec465d4c7c75a715bdf41cc87f45013" +checksum = "bdb7c39b8e0c7c2f37457ab7005903bda9c30d4d2f45d84c61776dc025863559" dependencies = [ "arbitrary", "base64 0.22.1", @@ -3747,9 +3738,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.4.0-dev.11" +version = "0.4.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb37277cef33bacf6113448c8c224296c3ceb25ce1c72eca7911984f0bff0d65" +checksum = "9d331df99fe02990b7ae8c3767ea9437519a158e353905dea49a022f3511bee8" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -3758,9 +3749,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bootstrap" -version = "0.3.0-dev.14" +version = "0.3.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "621ce8508260ffc2e153cdfefe3f21d48b8877fcf97ae9cdcec112a202c6822e" +checksum = "80824055058643294b346ce56b33ec088596724bb5088d0002226c6bc355367a" dependencies = [ "clap 4.5.17", "futures", @@ -3778,9 +3769,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bootstrap_client" -version = "0.4.0-dev.14" +version = "0.4.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91789c24788db108e92e455efa06338b53593e749d2cad6cab1ddd46b545944f" +checksum = "5e09bec08dec66dfe7dcea37624b2f0591d826372223fbfa2d82ded2702ea954" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_bootstrap", @@ -3793,9 +3784,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht" -version = "0.4.0-dev.9" +version = "0.4.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "724960e037263eca03dad008d68a28fcab20f14a7a93a6572ff9c2743becdb1a" +checksum = "8479a92ad1b24df28025370313207a4a55e7f37a5de0ccf3b9cb02a4bc8af2f8" dependencies = [ "arbitrary", "colored", @@ -3817,9 +3808,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.4.0-dev.9" +version = "0.4.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49cefd7f1867eb14ade8fce5b6a9975c399780f4735aad7701ed1b2036b72ae9" +checksum = "8a821f0daf7ac92fc4bcd59e4b121387756ca8a68fcfe87b7efeac863b5483ab" dependencies = [ "arbitrary", "derive_more", @@ -3835,9 +3826,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_fetch" -version = "0.4.0-dev.13" +version = "0.4.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3482a52b635f770f7235efe6bf2dd1928574702fcfbade69f7aabec613c70a10" +checksum = "4c0bd85554d9e7da7c6805f61950f4ca374a723ac282d5648947f21ef5dbdcf1" dependencies = [ "backon", "derive_more", @@ -3851,13 +3842,12 @@ dependencies = [ [[package]] name = "kitsune_p2p_mdns" -version = "0.4.0-dev.2" +version = "0.4.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d57ccdbad385b104ffdadd3db14abe73024f586df8160f2dc89560d5b807ae" +checksum = "063b93f20de354d8d42b20cc6dc05e24493ef11ed7edd7e888076a8b46176ed0" dependencies = [ "base64 0.22.1", "err-derive 0.3.1", - "futures", "libmdns", "mdns", "tokio", @@ -3866,9 +3856,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_proxy" -version = "0.4.0-dev.13" +version = "0.4.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1efae608bc19578bf5377e6ba11b2e006203fc55cf1637cd11c5522e384f001" +checksum = "085cac6201e8c854044c51458839c9269dd3181c9ec4912d7a6e38e877d98e2e" dependencies = [ "base64 0.22.1", "derive_more", @@ -3877,15 +3867,14 @@ dependencies = [ "kitsune_p2p_types", "serde", "serde_bytes", - "structopt", "tokio", ] [[package]] name = "kitsune_p2p_timestamp" -version = "0.4.0-dev.4" +version = "0.4.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27e44de630f9a0c27edb0c123d12cafe09d3b719845f966c742e9b2043efea07" +checksum = "ca09ee47fe55fd72e12b2af9fd91bce5e6e0db04ecaa156ca75dd901a019af80" dependencies = [ "arbitrary", "chrono", @@ -3899,9 +3888,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_types" -version = "0.4.0-dev.13" +version = "0.4.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0305bc228d171847cc35439e6ad56d41bd61da019900964026d771b5de69f896" +checksum = "b09bc80d2b76e429470249e0979c0c52cf7db5ae1c9e5718ea836b2b0dff2b72" dependencies = [ "arbitrary", "base64 0.22.1", @@ -3944,9 +3933,9 @@ dependencies = [ [[package]] name = "lair_keystore" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff167fc218b19e270557f6e688969bf137521b4dcfe00ebbfb00df8a14caa5a4" +checksum = "d9b6f792c308afb82ceac6035fcf0ad321eaf271b892d08789d822e78b112a4d" dependencies = [ "lair_keystore_api", "pretty_assertions", @@ -3960,9 +3949,9 @@ dependencies = [ [[package]] name = "lair_keystore_api" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241847cf5de13da9c60930b6ccd0d6411e68d9f6b2f942dd029bb668e3aa9e1d" +checksum = "f5d6aa053bddb4e4c36652217349511ea9c51f1bdaf60530a7013d2d4c91204e" dependencies = [ "base64 0.22.1", "dunce", @@ -3975,7 +3964,6 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "time", "tokio", "toml", "tracing", @@ -3998,9 +3986,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.167" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" [[package]] name = "libflate" @@ -4322,7 +4310,7 @@ dependencies = [ "fragile", "lazy_static", "mockall_derive", - "predicates 2.1.5", + "predicates", "predicates-tree", ] @@ -4346,9 +4334,9 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "mr_bundle" -version = "0.4.0-dev.7" +version = "0.4.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec8cf33890b9d37580b77210cf52adc23b7a6528eaeb780b91c982374a19343" +checksum = "5196c416124a0ee668823722ac5e30f99c2c3269d0c0bab2b476f604ef1f20a7" dependencies = [ "arbitrary", "derive_more", @@ -4991,20 +4979,6 @@ dependencies = [ "regex", ] -[[package]] -name = "predicates" -version = "3.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" -dependencies = [ - "anstyle", - "difflib", - "float-cmp", - "normalize-line-endings", - "predicates-core", - "regex", -] - [[package]] name = "predicates-core" version = "1.0.8" @@ -5965,9 +5939,9 @@ dependencies = [ [[package]] name = "sbd-client" -version = "0.0.6-alpha" +version = "0.0.8-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66f0b06ca514d8666ff371c63a5913e3f1740312c13768f301d0e5578a03c7e2" +checksum = "7af51493c7b0233ad96af18edaace4190d19a1b3b7c231f61b4a0c7f9bf13ef7" dependencies = [ "base64 0.22.1", "ed25519-dalek", @@ -5984,9 +5958,9 @@ dependencies = [ [[package]] name = "sbd-e2e-crypto-client" -version = "0.0.6-alpha" +version = "0.0.8-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257a338fa0fca74d013b69a9e49f3683a4766bcadd4fe583779783bec48dede" +checksum = "6213eb9eaa35d0e8e57172e5367f2a9c3cfd6011db268143a14c6324ea15c13b" dependencies = [ "sbd-client", "sodoken 0.0.901-alpha", @@ -5996,9 +5970,9 @@ dependencies = [ [[package]] name = "sbd-server" -version = "0.0.6-alpha" +version = "0.0.8-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb12c0cb502dd2998fb3560e3999f58ac819719fd6513763029608dcf77f4a88" +checksum = "1cda36e498d8b8d32fda399807b58c68f939a54777c104287840264725338ce9" dependencies = [ "anstyle", "base64 0.22.1", @@ -6638,17 +6612,16 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.13" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" +checksum = "4c33cd241af0f2e9e3b5c32163b873b29956890b5342e6745b917ce9d490f4af" dependencies = [ - "cfg-if 1.0.0", "core-foundation-sys", "libc", + "memchr", "ntapi", - "once_cell", "rayon", - "windows", + "windows 0.57.0", ] [[package]] @@ -7208,13 +7181,15 @@ dependencies = [ [[package]] name = "tx5" -version = "0.1.3-beta" +version = "0.1.5-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37f5c8ae702c58cd1a127fe5785db014ddba783e18c87ad936275bb6e4023a13" +checksum = "3f994c9c78cd32bdf4fe814f73deb46346a2e3d8b0258a9cc6349f7cffea9532" dependencies = [ "base64 0.22.1", + "futures", "influxive-otel-atomic-obs", "serde", + "slab", "tokio", "tracing", "tx5-connection", @@ -7224,12 +7199,14 @@ dependencies = [ [[package]] name = "tx5-connection" -version = "0.1.3-beta" +version = "0.1.5-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f97d4960fe1d84c6cf6335df355841a43377feb57df4b4996e24d0f50e07774" +checksum = "c768f3c4e732c8f4e5ac8c458eb638c9ee4d5cec9a079aaae3b14bc625027ada" dependencies = [ "bit_field", "futures", + "serde", + "serde_json", "tokio", "tracing", "tx5-core", @@ -7239,9 +7216,9 @@ dependencies = [ [[package]] name = "tx5-core" -version = "0.1.3-beta" +version = "0.1.5-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52d9b50b494b1d92b6a12ab9d3f98d420d549e85b128f671abfb67c1cf8cba" +checksum = "fa653b3dc7b127c29fca5bd9ba70a31afa1c9df3c796f35efca576b10c2aaa13" dependencies = [ "app_dirs2", "base64 0.22.1", @@ -7258,9 +7235,9 @@ dependencies = [ [[package]] name = "tx5-go-pion" -version = "0.1.3-beta" +version = "0.1.5-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "450fffbc9207428bd387e319aa88fe226cad0950937e773f9bbf0672c6d0104e" +checksum = "a930b75b6baf3bae2090e44fe9ff4566f7ae4d979e6794f82ce0207b2fed7a82" dependencies = [ "futures", "parking_lot 0.12.3", @@ -7272,9 +7249,9 @@ dependencies = [ [[package]] name = "tx5-go-pion-sys" -version = "0.1.3-beta" +version = "0.1.5-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23094d66b8570e86418520c9317fe8d16c0b45ed3156bb01b5e14ed674136da9" +checksum = "b9d40c7d4bec6f9ca0f379981a99ec8765f01e7812a4dc0a27c021cb988c89a5" dependencies = [ "Inflector", "base64 0.22.1", @@ -7291,9 +7268,9 @@ dependencies = [ [[package]] name = "tx5-go-pion-turn" -version = "0.1.3-beta" +version = "0.1.5-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2acad1aec5d8b8272e1e6c3ddcf4f154163a59429d9c58124b025b53d8c914" +checksum = "80a2648d5eaa7bc0feb2a90be2b84b148d1ae2a254d568f77d3cc41005648f03" dependencies = [ "base64 0.22.1", "dirs", @@ -7309,9 +7286,9 @@ dependencies = [ [[package]] name = "tx5-signal" -version = "0.1.3-beta" +version = "0.1.5-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c67250845c61754644c82d76e5644cfdb21226f6c036ff7aa8d159db411e2b6" +checksum = "c4d507c5cd6e14fd81cc6d2a6571b1eba35eeda7c11cc00ac56ed7d109cd1265" dependencies = [ "rand 0.8.5", "sbd-e2e-crypto-client", @@ -7971,7 +7948,17 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-core", + "windows-core 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" +dependencies = [ + "windows-core 0.57.0", "windows-targets 0.52.6", ] @@ -7984,17 +7971,60 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "windows-interface" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "windows-registry" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" dependencies = [ - "windows-result", + "windows-result 0.2.0", "windows-strings", "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-result" version = "0.2.0" @@ -8010,7 +8040,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ - "windows-result", + "windows-result 0.2.0", "windows-targets 0.52.6", ] diff --git a/Cargo.toml b/Cargo.toml index 391ddf49..6eb88c49 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,10 +3,10 @@ members = ["crates/*"] resolver = "2" [workspace.dependencies] -hdi = "0.5.0-dev" -hdk = "0.4.0-dev" +hdi = "0.5.0-rc.1" +hdk = "0.4.0-rc.1" serde = "1" -holochain = "0.4.0-dev" +holochain = "0.4.0-rc.1" [profile.dev] opt-level = "z" diff --git a/flake.lock b/flake.lock index cb061594..6385454a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,46 +1,12 @@ { "nodes": { - "cargo-chef": { - "flake": false, - "locked": { - "lastModified": 1716357509, - "narHash": "sha256-7iSxwTaJnDLqaFu4ydxkx7ivhDvSQQcXWKawv/e4NHE=", - "owner": "LukeMathWalker", - "repo": "cargo-chef", - "rev": "b468537839bfc7c23d744b85d7a5090954626550", - "type": "github" - }, - "original": { - "owner": "LukeMathWalker", - "ref": "main", - "repo": "cargo-chef", - "type": "github" - } - }, - "cargo-rdme": { - "flake": false, - "locked": { - "lastModified": 1718044745, - "narHash": "sha256-Oa667BTz/PdxZmhGSP+qfPcUbORlk7nP5OrCJyYqVQg=", - "owner": "orium", - "repo": "cargo-rdme", - "rev": "22d756971037ad4c7953db882c5b96a662364f15", - "type": "github" - }, - "original": { - "owner": "orium", - "ref": "v1.4.4", - "repo": "cargo-rdme", - "type": "github" - } - }, "crane": { "locked": { - "lastModified": 1725125250, - "narHash": "sha256-CB20rDD5eHikF6mMTTJdwPP1qvyoiyyw1RDUzwIaIF8=", + "lastModified": 1732407143, + "narHash": "sha256-qJOGDT6PACoX+GbNH2PPx2ievlmtT1NVeTB80EkRLys=", "owner": "ipetkov", "repo": "crane", - "rev": "96fd12c7100e9e05fa1a0a5bd108525600ce282f", + "rev": "f2b4b472983817021d9ffb60838b2b36b9376b20", "type": "github" }, "original": { @@ -49,246 +15,172 @@ "type": "github" } }, - "empty": { - "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": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1725234343, - "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { - "id": "flake-parts", - "type": "indirect" + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" } }, - "holochain": { - "inputs": { - "cargo-chef": "cargo-chef", - "cargo-rdme": "cargo-rdme", - "crane": "crane", - "empty": "empty", - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "holochain": [ - "holochain", - "empty" - ], - "lair": [ - "holochain", - "empty" - ], - "launcher": [ - "holochain", - "empty" - ], - "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs", - "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "repo-git": "repo-git", - "rust-overlay": "rust-overlay", - "scaffolding": [ - "holochain", - "empty" - ], - "versions": [ - "versions" - ] - }, + "hc-launch": { + "flake": false, "locked": { - "lastModified": 1726667649, - "narHash": "sha256-UghDFCNXqMOxNox+T47tq1TxA+beJ4W8FyKGGSgsUAk=", + "lastModified": 1727250978, + "narHash": "sha256-6u/VjFRV4eQQS4H0he7C0n7uNjzBBtkeoyN46jTO0mc=", "owner": "holochain", - "repo": "holochain", - "rev": "6beea809f9aa95245b338c693c89b8a130a604b1", + "repo": "hc-launch", + "rev": "92afce654187be5abef67d34df20bd6464524cf3", "type": "github" }, "original": { "owner": "holochain", - "repo": "holochain", + "ref": "holochain-weekly", + "repo": "hc-launch", "type": "github" } }, - "holochain_2": { + "hc-scaffold": { "flake": false, "locked": { - "lastModified": 1726621288, - "narHash": "sha256-zUvEfTRX7acCzhEBgL8gkrngH7ryT18p1J2lOTE9uOo=", + "lastModified": 1731921057, + "narHash": "sha256-8Qn6yXNVRTAiKCwlZpD9PDW6JQZh7lgOEa9kmnsbXnM=", "owner": "holochain", - "repo": "holochain", - "rev": "1c38ad228103e2994399e735ccca9c4d850aec19", + "repo": "scaffolding", + "rev": "2c5dc235c2e42b458bbc40cdd8c35bf588a2c40c", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.4.0-dev.25", - "repo": "holochain", + "ref": "holochain-weekly", + "repo": "scaffolding", "type": "github" } }, - "lair": { + "holochain": { "flake": false, "locked": { - "lastModified": 1726521249, - "narHash": "sha256-SZPhvZ7D5tNr3dKuxUp/zUOnfFe8UBG/uqWc9vQgUMM=", + "lastModified": 1732794113, + "narHash": "sha256-p123iaQbIY7bkJWnRab3saVNTOBWwl4N6Sz1sYMPAWQ=", "owner": "holochain", - "repo": "lair", - "rev": "6bbd604bff3d5eda528bb2da9c3aa1e1e71e429d", + "repo": "holochain", + "rev": "662cbcc45a685425355f5e3682c080a101271dfa", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.5.1", - "repo": "lair", + "ref": "holochain-0.4.0-rc.2", + "repo": "holochain", "type": "github" } }, - "launcher": { - "flake": false, + "holonix": { + "inputs": { + "crane": "crane", + "flake-parts": "flake-parts", + "hc-launch": "hc-launch", + "hc-scaffold": "hc-scaffold", + "holochain": "holochain", + "lair-keystore": "lair-keystore", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + }, "locked": { - "lastModified": 1726473709, - "narHash": "sha256-WjuSEtK9odQsrAIbS7TxQEYPyjYgJheMZmVj7Aentyg=", + "lastModified": 1732887221, + "narHash": "sha256-P+jweVdZGA3W2IWTCy5LNqfALOaPtRLVjnJ6glUWTgg=", "owner": "holochain", - "repo": "hc-launch", - "rev": "c6fb9cf6d4b8e548c960527a8fc88d2ead051394", + "repo": "holonix", + "rev": "ee077eae3686922620dd18edd1b975d307890ce0", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-weekly", - "repo": "hc-launch", + "ref": "main-0.4", + "repo": "holonix", "type": "github" } }, - "nix-filter": { + "lair-keystore": { + "flake": false, "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "lastModified": 1732721902, + "narHash": "sha256-D8sXIpOptaXib5bc6zS7KsGzu4D08jaL8Fx1W/mlADE=", + "owner": "holochain", + "repo": "lair", + "rev": "e82937521ae9b7bdb30c8b0736c13cd4220a0223", "type": "github" }, "original": { - "owner": "numtide", - "repo": "nix-filter", + "owner": "holochain", + "ref": "lair_keystore-v0.5.3", + "repo": "lair", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", - "owner": "NixOS", + "lastModified": 1717179513, + "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" + "owner": "nixos", + "ref": "24.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1725233747, - "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" - } - }, - "pre-commit-hooks-nix": { - "flake": false, - "locked": { - "lastModified": 1724857454, - "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "repo-git": { - "flake": false, - "locked": { - "narHash": "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY=", - "type": "file", - "url": "file:/dev/null" - }, - "original": { - "type": "file", - "url": "file:/dev/null" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, "root": { "inputs": { - "holochain": "holochain", + "flake-parts": [ + "holonix", + "flake-parts" + ], + "holonix": "holonix", "nixpkgs": [ - "holochain", + "holonix", "nixpkgs" - ], - "versions": "versions" + ] } }, "rust-overlay": { "inputs": { "nixpkgs": [ - "holochain", + "holonix", "nixpkgs" ] }, "locked": { - "lastModified": 1725762472, - "narHash": "sha256-thdxLVdcfrJNMFV3Ej9mDIh6QgHyoYswiW0SFNwod8A=", + "lastModified": 1732328983, + "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "57a1564c924ee4acbffe0ad3d65c7e90d3e77cd8", + "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", "type": "github" }, "original": { @@ -296,46 +188,6 @@ "repo": "rust-overlay", "type": "github" } - }, - "scaffolding": { - "flake": false, - "locked": { - "lastModified": 1725629251, - "narHash": "sha256-23TjhOgXdLOX05yGDK8ZVTZxovbFiGz2Mu+H45YLpAA=", - "owner": "holochain", - "repo": "scaffolding", - "rev": "d415a38e686faf38c91689e176b62a93bd51b188", - "type": "github" - }, - "original": { - "owner": "holochain", - "ref": "holochain-weekly", - "repo": "scaffolding", - "type": "github" - } - }, - "versions": { - "inputs": { - "holochain": "holochain_2", - "lair": "lair", - "launcher": "launcher", - "scaffolding": "scaffolding" - }, - "locked": { - "dir": "versions/weekly", - "lastModified": 1726667649, - "narHash": "sha256-UghDFCNXqMOxNox+T47tq1TxA+beJ4W8FyKGGSgsUAk=", - "owner": "holochain", - "repo": "holochain", - "rev": "6beea809f9aa95245b338c693c89b8a130a604b1", - "type": "github" - }, - "original": { - "dir": "versions/weekly", - "owner": "holochain", - "repo": "holochain", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 8a9712c3..9e4b55af 100644 --- a/flake.nix +++ b/flake.nix @@ -1,40 +1,33 @@ { - description = "Template for Holochain app development"; + description = "Flake for Holochain app development"; inputs = { - nixpkgs.follows = "holochain/nixpkgs"; + holonix.url = "github:holochain/holonix?ref=main-0.4"; - versions.url = "github:holochain/holochain?dir=versions/weekly"; + nixpkgs.follows = "holonix/nixpkgs"; + flake-parts.follows = "holonix/flake-parts"; - holochain = { - url = "github:holochain/holochain"; - inputs.versions.follows = "versions"; - }; }; - 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 = with pkgs; [ - nodejs-18_x - # more packages go here - cargo-nextest - ]; - }; - }; + outputs = inputs@{ flake-parts, ... }: flake-parts.lib.mkFlake { inherit inputs; } { + systems = builtins.attrNames inputs.holonix.devShells; + perSystem = { inputs', pkgs, ... }: { + formatter = pkgs.nixpkgs-fmt; + + devShells.default = pkgs.mkShell { + inputsFrom = [ inputs'.holonix.devShells.default ]; + + packages = (with pkgs; [ + nodejs_20 + binaryen + + + ]); + + shellHook = '' + export PS1='\[\033[1;34m\][holonix:\w]\$\[\033[0m\] ' + ''; }; -} + }; + }; +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index a182dd2b..3387a7cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2638,12 +2638,12 @@ "integrity": "sha512-Dn5pTV/m3XaK1Zvq3liw/vQUt7goM7Y84x2zUyH8cb9CNMs4kPCNHs3kalbJZ/ymzFvwcdiLwwNW8AKk+WWN5A==" }, "node_modules/@holochain-open-dev/elements": { - "version": "0.400.0-dev.3", - "resolved": "https://registry.npmjs.org/@holochain-open-dev/elements/-/elements-0.400.0-dev.3.tgz", - "integrity": "sha512-dlGBnDxQKmhXElO32ipjkgxdD6nmfPR2edLYDHzGWdP4uetNWTrbqSjWfw+dqDMmGG1nQkmIkTeBAFBstVgWoQ==", + "version": "0.400.0-rc.0", + "resolved": "https://registry.npmjs.org/@holochain-open-dev/elements/-/elements-0.400.0-rc.0.tgz", + "integrity": "sha512-j3dI0LFIJ8DZGORqAjWOmu8pydNu0MSWaxKcBfyHD4bE1jWGDxt7V6BxyGePzSTrdSA2SuOr2HJm0/jOSkm+4g==", "dependencies": { "@holo-host/identicon": "^0.1.0", - "@holochain/client": "^0.18.0-dev.13", + "@holochain/client": "0.18.0-rc.1", "@lit/localize": "^0.12.0", "@mdi/js": "^7.1.96", "@shoelace-style/shoelace": "^2.11.0", @@ -2696,9 +2696,9 @@ } }, "node_modules/@holochain/client": { - "version": "0.18.0-dev.13", - "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.18.0-dev.13.tgz", - "integrity": "sha512-pwmqsVRhzERt036Ms3Nch7UT94u1+kEPnGF1rcYParrx8lE5aol5XxW5UqS1wiIoadd5iYjYXJE8CJI2fga0Sg==", + "version": "0.18.0-rc.1", + "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.18.0-rc.1.tgz", + "integrity": "sha512-01Xh5cpN0lHdtV41V2RtCUfTFEA9K9GWK5vvMPtdqj52WcSNO6gcrfVERKgSG/su8xJ3VmULPYNQyrEMmBReww==", "dependencies": { "@bitgo/blake2b": "^3.2.4", "@holochain/serialization": "^0.1.0-beta-rc.3", @@ -18660,13 +18660,13 @@ }, "ui": { "name": "@holochain-open-dev/profiles", - "version": "0.400.0-dev.3", + "version": "0.400.0-rc.0", "license": "MIT", "dependencies": { - "@holochain-open-dev/elements": "0.400.0-dev.3", - "@holochain-open-dev/stores": "0.400.0-dev.3", - "@holochain-open-dev/utils": "0.400.0-dev.4", - "@holochain/client": "^0.18.0-dev.13", + "@holochain-open-dev/elements": "0.400.0-rc.0", + "@holochain-open-dev/stores": "0.400.0-rc.0", + "@holochain-open-dev/utils": "0.400.0-rc.0", + "@holochain/client": "0.18.0-rc.1", "@lit/context": "^1.0.1", "@lit/localize": "^0.12.0", "@mdi/js": "^7.1.96", @@ -18693,13 +18693,13 @@ } }, "ui/node_modules/@holochain-open-dev/stores": { - "version": "0.400.0-dev.3", - "resolved": "https://registry.npmjs.org/@holochain-open-dev/stores/-/stores-0.400.0-dev.3.tgz", - "integrity": "sha512-keo5lLzsz151tCLLHKfbmcEYd7aDpFMDhG9QphvloqETuVAX/MRINrrgY8yEaas2upmTBI+G2avs9VZLXc1mxw==", + "version": "0.400.0-rc.0", + "resolved": "https://registry.npmjs.org/@holochain-open-dev/stores/-/stores-0.400.0-rc.0.tgz", + "integrity": "sha512-PQUk1S8mWUxWzudRg8kctJytFM33lqr/QHvPmxTILEwcssEUNF73M72ciTak5MU17nPaFNy243K+G6vAN0GeFg==", "dependencies": { "@alenaksu/json-viewer": "^2.0.1", - "@holochain-open-dev/utils": "^0.400.0-dev.4", - "@holochain/client": "^0.18.0-dev.13", + "@holochain-open-dev/utils": "0.400.0-rc.0", + "@holochain/client": "0.18.0-rc.1", "@scoped-elements/cytoscape": "^0.2.0", "@shoelace-style/shoelace": "^2.11.2", "lit": "^3.0.2", @@ -18708,11 +18708,11 @@ } }, "ui/node_modules/@holochain-open-dev/utils": { - "version": "0.400.0-dev.4", - "resolved": "https://registry.npmjs.org/@holochain-open-dev/utils/-/utils-0.400.0-dev.4.tgz", - "integrity": "sha512-/SJIrR2uPJqXPHQ18a2fSjs83G94zbluMA34103iMqnN06JXWfSyiZWHrgovgP9MQ2DXDK1D9QahsTHzvmlQwQ==", + "version": "0.400.0-rc.0", + "resolved": "https://registry.npmjs.org/@holochain-open-dev/utils/-/utils-0.400.0-rc.0.tgz", + "integrity": "sha512-3Yq370JUWYc9I+oYGqL7V7gj8VcerwlqlPwf1KdNbhrBNIEVFPnepHXCQX+pLb7nWrcKhi0IO9w/bwTWzBORqw==", "dependencies": { - "@holochain/client": "^0.18.0-dev.13", + "@holochain/client": "0.18.0-rc.1", "@msgpack/msgpack": "^2.8.0", "blakejs": "^1.2.1", "emittery": "^1.0.1", diff --git a/ui/package.json b/ui/package.json index fc5d3e3a..ffec90e1 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "@holochain-open-dev/profiles", - "version": "0.400.0-dev.4", + "version": "0.400.0-rc.0", "description": "Frontend module for the Holochain hc_zome_profiles zomes", "author": "guillem.cordoba@gmail.com", "license": "MIT", @@ -31,10 +31,10 @@ "localize:build": "lit-localize build" }, "dependencies": { - "@holochain-open-dev/elements": "0.400.0-dev.3", - "@holochain-open-dev/stores": "0.400.0-dev.3", - "@holochain-open-dev/utils": "0.400.0-dev.4", - "@holochain/client": "^0.18.0-dev.13", + "@holochain-open-dev/elements": "0.400.0-rc.0", + "@holochain-open-dev/stores": "0.400.0-rc.0", + "@holochain-open-dev/utils": "0.400.0-rc.0", + "@holochain/client": "0.18.0-rc.1", "@lit/context": "^1.0.1", "@lit/localize": "^0.12.0", "@mdi/js": "^7.1.96",