diff --git a/Cargo.lock b/Cargo.lock index 95ea09533..a1f3b4a34 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -33,6 +33,17 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" +[[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if 1.0.0", + "cipher", + "cpufeatures", +] + [[package]] name = "ahash" version = "0.3.8" @@ -116,12 +127,26 @@ dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", - "anstyle-wincon", + "anstyle-wincon 1.0.2", "colorchoice", "is-terminal", "utf8parse", ] +[[package]] +name = "anstream" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon 3.0.2", + "colorchoice", + "utf8parse", +] + [[package]] name = "anstyle" version = "1.0.1" @@ -156,6 +181,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + [[package]] name = "anyhow" version = "1.0.74" @@ -466,6 +501,12 @@ version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + [[package]] name = "bimap" version = "0.6.3" @@ -681,6 +722,27 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +[[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "c_linked_list" version = "1.1.1" @@ -725,6 +787,7 @@ version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" dependencies = [ + "jobserver", "libc", ] @@ -766,6 +829,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + [[package]] name = "clap" version = "2.34.0" @@ -800,24 +873,23 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.21" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ "clap_builder", - "clap_derive 4.3.12", - "once_cell", + "clap_derive 4.4.7", ] [[package]] name = "clap_builder" -version = "4.3.21" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" dependencies = [ - "anstream", + "anstream 0.6.5", "anstyle", - "clap_lex 0.5.0", + "clap_lex 0.6.0", "strsim 0.10.0", "terminal_size", ] @@ -837,9 +909,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -858,9 +930,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "cloudabi" @@ -1499,6 +1571,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", "crypto-common", + "subtle", ] [[package]] @@ -1679,23 +1752,12 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -1767,9 +1829,9 @@ dependencies = [ [[package]] name = "fixt" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df61abe8ae0f550f1b1326a130c77afa3dd3e80fedd5f6d7535df2c948b86d89" +checksum = "c102f4e7e3b30001fbcfa223e446fc6b364ed90375a4d836988a5831d67c8324" dependencies = [ "holochain_serialized_bytes", "lazy_static", @@ -2290,9 +2352,9 @@ dependencies = [ [[package]] name = "hdi" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6568919485f54572855a9f7629f2814d11d76f8f5affa848bae2f426d0634c22" +checksum = "433896b20fa55c3b571567d0a8904be61f71c91eb49f6cdeef338ac8598e3e2b" dependencies = [ "hdk_derive", "holo_hash", @@ -2307,9 +2369,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff843e6ee200443fcfe4a9a1008386fac5bb41b1a36764b61ade96769a84b38c" +checksum = "32b49aec7019a737dc1104814edd970315954f477f4508e317f7cc10938ffa36" dependencies = [ "getrandom 0.2.10", "hdi", @@ -2327,9 +2389,9 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d773202681553c81ee86b4fc0d9c865cb8839bf936a3c55030e796a789069736" +checksum = "bf3dfc8932e6668d5a93a1a2d678977fb32acb92c5a4bdbd48beafba32af570d" dependencies = [ "darling 0.14.4", "heck 0.4.1", @@ -2402,11 +2464,26 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hex-literal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.7", +] + [[package]] name = "holo_hash" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9756c43b8162a6bc08d04922fc6efe05669e9663a505f0cf84e77e96ad330baf" +checksum = "25fb90402dbfcf179f2f96a8dc247bde1d86ccf4ed2ecbbe7fe34446027e30fd" dependencies = [ "arbitrary", "base64 0.13.1", @@ -2428,9 +2505,9 @@ dependencies = [ [[package]] name = "holochain" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f499af2aee576c37ed6a06647426169f5c1ddcefe88016733e274372838edb9" +checksum = "acdcb7d66c3a2bc1cfaaaebe86b4991f731278d16b86aac31cf3e46ca4c17e89" dependencies = [ "anyhow", "arbitrary", @@ -2456,6 +2533,7 @@ dependencies = [ "holochain_cascade", "holochain_conductor_api", "holochain_keystore", + "holochain_metrics", "holochain_p2p", "holochain_serialized_bytes", "holochain_sqlite", @@ -2484,6 +2562,7 @@ dependencies = [ "num_cpus", "once_cell", "one_err", + "opentelemetry_api", "parking_lot 0.10.2", "predicates 1.0.8", "rand 0.8.5", @@ -2521,9 +2600,9 @@ dependencies = [ [[package]] name = "holochain_cascade" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a2cfb20c822a9fda2978fde8811c0d74d37ad1381d4b65bed97ace03dda5826" +checksum = "898139f876ea83b4ed8e9996234125a95c2c7866aa7930922cc53694573e6ae9" dependencies = [ "async-trait", "derive_more", @@ -2545,6 +2624,8 @@ dependencies = [ "holochain_zome_types", "kitsune_p2p", "mockall", + "once_cell", + "opentelemetry_api", "serde", "serde_derive", "thiserror", @@ -2555,9 +2636,9 @@ dependencies = [ [[package]] name = "holochain_conductor_api" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914ce50552e2407b6f61178b8034628a3692926e9191ac2a9ab3b44d0dfe6120" +checksum = "2f960411e665aea8b583b36653df068b62c302a4eba1e8eeb5b53de63bf2f182" dependencies = [ "derive_more", "directories", @@ -2580,9 +2661,9 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3c4a6e37dc8cbeac95a3e1a1eaf64d7c616b82431944115183cbf9c9aeead90" +checksum = "294ba29e9e11b31137544f07d51c1b132dd336fbb7ca5b6ce33ca6619e416189" dependencies = [ "arbitrary", "derive_builder", @@ -2601,9 +2682,9 @@ dependencies = [ [[package]] name = "holochain_keystore" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe449970f44c5337086032ad795144efa8500c46b119291326cb7a6d71eb8b7" +checksum = "240e6d286407e1fb21f975473c4f62b13b5116ad91e3e85ce10ee8323af383f6" dependencies = [ "base64 0.13.1", "futures 0.3.28", @@ -2624,11 +2705,23 @@ dependencies = [ "tracing", ] +[[package]] +name = "holochain_metrics" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bf1a9e96ab255be9c88aa56cb93088b074799a832c1943b08db051054b34363" +dependencies = [ + "influxive", + "opentelemetry_api", + "reqwest 0.11.17", + "tracing", +] + [[package]] name = "holochain_p2p" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c756e67c78f1eeb8c74a0dc2a43a3ee1119606cc72701212b19d1ebaa085e2b3" +checksum = "6b5ab5c70fc13989b253356796863b2fc21efc19e22e6911754ad886566b1d33" dependencies = [ "async-trait", "derive_more", @@ -2722,9 +2815,9 @@ dependencies = [ [[package]] name = "holochain_sqlite" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb2d9008b1bf1c35c3f158da2057d8263f67175178e914f07930831fe91bd5d3" +checksum = "c30b5f7e127f99685680462bb1959074619f95bce23841b4b1e3d7bfe5667c80" dependencies = [ "anyhow", "async-trait", @@ -2750,6 +2843,7 @@ dependencies = [ "num-traits", "num_cpus", "once_cell", + "opentelemetry_api", "page_size", "parking_lot 0.10.2", "pretty_assertions 0.7.2", @@ -2773,9 +2867,9 @@ dependencies = [ [[package]] name = "holochain_state" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37de07264c95e1e7229bcb1e7fdb637d79012791fbe9ee36a9736836e420dfbd" +checksum = "8e1f51338b8a2b8aee0bfc429475bbe092895d2139b5270a5f99f91f92eabc54" dependencies = [ "async-recursion", "base64 0.13.1", @@ -2815,9 +2909,9 @@ dependencies = [ [[package]] name = "holochain_test_wasm_common" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bedd733208ff24c2e64548a3d23842c53d9c846c0f73c620ee19435f0307b5e9" +checksum = "dc14ddf8c521aa78c57d2e56e9bba16b334d910cfb9c1741504c67d890958be4" dependencies = [ "hdk", "serde", @@ -2825,9 +2919,9 @@ dependencies = [ [[package]] name = "holochain_trace" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b4651853c4f3bb44a3f1c5ffd41f2d7f29e03db98d5153161ee5f1a9131739" +checksum = "f44d036d48b5943a63d5345bcd6d79f2d4ed8dffe80d4000f134620d7b19ed44" dependencies = [ "chrono", "derive_more", @@ -2843,9 +2937,9 @@ dependencies = [ [[package]] name = "holochain_types" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05df6f74c8d5022b97b71ecb28485c8b502f3c232afe8baf3eaf82de0f6ae1c5" +checksum = "b3a05d91775274e9c71ed2fc5725d53d88aab3b92ad8fff968f78aaea30291cf" dependencies = [ "anyhow", "arbitrary", @@ -2902,9 +2996,9 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc771b636f31071efee6840b421c9fafe8bbe16559e62fa72f859803fb1aaf74" +checksum = "a19dfedf84953843a45ebbe273b59daabb444146e98499f136c3b2bfb2fc3d5d" dependencies = [ "backtrace", "cfg-if 0.1.10", @@ -2920,9 +3014,9 @@ dependencies = [ [[package]] name = "holochain_wasm_test_utils" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa09446024c383d33576816c54075bd66d04e3e9726cf0114690903739c62da1" +checksum = "f3f508f7f6412b1d9b8a3448aedf9633f2c374feb9955782b0272c6fb6d95eb6" dependencies = [ "holochain_types", "holochain_util", @@ -2980,9 +3074,9 @@ dependencies = [ [[package]] name = "holochain_websocket" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99acb0b3a73661fd64f7c96b29184651c1c0407d9ac11b66c305eb0050f9fb4e" +checksum = "67e227361bd59f9882c984c41c538b8d154751f5bf37a45d57325b8fbe752d73" dependencies = [ "futures 0.3.28", "ghost_actor 0.4.0-alpha.5", @@ -3005,9 +3099,9 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e65e6e564fbea4eb006a59fb3a75133f42661753f953b32641d0d433bb226174" +checksum = "2c0366fdc03fd8cad948456579183124b2778be4b5e21230ceb221dc4818523e" dependencies = [ "arbitrary", "contrafact", @@ -3121,7 +3215,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38a841f87949b0dd751864e769a870be79dc34abcee1cf31d737a61d498b22b6" dependencies = [ - "anstream", + "anstream 0.3.2", "anstyle", "backtrace", "os_info", @@ -3191,6 +3285,19 @@ dependencies = [ "want 0.3.1", ] +[[package]] +name = "hyper-rustls" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +dependencies = [ + "http 0.2.9", + "hyper 0.14.27", + "rustls", + "tokio 1.31.0", + "tokio-rustls", +] + [[package]] name = "hyper-tls" version = "0.3.2" @@ -3391,7 +3498,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fb7c1b80a1dfa604bb4a649a5c5aeef3d913f7c520cb42b40e534e8a61bcdfc" dependencies = [ "ahash 0.8.3", - "clap 4.3.21", + "clap 4.4.11", "crossbeam-channel", "crossbeam-utils 0.8.16", "dashmap 5.5.0", @@ -3407,13 +3514,116 @@ dependencies = [ "str_stack", ] +[[package]] +name = "influxdb" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77763a6985cbf3f3251fd0725511b6eb81967bfb50763e7a88097ff8e8504fb0" +dependencies = [ + "chrono", + "futures-util", + "http 0.2.9", + "lazy_static", + "regex", + "reqwest 0.11.17", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "influxive" +version = "0.0.2-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e33972c836e620ade20e7c0c66062c60a90b222ed46f5f872f1a4721967191" +dependencies = [ + "influxive-child-svc", + "influxive-otel", + "influxive-writer", +] + +[[package]] +name = "influxive-child-svc" +version = "0.0.2-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0923b25ac29f6e2ac600b0d3762792c4cb86438c3f2c7daa1f6e65e66f7f0d4d" +dependencies = [ + "hex-literal", + "influxive-core", + "influxive-downloader", + "influxive-writer", + "tempfile", + "tokio 1.31.0", + "tracing", +] + +[[package]] +name = "influxive-core" +version = "0.0.2-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5db78961ebb97b6d16ba61a65b38978a67cf7efaa91903c500b4771d1920d00" + +[[package]] +name = "influxive-downloader" +version = "0.0.2-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "264581af3b49d108e76382e301d4228f89a3995e373363b877bb42b1312ebba3" +dependencies = [ + "base64 0.21.2", + "digest 0.10.7", + "dirs 5.0.1", + "flate2", + "futures 0.3.28", + "hex", + "hex-literal", + "influxive-core", + "reqwest 0.11.17", + "sha2", + "tar", + "tempfile", + "tokio 1.31.0", + "zip", +] + +[[package]] +name = "influxive-otel" +version = "0.0.2-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "882f4ff61b099d34855841a6ea4d1890a1bd2aad2d07d8aaa63c99059d0f295c" +dependencies = [ + "influxive-core", + "opentelemetry_api", + "tokio 1.31.0", +] + [[package]] name = "influxive-otel-atomic-obs" -version = "0.0.1-alpha.11" +version = "0.0.2-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07bcce79167d27b8b2d639cf026029506ed3dfa7bf7ee402c29cab03a7afd16" +checksum = "1ac0ec101d28862a46c15d6140cec376b02725160dfcf57282952898a94cf35e" dependencies = [ - "ts_opentelemetry_api", + "opentelemetry_api", +] + +[[package]] +name = "influxive-writer" +version = "0.0.2-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89db32ac1865b814d5f4109635226c1d89189852d88f9ae704c0b51d6d2a8f25" +dependencies = [ + "influxdb", + "influxive-core", + "tokio 1.31.0", + "tracing", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", ] [[package]] @@ -3480,7 +3690,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.2", - "rustix 0.38.8", + "rustix 0.38.28", "windows-sys 0.48.0", ] @@ -3524,6 +3734,15 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +[[package]] +name = "jobserver" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +dependencies = [ + "libc", +] + [[package]] name = "js-sys" version = "0.3.64" @@ -3554,9 +3773,9 @@ dependencies = [ [[package]] name = "kitsune_p2p" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ec5203a2bfcc5e6f0c84367f51ac1491b8d0ec4af41759863bc3fce14f4f09" +checksum = "68543b9311d6e620a09e7fbdd86103a7f49f20f643ed073928c9e8c6128d9f64" dependencies = [ "arbitrary", "arrayref", @@ -3571,6 +3790,7 @@ dependencies = [ "governor", "holochain_trace", "itertools 0.10.5", + "kitsune_p2p_bin_data", "kitsune_p2p_block", "kitsune_p2p_fetch", "kitsune_p2p_mdns", @@ -3584,9 +3804,10 @@ dependencies = [ "nanoid 0.4.0", "num-traits", "once_cell", - "parking_lot 0.11.2", + "opentelemetry_api", + "parking_lot 0.12.1", "rand 0.8.5", - "reqwest 0.11.18", + "reqwest 0.11.17", "serde", "serde_bytes", "serde_json", @@ -3601,9 +3822,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a581c9c6e762a2fde360641e162e9c1384d6c508ad4da9d59ff902003262ebc" +checksum = "26a444a4508397be02027442fa3bc106db8a8ff79a02e680a652146ef07802aa" dependencies = [ "arbitrary", "base64 0.13.1", @@ -3617,9 +3838,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f4aa00dd7253f936aaee72e494db3de81dac9a051f768827e8bedb91a324763" +checksum = "c49c5cde7b3a68e0c8759a4be3820af90a0e79d5697254538d183823ecada823" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -3629,9 +3850,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bootstrap" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89a69cfc4fa25126de6504e38c867a8b8868467bb2b9024ff8d42ea768ccd3c1" +checksum = "9d66bad87ac0aeddf540028047538ac9412f56a41c923bbbc8a394f77e6e842c" dependencies = [ "clap 3.2.25", "futures 0.3.28", @@ -3649,9 +3870,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1646c207ebd2477468fe7f1fb65ae8d79cf51d88a6048926baeda66568930f92" +checksum = "ea8a9866ba8cb51f443aeda15646d0cc6ea35eac7dc82e2ca3e101e2089ed109" dependencies = [ "colored", "derivative", @@ -3673,9 +3894,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062325e9bc7110fe96057f8e221b073d9a2975681e832d0951c8c84aec310519" +checksum = "c6ab2c05e469ccade1e6a3f50138998148ff25330d83a4a334516fd0daec35c7" dependencies = [ "derive_more", "gcollections", @@ -3687,9 +3908,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_fetch" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa02f5c60619b55e843103c5d5c80f21b5095de9392f62b7613c4ba71ec1d927" +checksum = "90874799b2f366fbc26f89e987046279a44bcc91f600c3da34b9da370b394282" dependencies = [ "derive_more", "futures 0.3.28", @@ -3708,9 +3929,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_mdns" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c7d1f5e952ed0df199316a97774765963b3dfedfd416117b7e39054266f6fb" +checksum = "527ec70ab51ba2e10c4c9b13349e5638cdd7a0d04da37b12cadce5b498311fff" dependencies = [ "async-stream", "base64 0.13.1", @@ -3725,9 +3946,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_proxy" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3474a2bacca7bcd9faf014f6ff902d8524ace026d992e18da0ff6375ba79cde" +checksum = "5a64865f01e1b0c5735fcbbf54651052305cb0e216515a1ff7985a731f8eaafb" dependencies = [ "base64 0.13.1", "blake2b_simd 0.5.11", @@ -3746,14 +3967,14 @@ dependencies = [ "structopt", "tokio 1.31.0", "tracing-subscriber", - "webpki 0.21.4", + "webpki", ] [[package]] name = "kitsune_p2p_timestamp" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41451ee2b505c4b489e5f23e098ad423d477d2e40b01ea7b93b17a1887407592" +checksum = "8f1b199e027c58d7cd55530431dddbdfe622258fda3e9aa0b61b4e938fcf463d" dependencies = [ "arbitrary", "chrono", @@ -3764,9 +3985,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_transport_quic" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad4579f38ca3b6d628097da212a9e18ca28a53a08cf051f3ac0f9cb91ff33cd" +checksum = "9373d13bd02e395872e76301fc1ff38f336effa98572682013a54138da1273d3" dependencies = [ "blake2b_simd 1.0.1", "futures 0.3.28", @@ -3779,14 +4000,14 @@ dependencies = [ "rustls", "serde", "tokio 1.31.0", - "webpki 0.22.2", + "webpki", ] [[package]] name = "kitsune_p2p_types" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c3098c2b1ede33599d16c84a391b02cce5de2fee53fe212220bccff83b9151" +checksum = "a924d481122b106e2da4db54a67eacbe423268f14e48ffa9d09b9210595a427f" dependencies = [ "arbitrary", "base64 0.13.1", @@ -3818,7 +4039,7 @@ dependencies = [ "ureq", "url 2.4.0", "url2", - "webpki 0.22.2", + "webpki", ] [[package]] @@ -3887,9 +4108,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libflate" @@ -3999,9 +4220,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lock_api" @@ -4294,9 +4515,9 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "mr_bundle" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d101996f9edc5228cf670a06ada7f53348fe409796df84b5f44cc0c8e648a60" +checksum = "f65e268bacad0d72f316286a776e70ebd40bd6dede16401218f7c39a50330c7d" dependencies = [ "arbitrary", "bytes 1.4.0", @@ -4305,7 +4526,7 @@ dependencies = [ "flate2", "futures 0.3.28", "holochain_util", - "reqwest 0.11.18", + "reqwest 0.11.17", "rmp-serde 0.15.5", "serde", "serde_bytes", @@ -4715,6 +4936,22 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "opentelemetry_api" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b" +dependencies = [ + "futures-channel", + "futures-util", + "indexmap 1.9.3", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", +] + [[package]] name = "option-ext" version = "0.2.0" @@ -4919,6 +5156,17 @@ dependencies = [ "windows-targets 0.48.2", ] +[[package]] +name = "password-hash" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "paste" version = "1.0.14" @@ -4931,6 +5179,18 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd" +[[package]] +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest 0.10.7", + "hmac", + "password-hash", + "sha2", +] + [[package]] name = "pem" version = "1.1.1" @@ -5282,7 +5542,7 @@ dependencies = [ "thiserror", "tokio 1.31.0", "tracing", - "webpki 0.22.2", + "webpki", ] [[package]] @@ -5302,7 +5562,7 @@ dependencies = [ "thiserror", "tinyvec", "tracing", - "webpki 0.22.2", + "webpki", ] [[package]] @@ -5650,6 +5910,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_users" version = "0.4.3" @@ -5773,9 +6042,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" dependencies = [ "base64 0.21.2", "bytes 1.4.0", @@ -5786,6 +6055,7 @@ dependencies = [ "http 0.2.9", "http-body 0.4.5", "hyper 0.14.27", + "hyper-rustls", "hyper-tls 0.5.0", "ipnet", "js-sys", @@ -5795,16 +6065,22 @@ dependencies = [ "once_cell", "percent-encoding 2.3.0", "pin-project-lite", + "rustls", + "rustls-pemfile 1.0.3", "serde", "serde_json", "serde_urlencoded 0.7.1", "tokio 1.31.0", "tokio-native-tls", + "tokio-rustls", + "tokio-util", "tower-service", "url 2.4.0", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", + "webpki-roots 0.22.6", "winreg 0.10.1", ] @@ -6002,15 +6278,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.5", - "windows-sys 0.48.0", + "linux-raw-sys 0.4.12", + "windows-sys 0.52.0", ] [[package]] @@ -6022,7 +6298,7 @@ dependencies = [ "log", "ring", "sct", - "webpki 0.22.2", + "webpki", ] [[package]] @@ -6796,14 +7072,14 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" -version = "3.7.1" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if 1.0.0", "fastrand 2.0.0", - "redox_syscall 0.3.5", - "rustix 0.38.8", + "redox_syscall 0.4.1", + "rustix 0.38.28", "windows-sys 0.48.0", ] @@ -6818,11 +7094,11 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.37.23", + "rustix 0.38.28", "windows-sys 0.48.0", ] @@ -7141,7 +7417,7 @@ checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ "rustls", "tokio 1.31.0", - "webpki 0.22.2", + "webpki", ] [[package]] @@ -7237,7 +7513,7 @@ dependencies = [ "tokio 1.31.0", "tokio-rustls", "tungstenite 0.18.0", - "webpki 0.22.2", + "webpki", ] [[package]] @@ -7424,22 +7700,6 @@ dependencies = [ "cfg-if 0.1.10", ] -[[package]] -name = "ts_opentelemetry_api" -version = "0.20.0-beta.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d186495330f646b5881aeb3b83bac75b8a462d7ef32fda06a2a68f3869d5ba82" -dependencies = [ - "futures-channel", - "futures-util", - "indexmap 1.9.3", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", -] - [[package]] name = "tungstenite" version = "0.12.0" @@ -7478,19 +7738,20 @@ dependencies = [ "thiserror", "url 2.4.0", "utf-8", - "webpki 0.22.2", + "webpki", ] [[package]] name = "tx5" -version = "0.0.3-alpha" +version = "0.0.4-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20ea30df2cb7172c8410c51ae620cb61e8fb63c3f2b0e560646a81cbe6ac04d" +checksum = "68891d49fb7fdb4f0aedfe8347cf3dc9b8e28ab99cf6b6da5b1ae90682cafa21" dependencies = [ "bytes 1.4.0", "futures 0.3.28", "influxive-otel-atomic-obs", "once_cell", + "opentelemetry_api", "parking_lot 0.12.1", "rand 0.8.5", "rand-utf8", @@ -7498,7 +7759,6 @@ dependencies = [ "serde_json", "tokio 1.31.0", "tracing", - "ts_opentelemetry_api", "tx5-core", "tx5-go-pion", "tx5-signal", @@ -7507,9 +7767,9 @@ dependencies = [ [[package]] name = "tx5-core" -version = "0.0.3-alpha" +version = "0.0.4-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef6c9332a03a5dec9bc20c227ca52d6918ad74472b37921252179f190dc5e312" +checksum = "46ce4d742f95206169d6d68dc47f2064e594bd755b882740218eb2db078125df" dependencies = [ "base64 0.13.1", "dirs 5.0.1", @@ -7525,9 +7785,9 @@ dependencies = [ [[package]] name = "tx5-go-pion" -version = "0.0.3-alpha" +version = "0.0.4-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943dd802f81376a72a38a7eeaa7ee128bc221826495f0346b875358db2c53d56" +checksum = "344f080c69c305c7d3075c077799b66de47568f79577704622d28c33ef3dfdd2" dependencies = [ "futures 0.3.28", "parking_lot 0.12.1", @@ -7539,9 +7799,9 @@ dependencies = [ [[package]] name = "tx5-go-pion-sys" -version = "0.0.3-alpha" +version = "0.0.4-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f7f7a8f6dcf97e956cc8f899f01233b83e7a684b95a4ab9d501ec25596f6b7" +checksum = "5aa8e91c1a85f6b9de962c63a7086619d78cf4f876a2a1888be715091bc4a1c2" dependencies = [ "Inflector", "base64 0.13.1", @@ -7558,9 +7818,9 @@ dependencies = [ [[package]] name = "tx5-go-pion-turn" -version = "0.0.3-alpha" +version = "0.0.4-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c585cb964f1bffba37ab1bfc4f372ede0c7906e2c92ce69231ecf2d8857613" +checksum = "77a2ee4982985842265529632f96751020ecd109e6e249662037eef2cdf2a881" dependencies = [ "base64 0.13.1", "dirs 5.0.1", @@ -7576,9 +7836,9 @@ dependencies = [ [[package]] name = "tx5-signal" -version = "0.0.3-alpha" +version = "0.0.4-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ed634434030914bf893eb5d3c3f32b0c0516c9352ca14ccccbcc997178eb23" +checksum = "c01b23ba903fc189bdbb38ec4726274f297b3b303c62daf029063478137a8af9" dependencies = [ "futures 0.3.28", "lair_keystore_api", @@ -7605,11 +7865,11 @@ dependencies = [ [[package]] name = "tx5-signal-srv" -version = "0.0.3-alpha" +version = "0.0.4-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "811e5205cef837d9aae13933a6b42677e193845d03ff708dbae29131b89e019e" +checksum = "e1041cf202eb8789aaa4fc70acdae424ea3ad361e4031aa14dc30fcf0a246f69" dependencies = [ - "clap 4.3.21", + "clap 4.4.11", "dirs 5.0.1", "futures 0.3.28", "if-addrs 0.10.1", @@ -7731,7 +7991,7 @@ dependencies = [ "once_cell", "rustls", "url 2.4.0", - "webpki 0.22.2", + "webpki", "webpki-roots 0.22.6", ] @@ -8014,6 +8274,19 @@ dependencies = [ "leb128", ] +[[package]] +name = "wasm-streams" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "wasmer" version = "2.3.0" @@ -8294,16 +8567,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki" version = "0.22.2" @@ -8320,7 +8583,7 @@ version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "webpki 0.22.2", + "webpki", ] [[package]] @@ -8441,6 +8704,15 @@ dependencies = [ "windows-targets 0.48.2", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -8471,6 +8743,21 @@ dependencies = [ "windows_x86_64_msvc 0.48.2", ] +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -8483,6 +8770,12 @@ version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b10d0c968ba7f6166195e13d593af609ec2e3d24f916f081690695cf5eaffb2f" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.33.0" @@ -8501,6 +8794,12 @@ version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "571d8d4e62f26d4932099a9efe89660e8bd5087775a2ab5cdd8b747b811f1058" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.33.0" @@ -8519,6 +8818,12 @@ version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2229ad223e178db5fbbc8bd8d3835e51e566b8474bfca58d2e6150c48bb723cd" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.33.0" @@ -8537,6 +8842,12 @@ version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "600956e2d840c194eedfc5d18f8242bc2e17c7775b6684488af3a9fff6fe3287" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.33.0" @@ -8555,6 +8866,12 @@ version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea99ff3f8b49fb7a8e0d305e5aec485bd068c2ba691b6e277d29eaeac945868a" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -8567,6 +8884,12 @@ version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f1a05a1ece9a7a0d5a7ccf30ba2c33e3a61a30e042ffd247567d1de1d94120d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.33.0" @@ -8585,6 +8908,12 @@ version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d419259aba16b663966e29e6d7c6ecfa0bb8425818bb96f6f1f3c3eb71a6e7b9" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "winnow" version = "0.5.11" @@ -8676,8 +9005,45 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ + "aes", "byteorder", + "bzip2", + "constant_time_eq 0.1.5", "crc32fast", "crossbeam-utils 0.8.16", "flate2", + "hmac", + "pbkdf2", + "sha1", + "time 0.3.23", + "zstd", +] + +[[package]] +name = "zstd" +version = "0.11.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "5.0.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.9+zstd.1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +dependencies = [ + "cc", + "pkg-config", ] diff --git a/Cargo.toml b/Cargo.toml index a9f582ba6..b4c93e6f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,10 +18,10 @@ name = "holochain_scaffolding_cli" path = "src/lib.rs" [dependencies] -holochain = { features=["test_utils"], version = "0.2.3"} -holochain_types = "0.2.3" -holochain_util = { features = ["backtrace"], version = "0.2.3" } -mr_bundle = "0.2.3" +holochain = { features=["test_utils"], version = "0.2.4"} +holochain_types = "0.2.4" +holochain_util = { features = ["backtrace"], version = "0.2.4" } +mr_bundle = "0.2.4" dirs = "4.0.0" ignore = "0.4" diff --git a/flake.lock b/flake.lock index be7d87f62..482408b99 100644 --- a/flake.lock +++ b/flake.lock @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1701152506, - "narHash": "sha256-O47SHwudGHZgZBcy5K2UX7VWLIQQT8jwNwHp1gUU00Q=", + "lastModified": 1703052905, + "narHash": "sha256-7ZismLYRQhNWwSZCalomyhIqSUThZMZg0GJyA1phLRI=", "owner": "holochain", "repo": "holochain", - "rev": "93fcc367a4575eb5159c06d9168a958ee0b6a366", + "rev": "5d60d4d136d5d6ee86d60a8979ba599385f2a464", "type": "github" }, "original": { @@ -223,16 +223,16 @@ "holochain_2": { "flake": false, "locked": { - "lastModified": 1700660424, - "narHash": "sha256-hDYMjiu8Q38f9MsfpLGFYKIjSDNhXO6ta+pgxT1NGQY=", + "lastModified": 1702563980, + "narHash": "sha256-FreX9/2dj2/gxyj/1MmaZkmFKnrTUrHtH1/FD9sfE/M=", "owner": "holochain", "repo": "holochain", - "rev": "b61c9baa77c7f469386727a80064a21803a17cc3", + "rev": "adaed11bd637ae8ff4ffa216558aea226cc87a0c", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.2.3", + "ref": "holochain-0.2.4", "repo": "holochain", "type": "github" } @@ -288,11 +288,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700794826, - "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", + "lastModified": 1702830618, + "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", + "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", "type": "github" }, "original": { @@ -393,11 +393,11 @@ ] }, "locked": { - "lastModified": 1701137803, - "narHash": "sha256-0LcPAdql5IhQSUXJx3Zna0dYTgdIoYO7zUrsKgiBd04=", + "lastModified": 1703037971, + "narHash": "sha256-HzfW5MLt+I0DlfPM9sL+Vd1XrywoWiW0LSAez3wp23E=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9dd940c967502f844eacea52a61e9596268d4f70", + "rev": "16ab5af8f23b63f34dd7a48a68ab3b50dc3dd2b6", "type": "github" }, "original": { @@ -447,11 +447,11 @@ }, "locked": { "dir": "versions/0_2", - "lastModified": 1701152506, - "narHash": "sha256-O47SHwudGHZgZBcy5K2UX7VWLIQQT8jwNwHp1gUU00Q=", + "lastModified": 1703052905, + "narHash": "sha256-7ZismLYRQhNWwSZCalomyhIqSUThZMZg0GJyA1phLRI=", "owner": "holochain", "repo": "holochain", - "rev": "93fcc367a4575eb5159c06d9168a958ee0b6a366", + "rev": "5d60d4d136d5d6ee86d60a8979ba599385f2a464", "type": "github" }, "original": {