diff --git a/Cargo.lock b/Cargo.lock index 9e874f2c4..c32930c46 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -64,9 +64,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" +checksum = "c91f1f46651137be86f3a2b9a8359f9ab421d04d941c62b5982e1ca21113adf9" [[package]] name = "array-init" @@ -252,15 +252,15 @@ dependencies = [ [[package]] name = "async-task" -version = "4.2.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" +checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716" +checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" dependencies = [ "proc-macro2", "quote", @@ -314,16 +314,16 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" +checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" dependencies = [ "addr2line", "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide 0.5.3", - "object", + "miniz_oxide", + "object 0.29.0", "rustc-demangle", ] @@ -354,9 +354,9 @@ dependencies = [ [[package]] name = "bit-set" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" dependencies = [ "bit-vec", ] @@ -375,9 +375,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", "radium", @@ -515,9 +515,9 @@ checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" [[package]] name = "bytecheck" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a31f923c2db9513e4298b72df143e6e655a759b3d6a0966df18f81223fff54f" +checksum = "d11cac2c12b5adc6570dad2ee1b87eff4955dac476fe12d81e5fdd352e52406f" dependencies = [ "bytecheck_derive", "ptr_meta", @@ -525,9 +525,9 @@ dependencies = [ [[package]] name = "bytecheck_derive" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb17c862a905d912174daa27ae002326fff56dc8b8ada50a0a5f0976cb174f0" +checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf" dependencies = [ "proc-macro2", "quote", @@ -542,9 +542,9 @@ checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" [[package]] name = "bytemuck" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c53dfa917ec274df8ed3c572698f381a24eef2efba9492d797301b72b6db408a" +checksum = "a5377c8865e74a160d21f29c2d40669f53286db6eab59b88540cbb12ffc8b835" [[package]] name = "byteorder" @@ -554,9 +554,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" [[package]] name = "cache-padded" @@ -590,7 +590,7 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.12", + "semver 1.0.13", "serde", "serde_json", ] @@ -621,9 +621,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chacha20" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b72a433d0cf2aef113ba70f62634c56fddb0f244e6377185c56a7cadbd8f91" +checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" dependencies = [ "cfg-if 1.0.0", "cipher", @@ -633,9 +633,9 @@ dependencies = [ [[package]] name = "chacha20poly1305" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b84ed6d1d5f7aa9bdde921a5090e0ca4d934d250ea3b402a5fab3a994e28a2a" +checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ "aead", "chacha20", @@ -646,14 +646,15 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "6127248204b9aba09a362f6c930ef6a78f2c1b2215f8a7b398c06e1083f17af0" dependencies = [ - "libc", + "js-sys", "num-integer", "num-traits", "time 0.1.44", + "wasm-bindgen", "winapi", ] @@ -683,9 +684,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.8" +version = "3.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190814073e85d238f31ff738fcb0bf6910cedeb73376c87cd69291028966fd83" +checksum = "a3dbbb6653e7c55cc8595ad3e1f7be8f32aba4eb7ff7f0fd1163d4f3d137c0a9" dependencies = [ "atty", "bitflags", @@ -700,9 +701,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.2.7" +version = "3.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759bf187376e1afa7b85b959e6a664a3e7a95203415dba952ad19139e798f902" +checksum = "9ba52acd3b0a5c33aeada5cdaa3267cdc7c594a98731d4268cdc1532f4264cb4" dependencies = [ "heck 0.4.0", "proc-macro-error", @@ -737,28 +738,33 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "concurrent-queue" -version = "1.2.2" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" +checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" dependencies = [ "cache-padded", ] [[package]] name = "console" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31" +checksum = "89eab4d20ce20cea182308bca13088fecea9c05f6776cf287205d41a0ed3c847" dependencies = [ "encode_unicode", "libc", "once_cell", - "regex", "terminal_size", "unicode-width", "winapi", ] +[[package]] +name = "const-cstr" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6" + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -925,9 +931,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -935,9 +941,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", @@ -946,9 +952,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d" +checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" dependencies = [ "autocfg", "cfg-if 1.0.0", @@ -960,9 +966,9 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" +checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -970,9 +976,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83" +checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -1011,9 +1017,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-common" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5999502d32b9c48d492abe66392408144895020ec4709e549e840799f3bb74c0" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", "typenum", @@ -1079,9 +1085,9 @@ checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df" [[package]] name = "ctor" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" +checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" dependencies = [ "quote", "syn", @@ -1093,7 +1099,7 @@ version = "3.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b37feaa84e6861e00a1f5e5aa8da3ee56d605c9992d33e082786754828e20865" dependencies = [ - "nix 0.24.1", + "nix 0.24.2", "winapi", ] @@ -1129,7 +1135,7 @@ dependencies = [ "async-executor", "async-std", "async-trait", - "clap 3.2.8", + "clap 3.2.16", "darkfi", "futures", "log", @@ -1177,7 +1183,7 @@ dependencies = [ "bs58", "bytes", "chrono", - "clap 3.2.8", + "clap 3.2.16", "crypto_api_chachapoly", "darkfi-derive", "darkfi-derive-internal", @@ -1194,6 +1200,7 @@ dependencies = [ "hex", "incrementalmerkletree", "indexmap", + "indicatif", "itertools", "lazy-init", "lazy_static", @@ -1221,7 +1228,7 @@ dependencies = [ "subtle", "termion", "thiserror", - "toml 0.5.9", + "toml", "tungstenite", "url", "wasmer", @@ -1234,7 +1241,7 @@ name = "darkfi-derive" version = "0.3.0" dependencies = [ "darkfi-derive-internal", - "proc-macro-crate 1.1.3", + "proc-macro-crate 1.2.0", "proc-macro2", "syn", ] @@ -1279,6 +1286,22 @@ dependencies = [ "url", ] +[[package]] +name = "darkotc" +version = "0.3.0" +dependencies = [ + "async-std", + "bs58", + "clap 3.2.16", + "darkfi", + "halo2_gadgets", + "halo2_proofs", + "num-bigint", + "rand", + "serde_json", + "url", +] + [[package]] name = "darling" version = "0.10.2" @@ -1363,7 +1386,7 @@ dependencies = [ "serde", "simplelog", "smol", - "toml 0.4.10", + "toml", "url", ] @@ -1386,12 +1409,11 @@ dependencies = [ [[package]] name = "deflate" -version = "0.8.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" +checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f" dependencies = [ "adler32", - "byteorder", ] [[package]] @@ -1491,13 +1513,22 @@ dependencies = [ "winapi", ] +[[package]] +name = "dlib" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" +dependencies = [ + "libloading", +] + [[package]] name = "dnetview" version = "0.3.0" dependencies = [ "async-channel", "async-std", - "clap 3.2.8", + "clap 3.2.16", "darkfi", "easy-parallel", "fxhash", @@ -1515,19 +1546,24 @@ dependencies = [ ] [[package]] -name = "dotenv" -version = "0.15.0" +name = "dotenvy" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" +checksum = "7e851a83c30366fd01d75b913588e95e74a1705c1ecc5d58b1f8e1a6d556525f" +dependencies = [ + "dirs 4.0.0", +] [[package]] name = "drk" version = "0.3.0" dependencies = [ "async-std", - "clap 3.2.8", + "clap 3.2.16", "darkfi", "log", + "num-bigint", + "prettytable-rs", "serde_json", "simplelog", "url", @@ -1660,19 +1696,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "2.5.2" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" - -[[package]] -name = "expat-sys" -version = "2.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" -dependencies = [ - "cmake", - "pkg-config", -] +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fallible-iterator" @@ -1695,9 +1721,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" dependencies = [ "instant", ] @@ -1751,14 +1777,14 @@ checksum = "7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e" [[package]] name = "flume" -version = "0.10.13" +version = "0.10.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ceeb589a3157cac0ab8cc585feb749bd2cea5cb55a6ee802ad72d9fd38303da" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" dependencies = [ "futures-core", "futures-sink", "pin-project", - "spin 0.9.3", + "spin 0.9.4", ] [[package]] @@ -1769,9 +1795,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-kit" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c9a156ec38864999bc9c4156e5f3b50224d4a5578028a64e5a3875caa9ee28" +checksum = "21fe28504d371085fae9ac7a3450f0b289ab71e07c8e57baa3fb68b9e57d6ce5" dependencies = [ "bitflags", "byteorder", @@ -1787,9 +1813,9 @@ dependencies = [ "log", "pathfinder_geometry", "pathfinder_simd", - "servo-fontconfig", "walkdir", "winapi", + "yeslogic-fontconfig-sys", ] [[package]] @@ -1991,9 +2017,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.5" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", "version_check", @@ -2033,9 +2059,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" +checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" dependencies = [ "fallible-iterator", "indexmap", @@ -2121,9 +2147,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ "ahash", ] @@ -2134,7 +2160,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d452c155cb93fecdfb02a73dd57b5d8e442c2063bd7aac72f1bc5e4263a43086" dependencies = [ - "hashbrown 0.12.1", + "hashbrown 0.12.3", ] [[package]] @@ -2178,7 +2204,7 @@ checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ "bytes", "fnv", - "itoa 1.0.2", + "itoa 1.0.3", ] [[package]] @@ -2206,15 +2232,14 @@ dependencies = [ [[package]] name = "image" -version = "0.23.14" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" +checksum = "7e30ca2ecf7666107ff827a8e481de6a132a9b687ed3bb20bb1c144a36c00964" dependencies = [ "bytemuck", "byteorder", "color_quant", "jpeg-decoder", - "num-iter", "num-rational", "num-traits", "png", @@ -2236,15 +2261,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown 0.12.1", + "hashbrown 0.12.3", "serde", ] [[package]] name = "indicatif" -version = "0.17.0-rc.11" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017d0ce94b8e91e29d2c78ed891e57e5ec3dc4371820a9d96abab4af09eb8ad" +checksum = "fcc42b206e70d86ec03285b123e65a5458c92027d1fb2ae3555878b8113b3ddf" dependencies = [ "console", "number_prefix", @@ -2269,7 +2294,7 @@ dependencies = [ "async-std", "async-trait", "bs58", - "clap 3.2.8", + "clap 3.2.16", "crypto_box", "ctrlc-async", "darkfi", @@ -2287,7 +2312,7 @@ dependencies = [ "smol", "structopt", "structopt-toml", - "toml 0.5.9", + "toml", "url", ] @@ -2308,21 +2333,21 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" +checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" [[package]] name = "jpeg-decoder" -version = "0.1.22" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" +checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b" [[package]] name = "js-sys" -version = "0.3.58" +version = "0.3.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27" +checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" dependencies = [ "wasm-bindgen", ] @@ -2338,9 +2363,9 @@ dependencies = [ [[package]] name = "lazy-init" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23517540be87a91d06324e6bf6286ba8214171123ee8862ae9a5e7d938d71815" +checksum = "9f40963626ac12dcaf92afc15e4c3db624858c92fd9f8ba2125eaada3ac2706f" [[package]] name = "lazy_static" @@ -2356,9 +2381,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.126" +version = "0.2.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "505e71a4706fa491e9b1b55f51b95d4037d0821ee40131190475f692b35b009b" [[package]] name = "libloading" @@ -2399,7 +2424,7 @@ dependencies = [ "simplelog", "structopt", "structopt-toml", - "toml 0.5.9", + "toml", "url", ] @@ -2467,9 +2492,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5172b50c23043ff43dd53e51392f36519d9b35a8f3a410d30ece5d1aedd58ae" +checksum = "3a79b39c93a7a5a27eeaf9a23b5ff43f1b9e0ad6b1cdd441140ae53c35613fc7" dependencies = [ "libc", ] @@ -2495,15 +2520,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - [[package]] name = "miniz_oxide" version = "0.5.3" @@ -2564,9 +2580,9 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9" +checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -2605,22 +2621,11 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-rational" -version = "0.3.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", "num-integer", @@ -2680,10 +2685,19 @@ dependencies = [ ] [[package]] -name = "once_cell" -version = "1.12.0" +name = "object" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" [[package]] name = "opaque-debug" @@ -2693,9 +2707,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.40" +version = "0.10.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e" +checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -2725,9 +2739,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.74" +version = "0.9.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "835363342df5fba8354c5b453325b110ffd54044e588c539cf2f20a8014e4cb1" +checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" dependencies = [ "autocfg", "cc", @@ -2738,9 +2752,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.1.0" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa" +checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" [[package]] name = "parking" @@ -2778,7 +2792,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.13", + "redox_syscall 0.2.16", "smallvec", "winapi", ] @@ -2791,7 +2805,7 @@ checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.13", + "redox_syscall 0.2.16", "smallvec", "windows-sys 0.36.1", ] @@ -2813,9 +2827,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" +checksum = "9423e2b32f7a043629287a536f21951e8c6a82482d0acb1eeebfc90bc2225b22" [[package]] name = "pathfinder_geometry" @@ -2838,9 +2852,9 @@ dependencies = [ [[package]] name = "pem" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947" +checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" dependencies = [ "base64", ] @@ -2853,10 +2867,11 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pest" -version = "2.1.3" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +checksum = "69486e2b8c2d2aeb9762db7b4e00b0331156393555cff467f4163ff06821eef8" dependencies = [ + "thiserror", "ucd-trie", ] @@ -2900,9 +2915,9 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "plotters" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a" +checksum = "9428003b84df1496fb9d6eeee9c5f8145cb41ca375eb0dad204328888832811f" dependencies = [ "chrono", "font-kit", @@ -2920,15 +2935,15 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c" +checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" [[package]] name = "plotters-bitmap" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21362fa905695e5618aefd169358f52e0e8bc4a8e05333cf780fda8cddc00b54" +checksum = "0c4a1f21490a6cf4a84c272ad20bd7844ed99a3178187a4c5ab7f2051295beef" dependencies = [ "gif", "image", @@ -2937,23 +2952,23 @@ dependencies = [ [[package]] name = "plotters-svg" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9" +checksum = "e0918736323d1baff32ee0eade54984f6f201ad7e97d5cfb5d6ab4a358529615" dependencies = [ "plotters-backend", ] [[package]] name = "png" -version = "0.16.8" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" +checksum = "dc38c0ad57efb786dd57b9864e5b18bae478c00c824dc55a38bbc9da95dde3ba" dependencies = [ "bitflags", "crc32fast", "deflate", - "miniz_oxide 0.3.7", + "miniz_oxide", ] [[package]] @@ -3006,17 +3021,18 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" dependencies = [ - "toml 0.5.9", + "toml", ] [[package]] name = "proc-macro-crate" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" +checksum = "26d50bfb8c23f23915855a00d98b5a35ef2e0b871bb52937bacadb798fbb66c8" dependencies = [ + "once_cell", "thiserror", - "toml 0.5.9", + "toml", ] [[package]] @@ -3045,9 +3061,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" +checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" dependencies = [ "unicode-ident", ] @@ -3094,9 +3110,9 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34f197a544b0c9ab3ae46c359a7ec9cbbb5c7bf97054266fecb7ead794a181d6" +checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" dependencies = [ "bitflags", "memchr", @@ -3117,9 +3133,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quote" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" dependencies = [ "proc-macro2", ] @@ -3201,13 +3217,13 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fa2d386df8533b02184941c76ae2e0d0c1d053f5d43339169d80f21275fc5e" +checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", "ring", - "time 0.3.11", + "time 0.3.12", "yasna", ] @@ -3219,9 +3235,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_syscall" -version = "0.2.13" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ "bitflags", ] @@ -3232,7 +3248,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f" dependencies = [ - "redox_syscall 0.2.13", + "redox_syscall 0.2.16", ] [[package]] @@ -3253,7 +3269,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom 0.2.7", - "redox_syscall 0.2.13", + "redox_syscall 0.2.16", "thiserror", ] @@ -3270,9 +3286,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.6" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" dependencies = [ "aho-corasick", "memchr", @@ -3287,9 +3303,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" -version = "0.6.26" +version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" [[package]] name = "region" @@ -3352,7 +3368,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cec2b3485b07d96ddfd3134767b8a447b45ea4eb91448d0a35180ec0ffd5ed15" dependencies = [ "bytecheck", - "hashbrown 0.12.1", + "hashbrown 0.12.3", "ptr_meta", "rend", "rkyv_derive", @@ -3417,18 +3433,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" +checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" dependencies = [ "base64", ] [[package]] name = "rustversion" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0a5f7c728f5d284929a1cccb5bc19884422bfe6ef4d6c409da2c41838983fcf" +checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" [[package]] name = "rusty-fork" @@ -3444,9 +3460,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" [[package]] name = "salsa20" @@ -3533,9 +3549,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1" +checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711" dependencies = [ "serde", ] @@ -3551,27 +3567,27 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.138" +version = "1.0.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1578c6245786b9d168c5447eeacfb96856573ca56c9d68fdcf394be134882a47" +checksum = "e590c437916fb6b221e1d00df6e3294f3fccd70ca7e92541c475d6ed6ef5fee2" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.6" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212e73464ebcde48d723aa02eb270ba62eff38a9b732df31f33f1b4e145f3a54" +checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.138" +version = "1.0.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "023e9b1467aef8a10fb88f25611870ada9800ef7e22afce356bb0d2387b6f27c" +checksum = "34b5b8d809babe02f538c2cfec6f2c1ed10804c0e5a6a041a049a4f5588ccc2e" dependencies = [ "proc-macro2", "quote", @@ -3580,36 +3596,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" +checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7" dependencies = [ - "itoa 1.0.2", + "itoa 1.0.3", "ryu", "serde", ] -[[package]] -name = "servo-fontconfig" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c" -dependencies = [ - "libc", - "servo-fontconfig-sys", -] - -[[package]] -name = "servo-fontconfig-sys" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" -dependencies = [ - "expat-sys", - "freetype-sys", - "pkg-config", -] - [[package]] name = "sha-1" version = "0.10.0" @@ -3670,7 +3665,7 @@ checksum = "48dfff04aade74dd495b007c831cd6f4e0cee19c344dd9dc0884c0289b70a786" dependencies = [ "log", "termcolor", - "time 0.3.11", + "time 0.3.12", ] [[package]] @@ -3690,9 +3685,12 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] [[package]] name = "sled" @@ -3752,9 +3750,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spin" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c530c2b0d0bf8b69304b39fe2001993e267461948b890cd037d8ad4293fa1a0d" +checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" dependencies = [ "lock_api", ] @@ -3772,9 +3770,9 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f82cbe94f41641d6c410ded25bbf5097c240cefdf8e3b06d04198d0a96af6a4" +checksum = "788841def501aabde58d3666fcea11351ec3962e6ea75dbcd05c84a71d68bcd1" dependencies = [ "sqlx-core", "sqlx-macros", @@ -3782,9 +3780,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b69bf218860335ddda60d6ce85ee39f6cf6e5630e300e19757d1de15886a093" +checksum = "8c21d3b5e7cadfe9ba7cdc1295f72cc556c750b4419c27c219c0693198901f8e" dependencies = [ "ahash", "atoi", @@ -3793,6 +3791,7 @@ dependencies = [ "bytes", "crc", "crossbeam-queue", + "dotenvy", "either", "event-listener", "flume", @@ -3804,7 +3803,7 @@ dependencies = [ "hashlink", "hex", "indexmap", - "itoa 1.0.2", + "itoa 1.0.3", "libc", "libsqlite3-sys", "log", @@ -3823,11 +3822,11 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40c63177cf23d356b159b60acd27c54af7423f1736988502e36bae9a712118f" +checksum = "4adfd2df3557bddd3b91377fc7893e8fa899e9b4061737cbade4e1bb85f1b45c" dependencies = [ - "dotenv", + "dotenvy", "either", "heck 0.4.0", "once_cell", @@ -3842,9 +3841,9 @@ dependencies = [ [[package]] name = "sqlx-rt" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874e93a365a598dc3dadb197565952cb143ae4aa716f7bcc933a8d836f6bf89f" +checksum = "7be52fc7c96c136cedea840ed54f7d446ff31ad670c9dea95ebcb998530971a3" dependencies = [ "async-native-tls", "async-std", @@ -3917,9 +3916,9 @@ dependencies = [ [[package]] name = "structopt-toml" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c27d68c57e6cc3fb03041c49534e50a6ccef677c511effc1c5bf12a4bc865a62" +checksum = "4d887e6156acb1f4e2d2968d61d1d3b6c5e102af5f23c3ca606723b5ac2c45cb" dependencies = [ "anyhow", "clap 2.34.0", @@ -3928,15 +3927,16 @@ dependencies = [ "skeptic", "structopt", "structopt-toml-derive", - "toml 0.5.9", + "toml", ] [[package]] name = "structopt-toml-derive" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "316302a563af68baf93e5e77b8355a8bfe168c67c4424623365ca5bf521d013e" +checksum = "216c57b49178d22a3ec2f0ce5e961219d11772f7ca70b00c08879d15827d6daf" dependencies = [ + "heck 0.4.0", "proc-macro2", "quote", "syn", @@ -3950,9 +3950,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.98" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" dependencies = [ "proc-macro2", "quote", @@ -4000,7 +4000,7 @@ version = "0.3.0" dependencies = [ "async-std", "chrono", - "clap 3.2.8", + "clap 3.2.16", "darkfi", "log", "prettytable-rs", @@ -4036,7 +4036,7 @@ dependencies = [ "structopt", "structopt-toml", "thiserror", - "toml 0.5.9", + "toml", "url", ] @@ -4049,7 +4049,7 @@ dependencies = [ "cfg-if 1.0.0", "fastrand", "libc", - "redox_syscall 0.2.13", + "redox_syscall 0.2.16", "remove_dir_all", "winapi", ] @@ -4092,7 +4092,7 @@ checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" dependencies = [ "libc", "numtoa", - "redox_syscall 0.2.13", + "redox_syscall 0.2.16", "redox_termios", ] @@ -4113,18 +4113,18 @@ checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] name = "thiserror" -version = "1.0.31" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.31" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" dependencies = [ "proc-macro2", "quote", @@ -4144,11 +4144,12 @@ dependencies = [ [[package]] name = "time" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c91f41dcb2f096c05f0873d667dceec1087ce5bcf984ec8ffb19acddbb3217" +checksum = "74b7cc93fc23ba97fde84f7eea56c55d1ba183f495c6715defdfc7b9cb8c870f" dependencies = [ - "itoa 1.0.2", + "itoa 1.0.3", + "js-sys", "libc", "num_threads", "time-macros", @@ -4175,15 +4176,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" -[[package]] -name = "toml" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" -dependencies = [ - "serde", -] - [[package]] name = "toml" version = "0.5.9" @@ -4195,9 +4187,9 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.35" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" +checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" dependencies = [ "cfg-if 1.0.0", "log", @@ -4219,18 +4211,18 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.28" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7" +checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" dependencies = [ "once_cell", ] [[package]] name = "ttf-parser" -version = "0.12.3" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae2f58a822f08abdaf668897e96a5656fe72f5a9ce66422423e8849384872e6" +checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" [[package]] name = "tui" @@ -4248,9 +4240,9 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.17.2" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5" +checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" dependencies = [ "base64", "byteorder", @@ -4273,9 +4265,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "ucd-trie" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +checksum = "89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c" [[package]] name = "uint" @@ -4306,9 +4298,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" +checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" [[package]] name = "unicode-normalization" @@ -4393,7 +4385,7 @@ name = "vanityaddr" version = "0.3.0" dependencies = [ "bs58", - "clap 3.2.8", + "clap 3.2.16", "ctrlc", "darkfi", "indicatif", @@ -4472,9 +4464,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.81" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994" +checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -4482,13 +4474,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.81" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a" +checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" dependencies = [ "bumpalo", - "lazy_static", "log", + "once_cell", "proc-macro2", "quote", "syn", @@ -4497,9 +4489,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.31" +version = "0.4.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de9a9cec1733468a8c657e57fa2413d2ae2c0129b95e87c5b72b8ace4d13f31f" +checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -4509,9 +4501,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.81" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa" +checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4519,9 +4511,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.81" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048" +checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" dependencies = [ "proc-macro2", "quote", @@ -4532,15 +4524,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.81" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be" +checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" [[package]] name = "wasm-encoder" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f0c17267a5ffd6ae3d897589460e21db1673c84fb7016b909c9691369a75ea" +checksum = "8905fd25fdadeb0e7e8bf43a9f46f9f972d6291ad0c7a32573b88dd13a6cfa6b" dependencies = [ "leb128", ] @@ -4689,7 +4681,7 @@ dependencies = [ "leb128", "libloading", "loupe", - "object", + "object 0.28.4", "rkyv", "serde", "tempfile", @@ -4757,7 +4749,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d831335ff3a44ecf451303f6f891175c642488036b92ceceb24ac8623a8fa8b" dependencies = [ - "object", + "object 0.28.4", "thiserror", "wasmer-compiler", "wasmer-types", @@ -4815,9 +4807,9 @@ checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" [[package]] name = "wast" -version = "42.0.0" +version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "badcb03f976f983ff0daf294da9697be659442f61e6b0942bb37a2b6cbfe9dd4" +checksum = "186c474c4f9bb92756b566d592a16591b4526b1a4841171caa3f31d7fe330d96" dependencies = [ "leb128", "memchr", @@ -4827,18 +4819,18 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b92f20b742ac527066c8414bc0637352661b68cab07ef42586cefaba71c965cf" +checksum = "c2d4bc4724b4f02a482c8cab053dac5ef26410f264c06ce914958f9a42813556" dependencies = [ "wast", ] [[package]] name = "web-sys" -version = "0.3.58" +version = "0.3.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90" +checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" dependencies = [ "js-sys", "wasm-bindgen", @@ -4868,9 +4860,9 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c97e489d8f836838d497091de568cf16b117486d529ec5579233521065bd5e4" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "wepoll-ffi" @@ -5058,7 +5050,19 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346d34a236c9d3e5f3b9b74563f238f955bbd05fa0b8b4efa53c130c43982f4c" dependencies = [ - "time 0.3.11", + "time 0.3.12", +] + +[[package]] +name = "yeslogic-fontconfig-sys" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2bbd69036d397ebbff671b1b8e4d918610c181c5a16073b96f984a38d08c386" +dependencies = [ + "const-cstr", + "dlib", + "once_cell", + "pkg-config", ] [[package]] @@ -5086,6 +5090,6 @@ dependencies = [ name = "zkas" version = "0.3.0" dependencies = [ - "clap 3.2.8", + "clap 3.2.16", "darkfi", ] diff --git a/Cargo.toml b/Cargo.toml index 2e8949096..389b963d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,6 +21,7 @@ members = [ "bin/zkas", #"bin/cashierd", "bin/darkfid", + "bin/darkotc", "bin/drk", "bin/faucetd", "bin/ircd", @@ -43,15 +44,15 @@ members = [ [dependencies] # Hard dependencies -libc = "0.2.126" +libc = "0.2.127" log = "0.4.17" -thiserror = "1.0.31" +thiserror = "1.0.32" # async-runtime smol = {version = "1.2.5", optional = true} futures = {version = "0.3.21", optional = true} async-std = {version = "1.12.0", features = ["attributes"], optional = true} -async-trait = {version = "0.1.56", optional = true} +async-trait = {version = "0.1.57", optional = true} async-channel = {version = "1.6.1", optional = true} async-executor = {version = "1.4.1", optional = true} @@ -65,48 +66,49 @@ futures-rustls = {version = "0.22.1", features = ["dangerous_configuration"], op # TLS cert utilities ed25519-compact = {version = "1.0.11", features = ["pem"], optional = true} -rcgen = {version = "0.9.2", features = ["pem"], optional = true} -rustls-pemfile = {version = "1.0.0", optional = true} +rcgen = {version = "0.9.3", features = ["pem"], optional = true} +rustls-pemfile = {version = "1.0.1", optional = true} # Encoding hex = {version = "0.4.3", optional = true} bs58 = {version = "0.4.0", optional = true} toml = {version = "0.5.9", optional = true} -bytes = {version = "1.1.0", optional = true} +bytes = {version = "1.2.1", optional = true} bincode = {version = "2.0.0-rc.1", features = ["serde"], optional = true} num-bigint = {version = "0.4.3", features = ["serde"], optional = true} -serde_json = {version = "1.0.82", optional = true} -serde = {version = "1.0.138", features = ["derive"], optional = true} +serde_json = {version = "1.0.83", optional = true} +serde = {version = "1.0.142", features = ["derive"], optional = true} structopt = {version= "0.3.26", optional = true} -structopt-toml = {version= "0.5.0", optional = true} +structopt-toml = {version= "0.5.1", optional = true} # Utilities url = {version = "2.2.2", features = ["serde"], optional = true} dirs = {version = "4.0.0", optional = true} subtle = {version = "2.4.1", optional = true} lazy_static = {version = "1.4.0", optional = true} -lazy-init = {version = "0.5.0", optional = true} +lazy-init = {version = "0.5.1", optional = true} fxhash = {version = "0.2.1", optional = true} indexmap = {version = "1.9.1", optional = true} itertools = {version = "0.10.3", optional = true} darkfi-derive = {path = "src/util/derive", optional = true} darkfi-derive-internal = {path = "src/util/derive-internal", optional = true} chrono = {version = "0.4.19", optional = true} -regex = {version = "1.5.6", optional = true} +regex = {version = "1.6.0", optional = true} # Misc termion = {version = "1.5.6", optional = true} simplelog = {version = "0.12.0", optional = true} +indicatif = {version = "0.17.0", optional = true} # Websockets -tungstenite = {version = "0.17.2", optional = true} +tungstenite = {version = "0.17.3", optional = true} async-tungstenite = {version = "0.17.2", optional = true} # socks5 fast-socks5 = {version = "0.4.3", optional = true} # Crypto -bitvec = {version = "1.0.0", optional = true} +bitvec = {version = "1.0.1", optional = true} rand = {version = "0.8.5", optional = true} blake3 = {version = "1.3.1", optional = true} sha2 = {version = "0.10.2", optional = true} @@ -128,20 +130,20 @@ wasmer-compiler-singlepass = {version = "2.3.0", optional = true} wasmer-middlewares = {version = "2.3.0", optional = true} # Wallet management -sqlx = {version = "0.6.0", features = ["runtime-async-std-native-tls", "sqlite"], optional = true} -libsqlite3-sys = {version = "0.24.2", features = ["bundled-sqlcipher"], optional = true } +sqlx = {version = "0.6.1", features = ["runtime-async-std-native-tls", "sqlite"], optional = true} +libsqlite3-sys = {version = "0.24.1", features = ["bundled-sqlcipher"], optional = true } # Blockchain store sled = {version = "0.34.7", optional = true} [dev-dependencies] -clap = {version = "3.2.8", features = ["derive"]} +clap = {version = "3.2.16", features = ["derive"]} halo2_proofs = {version = "0.2.0", features = ["dev-graph", "gadget-traces", "sanity-checks"]} halo2_gadgets = {version = "0.2.0", features = ["dev-graph", "test-dependencies"]} #halo2_proofs = {git = "https://github.com/zcash/halo2.git", rev = "a898d65ae3ad3d41987666f6a03cfc15edae01c4", features = ["dev-graph", "gadget-traces", "sanity-checks"]} #halo2_gadgets = {git = "https://github.com/zcash/halo2.git", rev = "a898d65ae3ad3d41987666f6a03cfc15edae01c4", features = ["dev-graph", "test-dependencies"]} -plotters = "0.3.1" +plotters = "0.3.2" [features] async-runtime = [ @@ -177,6 +179,7 @@ util = [ "num-bigint", "fxhash", "chrono", + "indicatif", "async-net", "async-runtime", diff --git a/bin/cashierd/Cargo.toml b/bin/cashierd/Cargo.toml index 36df915d5..83f03a081 100644 --- a/bin/cashierd/Cargo.toml +++ b/bin/cashierd/Cargo.toml @@ -12,7 +12,7 @@ features = ["wallet", "node", "rpc"] smol = "1.2.5" futures = "0.3.21" async-std = "1.12.0" -async-trait = "0.1.56" +async-trait = "0.1.57" async-channel = "1.6.1" async-executor = "1.4.1" easy-parallel = "3.2.0" @@ -21,23 +21,23 @@ easy-parallel = "3.2.0" rand = "0.8.5" # Misc -clap = {version = "3.2.8", features = ["derive"]} +clap = {version = "3.2.16", features = ["derive"]} log = "0.4.17" num_cpus = "1.13.1" simplelog = "0.12.0" -thiserror = "1.0.31" +thiserror = "1.0.32" url = "2.2.2" fxhash = "0.2.1" # Encoding and parsing -serde = {version = "1.0.138", features = ["derive"]} -serde_json = "1.0.82" +serde = {version = "1.0.142", features = ["derive"]} +serde_json = "1.0.83" # Bitcoin bridge dependencies -bdk = {version = "0.19.0", optional = true} -anyhow = {version = "1.0.58", optional = true} +bdk = {version = "0.20.0", optional = true} +anyhow = {version = "1.0.60", optional = true} bitcoin = {version = "0.28.1", optional = true} -secp256k1 = {version = "0.23.3", default-features = false, features = ["rand-std"], optional = true} +secp256k1 = {version = "0.24.0", default-features = false, features = ["rand-std"], optional = true} # Ethereum bridge dependencies hex = {version = "0.4.3", optional = true} @@ -49,11 +49,11 @@ num-bigint = {version = "0.4.3", features = ["rand", "serde"], optional = true} # Solana bridge dependencies native-tls = {version = "0.2.10", optional = true} async-native-tls = {version = "0.4.0", optional = true} -solana-client = {version = "1.10.29", optional = true} -solana-sdk = {version = "1.10.29", optional = true} -spl-associated-token-account = {version = "1.0.5", features = ["no-entrypoint"], optional = true} -spl-token = {version = "3.4.0-alpha", features = ["no-entrypoint"], optional = true} -tungstenite = {version = "0.17.2", optional = true} +solana-client = {version = "1.11.5", optional = true} +solana-sdk = {version = "1.11.5", optional = true} +spl-associated-token-account = {version = "1.1.1", features = ["no-entrypoint"], optional = true} +spl-token = {version = "3.5.0", features = ["no-entrypoint"], optional = true} +tungstenite = {version = "0.17.3", optional = true} [features] btc = [ diff --git a/bin/dao-cli/Cargo.toml b/bin/dao-cli/Cargo.toml index 5ddcce1f0..ed4e8c8c4 100644 --- a/bin/dao-cli/Cargo.toml +++ b/bin/dao-cli/Cargo.toml @@ -12,16 +12,16 @@ features = ["rpc"] smol = "1.2.5" futures = "0.3.21" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.56" +async-trait = "0.1.57" async-channel = "1.6.1" async-executor = "1.4.1" # Misc -clap = {version = "3.2.8", features = ["derive"]} +clap = {version = "3.2.16", features = ["derive"]} log = "0.4.17" num_cpus = "1.13.1" simplelog = "0.12.0" url = "2.2.2" # Encoding and parsing -serde_json = "1.0.82" +serde_json = "1.0.83" diff --git a/bin/daod/Cargo.toml b/bin/daod/Cargo.toml index 3d6496710..1d9ff75a1 100644 --- a/bin/daod/Cargo.toml +++ b/bin/daod/Cargo.toml @@ -12,7 +12,7 @@ features = ["rpc"] smol = "1.2.5" futures = "0.3.21" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.56" +async-trait = "0.1.57" async-channel = "1.6.1" async-executor = "1.4.1" easy-parallel = "3.2.0" @@ -24,4 +24,4 @@ simplelog = "0.12.0" url = "2.2.2" # Encoding and parsing -serde_json = "1.0.82" +serde_json = "1.0.83" diff --git a/bin/darkfid/Cargo.toml b/bin/darkfid/Cargo.toml index 713ba90d4..cca0ffb05 100644 --- a/bin/darkfid/Cargo.toml +++ b/bin/darkfid/Cargo.toml @@ -12,7 +12,7 @@ edition = "2021" async-channel = "1.6.1" async-executor = "1.4.1" async-std = "1.12.0" -async-trait = "0.1.56" +async-trait = "0.1.57" blake3 = "1.3.1" bs58 = "0.4.0" chrono = "0.4.19" @@ -21,18 +21,18 @@ darkfi = {path = "../../", features = ["blockchain", "wallet", "rpc", "net", "no easy-parallel = "3.2.0" futures-lite = "1.12.0" fxhash = "0.2.1" -lazy-init = "0.5.0" +lazy-init = "0.5.1" log = "0.4.17" num-bigint = {version = "0.4.3", features = ["serde"]} pasta_curves = "0.4.0" rand = "0.8.5" -serde_json = "1.0.82" +serde_json = "1.0.83" simplelog = "0.12.0" sled = "0.34.7" url = "2.2.2" # Argument parsing -serde = "1.0.138" -serde_derive = "1.0.138" +serde = "1.0.142" +serde_derive = "1.0.142" structopt = "0.3.26" -structopt-toml = "0.5.0" +structopt-toml = "0.5.1" diff --git a/bin/darkotc/Cargo.toml b/bin/darkotc/Cargo.toml new file mode 100644 index 000000000..09a745b61 --- /dev/null +++ b/bin/darkotc/Cargo.toml @@ -0,0 +1,21 @@ +[package] +name = "darkotc" +version = "0.3.0" +homepage = "https://dark.fi" +description = "Atomic swap commandline tool" +authors = ["darkfi "] +repository = "https://github.com/darkrenaissance/darkfi" +license = "AGPL-3.0-only" +edition = "2021" + +[dependencies] +async-std = {version = "1.12.0", features = ["attributes"]} +bs58 = "0.4.0" +clap = {version = "3.2.16", features = ["derive"]} +darkfi = {path = "../../", features = ["crypto", "rpc", "util"]} +halo2_proofs = "0.2.0" +halo2_gadgets = "0.2.0" +num-bigint = {version = "0.4.3", features = ["serde"]} +rand = "0.8.5" +serde_json = "1.0.83" +url = "2.2.2" diff --git a/bin/dnetview/Cargo.toml b/bin/dnetview/Cargo.toml index acb507ece..a7b147c17 100644 --- a/bin/dnetview/Cargo.toml +++ b/bin/dnetview/Cargo.toml @@ -19,16 +19,16 @@ easy-parallel = "3.2.0" async-channel = "1.6.1" # Misc -clap = "3.2.8" +clap = "3.2.16" rand = "0.8.5" simplelog = "0.12.0" log = "0.4.17" num_cpus = "1.13.1" url = "2.2.2" fxhash = "0.2.1" -thiserror = "1.0.31" +thiserror = "1.0.32" # Encoding and parsing -serde_json = "1.0.82" -serde = {version = "1.0.138", features = ["derive"]} +serde_json = "1.0.83" +serde = {version = "1.0.142", features = ["derive"]} diff --git a/bin/drk/Cargo.toml b/bin/drk/Cargo.toml index 56e45d2c1..1dac7488c 100644 --- a/bin/drk/Cargo.toml +++ b/bin/drk/Cargo.toml @@ -10,11 +10,11 @@ edition = "2021" [dependencies] async-std = {version = "1.12.0", features = ["attributes"]} -clap = {version = "3.2.8", features = ["derive"]} +clap = {version = "3.2.16", features = ["derive"]} darkfi = {path = "../../", features = ["crypto", "util", "rpc"]} log = "0.4.17" num-bigint = {version = "0.4.3", features = ["serde"]} prettytable-rs = "0.8.0" -serde_json = "1.0.82" +serde_json = "1.0.83" simplelog = "0.12.0" url = "2.2.2" diff --git a/bin/faucetd/Cargo.toml b/bin/faucetd/Cargo.toml index 8dff732aa..308d18e4b 100644 --- a/bin/faucetd/Cargo.toml +++ b/bin/faucetd/Cargo.toml @@ -12,7 +12,7 @@ edition = "2021" async-channel = "1.6.1" async-executor = "1.4.1" async-std = "1.12.0" -async-trait = "0.1.56" +async-trait = "0.1.57" blake3 = "1.3.1" bs58 = "0.4.0" chrono = "0.4.19" @@ -21,17 +21,17 @@ darkfi = {path = "../../", features = ["blockchain", "wallet", "rpc", "net", "no easy-parallel = "3.2.0" futures-lite = "1.12.0" hex = "0.4.3" -lazy-init = "0.5.0" +lazy-init = "0.5.1" log = "0.4.17" num-bigint = {version = "0.4.3", features = ["serde"]} rand = "0.8.5" -serde_json = "1.0.82" +serde_json = "1.0.83" simplelog = "0.12.0" sled = "0.34.7" url = "2.2.2" # Argument parsing -serde = "1.0.138" -serde_derive = "1.0.138" +serde = "1.0.142" +serde_derive = "1.0.142" structopt = "0.3.26" -structopt-toml = "0.5.0" +structopt-toml = "0.5.1" diff --git a/bin/irc-raft/Cargo.toml b/bin/irc-raft/Cargo.toml index 37cb69218..ebfdef382 100644 --- a/bin/irc-raft/Cargo.toml +++ b/bin/irc-raft/Cargo.toml @@ -15,7 +15,7 @@ smol = "1.2.5" futures = "0.3.21" futures-rustls = "0.22.1" async-std = "1.12.0" -async-trait = "0.1.56" +async-trait = "0.1.57" async-channel = "1.6.1" async-executor = "1.4.1" easy-parallel = "3.2.0" @@ -25,7 +25,7 @@ crypto_box = "0.7.2" rand = "0.8.5" # Misc -clap = {version = "3.2.8", features = ["derive"]} +clap = {version = "3.2.16", features = ["derive"]} log = "0.4.17" simplelog = "0.12.0" fxhash = "0.2.1" @@ -33,9 +33,9 @@ ctrlc-async = {version= "3.2.2", default-features = false, features = ["async-st url = "2.2.2" # Encoding and parsing -serde_json = "1.0.82" -serde = {version = "1.0.138", features = ["derive"]} +serde_json = "1.0.83" +serde = {version = "1.0.142", features = ["derive"]} structopt = "0.3.26" -structopt-toml = "0.5.0" +structopt-toml = "0.5.1" bs58 = "0.4.0" toml = "0.5.9" diff --git a/bin/ircd/Cargo.toml b/bin/ircd/Cargo.toml index b72329c7c..db53cbfcd 100644 --- a/bin/ircd/Cargo.toml +++ b/bin/ircd/Cargo.toml @@ -16,9 +16,9 @@ darkfi = {path = "../../", features = ["net", "rpc"]} smol = "1.2.5" futures = "0.3.21" futures-rustls = "0.22.1" -rustls-pemfile = "1.0.0" +rustls-pemfile = "1.0.1" async-std = "1.12.0" -async-trait = "0.1.56" +async-trait = "0.1.57" async-channel = "1.6.1" async-executor = "1.4.1" easy-parallel = "3.2.0" @@ -28,7 +28,7 @@ crypto_box = "0.7.2" rand = "0.8.5" # Misc -clap = {version = "3.2.8", features = ["derive"]} +clap = {version = "3.2.16", features = ["derive"]} log = "0.4.17" simplelog = "0.12.0" fxhash = "0.2.1" @@ -37,9 +37,9 @@ url = "2.2.2" ringbuffer = "0.8.4" # Encoding and parsing -serde_json = "1.0.82" -serde = {version = "1.0.138", features = ["derive"]} +serde_json = "1.0.83" +serde = {version = "1.0.142", features = ["derive"]} structopt = "0.3.26" -structopt-toml = "0.5.0" +structopt-toml = "0.5.1" bs58 = "0.4.0" toml = "0.5.9" diff --git a/bin/lilith/Cargo.toml b/bin/lilith/Cargo.toml index 588ba30df..6794546cd 100644 --- a/bin/lilith/Cargo.toml +++ b/bin/lilith/Cargo.toml @@ -28,8 +28,8 @@ simplelog = "0.12.0" url = "2.2.2" # Argument parsing -serde = "1.0.138" -serde_derive = "1.0.138" +serde = "1.0.142" +serde_derive = "1.0.142" structopt = "0.3.26" -structopt-toml = "0.5.0" +structopt-toml = "0.5.1" toml = "0.5.9" diff --git a/bin/tau/tau-cli/Cargo.toml b/bin/tau/tau-cli/Cargo.toml index ae5e3c5f1..deb2964d4 100644 --- a/bin/tau/tau-cli/Cargo.toml +++ b/bin/tau/tau-cli/Cargo.toml @@ -13,11 +13,11 @@ categories = ["command-line-utilities"] [dependencies] async-std = {version = "1.12.0", features = ["attributes"]} chrono = "0.4.19" -clap = {version = "3.2.8", features = ["derive"]} +clap = {version = "3.2.16", features = ["derive"]} darkfi = { path = "../../../", features = ["rpc"]} log = "0.4.17" prettytable-rs = "0.8.0" -serde = {version = "1.0.138", features = ["derive"]} -serde_json = "1.0.82" +serde = {version = "1.0.142", features = ["derive"]} +serde_json = "1.0.83" simplelog = "0.12.0" url = "2.2.2" diff --git a/bin/tau/taud/Cargo.toml b/bin/tau/taud/Cargo.toml index 77e604b06..88a41ed34 100644 --- a/bin/tau/taud/Cargo.toml +++ b/bin/tau/taud/Cargo.toml @@ -16,7 +16,7 @@ darkfi = { path = "../../../", features = ["rpc", "raft", "net"]} # Async smol = "1.2.5" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.56" +async-trait = "0.1.57" async-channel = "1.6.1" async-executor = "1.4.1" easy-parallel = "3.2.0" @@ -27,16 +27,16 @@ log = "0.4.17" simplelog = "0.12.0" rand = "0.8.5" chrono = "0.4.19" -thiserror = "1.0.31" +thiserror = "1.0.32" ctrlc-async = {version= "3.2.2", default-features = false, features = ["async-std", "termination"]} url = "2.2.2" fxhash = "0.2.1" # Encoding and parsing -serde = {version = "1.0.138", features = ["derive"]} -serde_json = "1.0.82" +serde = {version = "1.0.142", features = ["derive"]} +serde_json = "1.0.83" structopt = "0.3.26" -structopt-toml = "0.5.0" +structopt-toml = "0.5.1" crypto_box = {version = "0.7.2", features = ["std"]} hex = "0.4.3" bs58 = "0.4.0" diff --git a/bin/vanityaddr/Cargo.toml b/bin/vanityaddr/Cargo.toml index 5a7ad6c06..c4154ce7e 100644 --- a/bin/vanityaddr/Cargo.toml +++ b/bin/vanityaddr/Cargo.toml @@ -10,10 +10,10 @@ edition = "2021" [dependencies] bs58 = "0.4.0" -clap = {version = "3.2.8", features = ["derive"]} +clap = {version = "3.2.16", features = ["derive"]} ctrlc = "3.2.2" darkfi = {path = "../../", features = ["crypto"]} -indicatif = "0.17.0-rc.11" +indicatif = "0.17.0" num_cpus = "1.13.1" rand = "0.8.5" rayon = "1.5.3" diff --git a/bin/zkas/Cargo.toml b/bin/zkas/Cargo.toml index 635a32210..137704bf6 100644 --- a/bin/zkas/Cargo.toml +++ b/bin/zkas/Cargo.toml @@ -9,5 +9,5 @@ license = "AGPL-3.0-only" edition = "2021" [dependencies] -clap = {version = "3.2.8", features = ["derive"]} +clap = {version = "3.2.16", features = ["derive"]} darkfi = {path = "../../", features = ["zkas"]} diff --git a/example/dchat-seed/Cargo.toml b/example/dchat-seed/Cargo.toml index 7a900d76c..295a2a3a5 100644 --- a/example/dchat-seed/Cargo.toml +++ b/example/dchat-seed/Cargo.toml @@ -9,8 +9,8 @@ description = "Seed node for dchat" darkfi = {path = "../../", features = ["net", "rpc"]} # Async -futures = "0.3.0" -async-std = "1" +futures = "0.3.21" +async-std = "1.12.0" async-executor = "1.4.1" async-channel = "1.6.1" easy-parallel = "3.2.0" diff --git a/example/dchat/Cargo.toml b/example/dchat/Cargo.toml index 1bfa79e4f..44cdf73b2 100644 --- a/example/dchat/Cargo.toml +++ b/example/dchat/Cargo.toml @@ -8,8 +8,8 @@ description = "Demo chat to document darkfi net code" darkfi = {path = "../../", features = ["net", "rpc"]} # Async -async-std = "1" -async-trait = "0.1.56" +async-std = "1.12.0" +async-trait = "0.1.57" async-executor = "1.4.1" async-channel = "1.6.1" easy-parallel = "3.2.0" @@ -22,7 +22,7 @@ simplelog = "0.12.0" url = "2.2.2" # Encoding and parsing -serde = {version = "1.0.138", features = ["derive"]} -toml = "0.4.2" +serde = {version = "1.0.142", features = ["derive"]} +toml = "0.5.9" diff --git a/example/p2pdebug/Cargo.toml b/example/p2pdebug/Cargo.toml index f2d42e936..9b96b48da 100644 --- a/example/p2pdebug/Cargo.toml +++ b/example/p2pdebug/Cargo.toml @@ -14,7 +14,7 @@ darkfi = {path = "../../", features = ["net", "rpc"]} smol = "1.2.5" futures = "0.3.21" async-std = "1.12.0" -async-trait = "0.1.56" +async-trait = "0.1.57" async-channel = "1.6.1" async-executor = "1.4.1" easy-parallel = "3.2.0" @@ -23,11 +23,11 @@ easy-parallel = "3.2.0" rand = "0.8.5" # Misc -clap = {version = "3.2.8", features = ["derive"]} +clap = {version = "3.2.16", features = ["derive"]} log = "0.4.17" simplelog = "0.12.0" fxhash = "0.2.1" url = "2.2.2" # Encoding and parsing -serde_json = "1.0.82" +serde_json = "1.0.83" diff --git a/script/research/darkwiki/Cargo.toml b/script/research/darkwiki/Cargo.toml index fa004fe6b..bcc144312 100644 --- a/script/research/darkwiki/Cargo.toml +++ b/script/research/darkwiki/Cargo.toml @@ -12,7 +12,7 @@ darkfi = {path = "../../../", features = ["raft"]} # Async smol = "1.2.5" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.56" +async-trait = "0.1.57" async-channel = "1.6.1" async-executor = "1.4.1" easy-parallel = "3.2.0" @@ -23,16 +23,16 @@ log = "0.4.17" simplelog = "0.12.0" rand = "0.8.5" chrono = "0.4.19" -thiserror = "1.0.31" +thiserror = "1.0.32" ctrlc-async = {version= "3.2.2", default-features = false, features = ["async-std", "termination"]} url = "2.2.2" fxhash = "0.2.1" # Encoding and parsing -serde = {version = "1.0.138", features = ["derive"]} -serde_json = "1.0.82" +serde = {version = "1.0.142", features = ["derive"]} +serde_json = "1.0.83" structopt = "0.3.26" -structopt-toml = "0.5.0" +structopt-toml = "0.5.1" unicode-segmentation = "1.9.0" crypto_box = {version = "0.7.2", features = ["std"]} hex = "0.4.3" diff --git a/script/research/dhtd/Cargo.toml b/script/research/dhtd/Cargo.toml index f06866446..c752eac5b 100644 --- a/script/research/dhtd/Cargo.toml +++ b/script/research/dhtd/Cargo.toml @@ -11,20 +11,20 @@ features = ["dht"] async-channel = "1.6.1" async-executor = "1.4.1" async-std = "1.12.0" -async-trait = "0.1.56" +async-trait = "0.1.57" blake3 = "1.3.1" ctrlc-async = {version = "3.2.2", default-features = false, features = ["async-std", "termination"]} easy-parallel = "3.2.0" futures-lite = "1.12.0" log = "0.4.17" -serde_json = "1.0.82" +serde_json = "1.0.83" simplelog = "0.12.0" url = "2.2.2" # Argument parsing -serde = "1.0.138" -serde_derive = "1.0.138" +serde = "1.0.142" +serde_derive = "1.0.142" structopt = "0.3.26" -structopt-toml = "0.5.0" +structopt-toml = "0.5.1" [workspace] diff --git a/script/research/nodes-tool/Cargo.toml b/script/research/nodes-tool/Cargo.toml index 7fca4fedf..014c791b0 100644 --- a/script/research/nodes-tool/Cargo.toml +++ b/script/research/nodes-tool/Cargo.toml @@ -11,7 +11,7 @@ features = ["blockchain", "node", "wallet"] async-std = "1.12.0" blake3 = "1.3.1" -serde = "1.0.138" +serde = "1.0.142" sled = "0.34.7" [workspace] diff --git a/script/research/raft-diag/Cargo.toml b/script/research/raft-diag/Cargo.toml index bb4b71858..ca14d38d7 100644 --- a/script/research/raft-diag/Cargo.toml +++ b/script/research/raft-diag/Cargo.toml @@ -11,7 +11,7 @@ darkfi = {path = "../../../", features = ["raft"]} # Async smol = "1.2.5" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.56" +async-trait = "0.1.57" async-channel = "1.6.1" async-executor = "1.4.1" easy-parallel = "3.2.0" @@ -22,14 +22,14 @@ log = "0.4.17" simplelog = "0.12.0" rand = "0.8.5" chrono = "0.4.19" -thiserror = "1.0.31" +thiserror = "1.0.32" ctrlc-async = {version= "3.2.2", default-features = false, features = ["async-std", "termination"]} url = "2.2.2" fxhash = "0.2.1" # Encoding and parsing -serde = {version = "1.0.138", features = ["derive"]} -serde_json = "1.0.82" +serde = {version = "1.0.142", features = ["derive"]} +serde_json = "1.0.83" structopt = "0.3.26" hex = "0.4.3" bs58 = "0.4.0" diff --git a/src/sdk/Cargo.toml b/src/sdk/Cargo.toml index 6cf1d2dc9..6c579f7a6 100644 --- a/src/sdk/Cargo.toml +++ b/src/sdk/Cargo.toml @@ -5,5 +5,5 @@ edition = "2021" [dependencies] borsh = "0.9.3" -thiserror = "1.0.31" +thiserror = "1.0.32" wee_alloc = "0.4.5" diff --git a/src/util/derive-internal/Cargo.toml b/src/util/derive-internal/Cargo.toml index 559d54f4b..f5892df87 100644 --- a/src/util/derive-internal/Cargo.toml +++ b/src/util/derive-internal/Cargo.toml @@ -4,6 +4,6 @@ version = "0.3.0" edition = "2021" [dependencies] -proc-macro2 = "1.0.40" -quote = "1.0.20" -syn = {version = "1.0.98", features = ["full", "fold"]} +proc-macro2 = "1.0.43" +quote = "1.0.21" +syn = {version = "1.0.99", features = ["full", "fold"]} diff --git a/src/util/derive/Cargo.toml b/src/util/derive/Cargo.toml index 092ebfca0..b4e602fac 100644 --- a/src/util/derive/Cargo.toml +++ b/src/util/derive/Cargo.toml @@ -7,8 +7,8 @@ edition = "2021" proc-macro = true [dependencies] -proc-macro-crate = "1.1.3" -proc-macro2 = "1.0.40" -syn = {version = "1.0.98", features = ["full", "fold"]} +proc-macro-crate = "1.2.0" +proc-macro2 = "1.0.43" +syn = {version = "1.0.99", features = ["full", "fold"]} darkfi-derive-internal = {path = "../derive-internal"}