diff --git a/Cargo.lock b/Cargo.lock index 1f57dc06fb..f28fbcce0a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -158,9 +158,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.58" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" +checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" [[package]] name = "arc-swap" @@ -310,16 +310,16 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" dependencies = [ "addr2line", "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.29.0", + "object", "rustc-demangle", ] @@ -632,9 +632,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytecheck" -version = "0.6.9" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11cac2c12b5adc6570dad2ee1b87eff4955dac476fe12d81e5fdd352e52406f" +checksum = "3a31f923c2db9513e4298b72df143e6e655a759b3d6a0966df18f81223fff54f" dependencies = [ "bytecheck_derive", "ptr_meta", @@ -642,9 +642,9 @@ dependencies = [ [[package]] name = "bytecheck_derive" -version = "0.6.9" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf" +checksum = "edb17c862a905d912174daa27ae002326fff56dc8b8ada50a0a5f0976cb174f0" dependencies = [ "proc-macro2", "quote", @@ -665,9 +665,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.11.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5377c8865e74a160d21f29c2d40669f53286db6eab59b88540cbb12ffc8b835" +checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc" [[package]] name = "byteorder" @@ -683,18 +683,18 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" [[package]] name = "bytes" -version = "1.2.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b3de4a0c5e67e16066a0715723abd91edc2f9001d09c46e1dca929351e130e" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" dependencies = [ "serde", ] [[package]] name = "cairo-rs" -version = "0.15.12" +version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +checksum = "62be3562254e90c1c6050a72aa638f6315593e98c5cdaba9017cedbabf0a5dee" dependencies = [ "bitflags 1.3.2", "cairo-sys-rs", @@ -740,12 +740,6 @@ dependencies = [ "rustc_version 0.4.0", ] -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - [[package]] name = "cast5" version = "0.10.0" @@ -879,9 +873,9 @@ dependencies = [ [[package]] name = "chacha20" -version = "0.8.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" +checksum = "01b72a433d0cf2aef113ba70f62634c56fddb0f244e6377185c56a7cadbd8f91" dependencies = [ "cfg-if 1.0.0", "cipher 0.3.0", @@ -909,7 +903,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ "aead 0.4.3", - "chacha20 0.8.2", + "chacha20 0.8.1", "cipher 0.3.0", "poly1305", "zeroize", @@ -1027,9 +1021,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "5538cd660450ebeb4234cfecf8f2284b844ffc4c50531e66d584ad5b91293613" dependencies = [ "os_str_bytes", ] @@ -1045,9 +1039,9 @@ dependencies = [ [[package]] name = "clipboard-win" -version = "4.4.2" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ab1b92798304eedc095b53942963240037c0516452cb11aeba709d420b2219" +checksum = "2f3e1238132dc01f081e1cbb9dace14e5ef4c3a51ee244bd982275fb514605db" dependencies = [ "error-code", "str-buf", @@ -1106,7 +1100,7 @@ version = "4.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a604e93b79d1808327a6fca85a6f2d69de66461e7620f5a4cbf5fb4d1d7c948" dependencies = [ - "bytes 1.2.0", + "bytes 1.1.0", "memchr", ] @@ -1319,7 +1313,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0363053954f3e679645fc443321ca128b7b950a6fe288cf5f9335cc22ee58394" dependencies = [ "atty", - "cast 0.2.7", + "cast", "clap 2.34.0", "criterion-plot 0.3.1", "csv", @@ -1341,14 +1335,14 @@ dependencies = [ [[package]] name = "criterion" -version = "0.3.6" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" +checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10" dependencies = [ "atty", - "cast 0.3.0", + "cast", "clap 2.34.0", - "criterion-plot 0.4.5", + "criterion-plot 0.4.4", "csv", "itertools 0.10.3", "lazy_static", @@ -1372,17 +1366,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76f9212ddf2f4a9eb2d401635190600656a1f88a932ef53d06e7fa4c7e02fb8e" dependencies = [ "byteorder", - "cast 0.2.7", + "cast", "itertools 0.8.2", ] [[package]] name = "criterion-plot" -version = "0.4.5" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" +checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57" dependencies = [ - "cast 0.3.0", + "cast", "itertools 0.10.3", ] @@ -1410,9 +1404,9 @@ dependencies = [ [[package]] name = "crossbeam" -version = "0.8.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" dependencies = [ "cfg-if 1.0.0", "crossbeam-channel", @@ -1424,9 +1418,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1434,9 +1428,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", @@ -1445,23 +1439,23 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.10" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" +checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" dependencies = [ "autocfg 1.1.0", "cfg-if 1.0.0", "crossbeam-utils", + "lazy_static", "memoffset", - "once_cell", "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.6" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7" +checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1469,12 +1463,12 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" dependencies = [ "cfg-if 1.0.0", - "once_cell", + "lazy_static", ] [[package]] @@ -1519,7 +1513,7 @@ dependencies = [ "crossterm_winapi 0.9.0", "futures-core", "libc", - "mio 0.8.4", + "mio 0.8.3", "parking_lot 0.12.1", "signal-hook 0.3.14", "signal-hook-mio", @@ -1572,9 +1566,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.6" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" dependencies = [ "generic-array 0.14.5", "typenum", @@ -1675,9 +1669,9 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] name = "curl-sys" -version = "0.4.56+curl-7.83.1" +version = "0.4.55+curl-7.83.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093e169dd4de29e468fa649fbae11cdcd5551c81fe5bf1b0677adad7ef3d26f" +checksum = "23734ec77368ec583c2e61dd3f0b0e5c98b93abe6d2a004ca06b91dd7e3e2762" dependencies = [ "cc", "libc", @@ -1806,9 +1800,9 @@ checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" [[package]] name = "dbus" -version = "0.9.6" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f8bcdd56d2e5c4ed26a529c5a9029f5db8290d433497506f958eae3be148eb6" +checksum = "de0a745c25b32caa56b82a3950f5fec7893a960f4c10ca3b02060b0c38d8c2ce" dependencies = [ "libc", "libdbus-sys", @@ -1817,9 +1811,9 @@ dependencies = [ [[package]] name = "decimal-rs" -version = "0.1.39" +version = "0.1.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2492291a982ad198a2c3b84b091b48348372ffe8a9f7194cc90a2d8b901762c" +checksum = "fa3ab4f7b3df4f77b57f228261f2761db6d9bb0b803d5b9d5dee3d84f9a67439" dependencies = [ "ethnum", "fast-float", @@ -2074,22 +2068,9 @@ dependencies = [ [[package]] name = "either" -version = "1.7.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" - -[[package]] -name = "embed-resource" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc24ff8d764818e9ab17963b0593c535f077a513f565e75e4352d758bc4d8c0" -dependencies = [ - "cc", - "rustc_version 0.4.0", - "toml", - "vswhom", - "winreg", -] +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "embed_plist" @@ -2235,22 +2216,22 @@ checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" [[package]] name = "fastrand" -version = "1.8.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" dependencies = [ "instant", ] [[package]] name = "fd-lock" -version = "3.0.6" +version = "3.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11dcc7e4d79a8c89b9ab4c6f5c30b1fc4a83c420792da3542fd31179ed5f517" +checksum = "46e245f4c8ec30c6415c56cb132c07e69e74f1942f6b4a4061da748b49f486ca" dependencies = [ "cfg-if 1.0.0", "rustix", - "windows-sys 0.36.1", + "windows-sys 0.30.0", ] [[package]] @@ -2265,14 +2246,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.17" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" +checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall 0.2.16", - "windows-sys 0.36.1", + "winapi 0.3.9", ] [[package]] @@ -2295,9 +2276,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" [[package]] name = "fixedbitset" -version = "0.4.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" [[package]] name = "flate2" @@ -2504,7 +2485,7 @@ dependencies = [ "futures-sink", "futures-task", "futures-util", - "pin-project 1.0.11", + "pin-project 1.0.10", "pin-utils", ] @@ -2610,15 +2591,15 @@ dependencies = [ [[package]] name = "generator" -version = "0.7.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc184cace1cea8335047a471cc1da80f18acf8a76f3bab2028d499e328948ec7" +checksum = "c1d9279ca822891c1a4dae06d185612cf8fc6acfe5dff37781b41297811b12ee" dependencies = [ "cc", "libc", "log", "rustversion", - "windows 0.32.0", + "winapi 0.3.9", ] [[package]] @@ -2686,9 +2667,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.2" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" dependencies = [ "fallible-iterator", "indexmap", @@ -2697,9 +2678,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.15.12" +version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +checksum = "0f132be35e05d9662b9fa0fee3f349c6621f7782e0105917f4cc73c1bf47eceb" dependencies = [ "bitflags 1.3.2", "futures-channel", @@ -2742,9 +2723,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.15.12" +version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +checksum = "bd124026a2fa8c33a3d17a3fe59c103f2d9fa5bd92c19e029e037736729abeab" dependencies = [ "bitflags 1.3.2", "futures-channel", @@ -2876,7 +2857,7 @@ version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" dependencies = [ - "bytes 1.2.0", + "bytes 1.1.0", "fnv", "futures-core", "futures-sink", @@ -2884,7 +2865,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 1.20.1", + "tokio 1.19.2", "tokio-util 0.7.3", "tracing", ] @@ -2906,9 +2887,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3" dependencies = [ "ahash", ] @@ -2919,7 +2900,11 @@ version = "7.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31672b7011be2c4f7456c4ddbcb40e7e9a4a9fad8efe49a6ebaf5f307d0109c0" dependencies = [ + "base64 0.13.0", "byteorder", + "crossbeam-channel", + "flate2", + "nom 7.1.1", "num-traits", ] @@ -2931,7 +2916,7 @@ checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d" dependencies = [ "base64 0.13.0", "bitflags 1.3.2", - "bytes 1.2.0", + "bytes 1.1.0", "headers-core", "http", "httpdate", @@ -3004,7 +2989,7 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ - "bytes 1.2.0", + "bytes 1.1.0", "fnv", "itoa 1.0.2", ] @@ -3015,7 +3000,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.2.0", + "bytes 1.1.0", "http", "pin-project-lite 0.2.9", ] @@ -3055,11 +3040,11 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.20" +version = "0.14.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" +checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f" dependencies = [ - "bytes 1.2.0", + "bytes 1.1.0", "futures-channel", "futures-core", "futures-util", @@ -3071,7 +3056,7 @@ dependencies = [ "itoa 1.0.2", "pin-project-lite 0.2.9", "socket2", - "tokio 1.20.1", + "tokio 1.19.2", "tower-service", "tracing", "want", @@ -3085,7 +3070,7 @@ checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ "hyper", "pin-project-lite 0.2.9", - "tokio 1.20.1", + "tokio 1.19.2", "tokio-io-timeout", ] @@ -3095,10 +3080,10 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.2.0", + "bytes 1.1.0", "hyper", "native-tls", - "tokio 1.20.1", + "tokio 1.19.2", "tokio-native-tls", ] @@ -3168,31 +3153,18 @@ dependencies = [ "byteorder", "color_quant", "num-iter", - "num-rational 0.3.2", - "num-traits", -] - -[[package]] -name = "image" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e30ca2ecf7666107ff827a8e481de6a132a9b687ed3bb20bb1c144a36c00964" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-rational 0.4.1", + "num-rational", "num-traits", ] [[package]] name = "indexmap" -version = "1.9.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a" dependencies = [ "autocfg 1.1.0", - "hashbrown 0.12.3", + "hashbrown 0.11.2", "serde", ] @@ -3231,15 +3203,15 @@ checksum = "48dc51180a9b377fd75814d0cc02199c20f8e99433d6762f650d39cdbbd3b56f" [[package]] name = "integer-encoding" -version = "3.0.4" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" +checksum = "0e85a1509a128c855368e135cffcde7eac17d8e1083f41e2b98c58bc1a5074be" [[package]] name = "io-lifetimes" -version = "0.7.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c3f4eff5495aee4c0399d7b6a0dc2b6e81be84242ffbfcf253ebacccc1d0cb" +checksum = "9448015e586b611e5d322f6703812bbca2f1e709d5773ecd38ddb4e3bb649504" [[package]] name = "iovec" @@ -3581,20 +3553,11 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - [[package]] name = "linked-hash-map" -version = "0.5.6" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "linux-raw-sys" @@ -3687,7 +3650,7 @@ dependencies = [ "serde", "serde_json", "tracing", - "tracing-subscriber 0.3.15", + "tracing-subscriber 0.3.11", ] [[package]] @@ -3719,15 +3682,15 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] name = "mac-notification-sys" -version = "0.5.5" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff231a88fe2e9985f9d159a2f02986fe46daa0f6af976a0d934be4870cc9d02" +checksum = "042f74a606175d72ca483e14e0873fe0f6c003f7af45865b17b16fdaface7203" dependencies = [ "cc", "dirs-next 2.0.0", "objc-foundation", "objc_id", - "time 0.3.11", + "time 0.3.9", ] [[package]] @@ -3811,9 +3774,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.5.5" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a79b39c93a7a5a27eeaf9a23b5ff43f1b9e0ad6b1cdd441140ae53c35613fc7" +checksum = "d5172b50c23043ff43dd53e51392f36519d9b35a8f3a410d30ece5d1aedd58ae" dependencies = [ "libc", ] @@ -3925,9 +3888,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" +checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" dependencies = [ "libc", "log", @@ -4264,17 +4227,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg 1.1.0", - "num-integer", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.15" @@ -4376,20 +4328,11 @@ dependencies = [ "memchr", ] -[[package]] -name = "object" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" -version = "1.13.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" +checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" [[package]] name = "oorandom" @@ -4411,9 +4354,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "open" -version = "3.0.2" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23a407004a1033f53e93f9b45580d14de23928faad187384f891507c9b0c045" +checksum = "360bcc8316bf6363aa3954c3ccc4de8add167b087e0259190a043c9514f910fe" dependencies = [ "pathdiff", "windows-sys 0.36.1", @@ -4441,9 +4384,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.22.0+1.1.1q" +version = "111.20.0+1.1.1o" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" +checksum = "92892c4f87d56e376e469ace79f1128fdaded07646ddf73aa0be4706ff712dec" dependencies = [ "cc", ] @@ -4474,10 +4417,10 @@ dependencies = [ "js-sys", "lazy_static", "percent-encoding 2.1.0", - "pin-project 1.0.11", + "pin-project 1.0.10", "rand 0.8.5", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", "tokio-stream", ] @@ -4488,7 +4431,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d50ceb0b0e8b75cb3e388a2571a807c8228dabc5d6670f317b6eb21301095373" dependencies = [ "async-trait", - "bytes 1.2.0", + "bytes 1.1.0", "futures-util", "http", "opentelemetry", @@ -4511,7 +4454,7 @@ dependencies = [ "reqwest", "thiserror", "thrift", - "tokio 1.20.1", + "tokio 1.19.2", ] [[package]] @@ -4548,7 +4491,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" dependencies = [ "dlv-list", - "hashbrown 0.12.3", + "hashbrown 0.12.1", ] [[package]] @@ -4574,9 +4517,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.2.0" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" +checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa" [[package]] name = "packed_simd_2" @@ -4817,7 +4760,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" dependencies = [ - "fixedbitset 0.4.2", + "fixedbitset 0.4.1", "indexmap", ] @@ -4969,27 +4912,27 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.30" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef0f924a5ee7ea9cbcea77529dba45f8a9ba9f622419fe3386ca581a3ae9d5a" +checksum = "9615c18d31137579e9ff063499264ddc1278e7b1982757ebc111028c4d1dc909" dependencies = [ - "pin-project-internal 0.4.30", + "pin-project-internal 0.4.29", ] [[package]] name = "pin-project" -version = "1.0.11" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78203e83c48cffbe01e4a2d35d566ca4de445d79a85372fc64e378bfc812a260" +checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" dependencies = [ - "pin-project-internal 1.0.11", + "pin-project-internal 1.0.10", ] [[package]] name = "pin-project-internal" -version = "0.4.30" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e" +checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a" dependencies = [ "proc-macro2", "quote", @@ -4998,9 +4941,9 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.0.11" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74" +checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ "proc-macro2", "quote", @@ -5055,25 +4998,11 @@ version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" -[[package]] -name = "plist" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225" -dependencies = [ - "base64 0.13.0", - "indexmap", - "line-wrap", - "serde", - "time 0.3.11", - "xml-rs", -] - [[package]] name = "plotters" -version = "0.3.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9428003b84df1496fb9d6eeee9c5f8145cb41ca375eb0dad204328888832811f" +checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a" dependencies = [ "num-traits", "plotters-backend", @@ -5084,15 +5013,15 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.4" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" +checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c" [[package]] name = "plotters-svg" -version = "0.3.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0918736323d1baff32ee0eade54984f6f201ad7e97d5cfb5d6ab4a358529615" +checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9" dependencies = [ "plotters-backend", ] @@ -5246,7 +5175,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ - "bytes 1.2.0", + "bytes 1.1.0", "prost-derive", ] @@ -5256,7 +5185,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ - "bytes 1.2.0", + "bytes 1.1.0", "heck 0.3.3", "itertools 0.10.3", "lazy_static", @@ -5289,7 +5218,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ - "bytes 1.2.0", + "bytes 1.1.0", "prost", ] @@ -5326,7 +5255,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f" dependencies = [ "checked_int_cast", - "image 0.23.14", + "image", ] [[package]] @@ -5337,21 +5266,21 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.20" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" dependencies = [ "proc-macro2", ] [[package]] name = "r2d2" -version = "0.8.10" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" +checksum = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f" dependencies = [ "log", - "parking_lot 0.12.1", + "parking_lot 0.11.2", "scheduled-thread-pool", ] @@ -5576,9 +5505,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1" dependencies = [ "aho-corasick", "memchr", @@ -5596,9 +5525,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64" [[package]] name = "region" @@ -5637,7 +5566,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" dependencies = [ "base64 0.13.0", - "bytes 1.2.0", + "bytes 1.1.0", "encoding_rs", "futures-core", "futures-util", @@ -5657,7 +5586,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "tokio 1.20.1", + "tokio 1.19.2", "tokio-native-tls", "tower-service", "url 2.2.2", @@ -5669,13 +5598,12 @@ dependencies = [ [[package]] name = "rfd" -version = "0.9.1" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f121348fd3b9035ed11be1f028e8944263c30641f8c5deacf57a4320782fb402" +checksum = "1f756b55bff8f256a1a8c24dbabb1430ac8110628e418a02e4a1c5ff67179f56" dependencies = [ "block", "dispatch", - "embed-resource", "glib-sys", "gobject-sys", "gtk-sys", @@ -5725,7 +5653,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cec2b3485b07d96ddfd3134767b8a447b45ea4eb91448d0a35180ec0ffd5ed15" dependencies = [ "bytecheck", - "hashbrown 0.12.3", + "hashbrown 0.12.1", "ptr_meta", "rend", "rkyv_derive", @@ -5745,9 +5673,9 @@ dependencies = [ [[package]] name = "ron" -version = "0.7.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" +checksum = "1b861ecaade43ac97886a512b360d01d66be9f41f3c61088b42cedf92e03d678" dependencies = [ "base64 0.13.0", "bitflags 1.3.2", @@ -5827,21 +5755,21 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.12", + "semver 1.0.10", ] [[package]] name = "rustix" -version = "0.35.7" +version = "0.34.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51cc38aa10f6bbb377ed28197aa052aa4e2b762c22be9d3153d01822587e787" +checksum = "2079c267b8394eb529872c3cf92e181c378b41fea36e68130357b52493701d2e" dependencies = [ "bitflags 1.3.2", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.36.1", + "winapi 0.3.9", ] [[package]] @@ -5867,9 +5795,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.8" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c8ad4f0c00e1eb5bc7614d236a7f1300e3dbd76b68cac8e06fb00b015ad8d8" +checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" [[package]] name = "rustyline" @@ -6027,9 +5955,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.12" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1" +checksum = "a41d061efea015927ac527063765e73601444cdc344ba855bc7bd44578b25e1c" dependencies = [ "serde", ] @@ -6045,9 +5973,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.140" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03" +checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" dependencies = [ "serde_derive", ] @@ -6092,9 +6020,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.140" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da" +checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" dependencies = [ "proc-macro2", "quote", @@ -6103,9 +6031,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.82" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" +checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" dependencies = [ "itoa 1.0.2", "ryu", @@ -6159,9 +6087,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.26" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +checksum = "707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc" dependencies = [ "indexmap", "ryu", @@ -6333,7 +6261,7 @@ checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" dependencies = [ "libc", "mio 0.7.14", - "mio 0.8.4", + "mio 0.8.3", "signal-hook 0.3.14", ] @@ -6360,18 +6288,15 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "slab" -version = "0.4.7" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -dependencies = [ - "autocfg 1.1.0", -] +checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "smallvec" -version = "1.9.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" +checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "snow" @@ -6585,9 +6510,9 @@ checksum = "171758edb47aa306a78dfa4ab9aeb5167405bd4e3dc2b64e88f6a84bbe98bd63" [[package]] name = "syn" -version = "1.0.98" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf" dependencies = [ "proc-macro2", "quote", @@ -6634,9 +6559,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.12.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6fd7725dc1e593e9ecabd9fe49c112a204c8c8694db4182e78b2a5af490b1ae" +checksum = "d2497feadd60f2a5a7f124572d7a44b2aba589a0ad2a65d3aaf2d073c327c3b8" dependencies = [ "bitflags 1.3.2", "cairo-rs", @@ -6654,7 +6579,6 @@ dependencies = [ "glib", "glib-sys", "gtk", - "image 0.24.3", "instant", "jni 0.19.0", "lazy_static", @@ -6665,19 +6589,30 @@ dependencies = [ "ndk-sys", "objc", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.11.2", "paste", - "png 0.17.5", "raw-window-handle", "scopeguard", "serde", + "tao-core-video-sys", "unicode-segmentation", - "uuid 1.1.2", "windows 0.37.0", "windows-implement", "x11-dl", ] +[[package]] +name = "tao-core-video-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271450eb289cb4d8d0720c6ce70c72c8c858c93dd61fc625881616752e6b98f6" +dependencies = [ + "cfg-if 1.0.0", + "core-foundation-sys", + "libc", + "objc", +] + [[package]] name = "tar" version = "0.4.38" @@ -6733,7 +6668,7 @@ dependencies = [ "tari_p2p", "tari_utilities", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", ] [[package]] @@ -6781,7 +6716,7 @@ dependencies = [ "tari_storage", "tari_utilities", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", "tonic", "tracing", "tracing-opentelemetry", @@ -6858,7 +6793,7 @@ dependencies = [ "tauri", "tauri-build", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", "tonic", "uuid 0.8.2", ] @@ -6912,7 +6847,7 @@ dependencies = [ "tari_crypto", "tari_utilities", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", ] [[package]] @@ -6923,7 +6858,7 @@ dependencies = [ "async-trait", "bitflags 1.3.2", "blake2 0.10.4", - "bytes 1.2.0", + "bytes 1.1.0", "chrono", "cidr", "clear_on_drop", @@ -6939,7 +6874,7 @@ dependencies = [ "multiaddr", "nom 5.1.2", "once_cell", - "pin-project 1.0.11", + "pin-project 1.0.10", "prost", "prost-types", "rand 0.8.5", @@ -6957,7 +6892,7 @@ dependencies = [ "tari_utilities", "tempfile", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", "tokio-stream", "tokio-util 0.6.10", "tower", @@ -6989,7 +6924,7 @@ dependencies = [ "log", "log-mdc", "petgraph 0.5.1", - "pin-project 0.4.30", + "pin-project 0.4.29", "prost", "prost-types", "rand 0.8.5", @@ -7006,7 +6941,7 @@ dependencies = [ "tari_utilities", "tempfile", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", "tokio-stream", "tower", "zeroize", @@ -7023,7 +6958,7 @@ dependencies = [ "syn", "tari_comms", "tari_test_utils 0.34.0", - "tokio 1.20.1", + "tokio 1.19.2", "tower-service", ] @@ -7066,7 +7001,7 @@ dependencies = [ "tari_utilities", "tari_wallet", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", "tonic", "tracing", "tracing-opentelemetry", @@ -7088,7 +7023,7 @@ dependencies = [ "chacha20poly1305 0.9.1", "chrono", "config", - "criterion 0.3.6", + "criterion 0.3.5", "croaring", "decimal-rs", "derivative", @@ -7097,7 +7032,7 @@ dependencies = [ "fs2 0.3.0", "futures 0.3.21", "hex", - "integer-encoding 3.0.4", + "integer-encoding 3.0.3", "lmdb-zero", "log", "log-mdc", @@ -7133,7 +7068,7 @@ dependencies = [ "tari_utilities", "tempfile", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", "tracing", "tracing-attributes", "uint", @@ -7211,7 +7146,7 @@ dependencies = [ "tari_test_utils 0.8.1", "tari_utilities", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", "tokio-stream", "tonic", ] @@ -7254,7 +7189,7 @@ dependencies = [ "tari_dan_engine", "tari_utilities", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", "tokio-stream", ] @@ -7312,7 +7247,7 @@ version = "0.34.0" dependencies = [ "anyhow", "bincode", - "bytes 1.2.0", + "bytes 1.1.0", "chrono", "clap 3.2.15", "config", @@ -7337,7 +7272,7 @@ dependencies = [ "tari_crypto", "tari_utilities", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", "tonic", "tracing", "url 2.2.2", @@ -7354,7 +7289,7 @@ dependencies = [ "prometheus", "reqwest", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", "warp", ] @@ -7389,7 +7324,7 @@ dependencies = [ "tari_crypto", "tari_utilities", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", "tonic", ] @@ -7449,7 +7384,7 @@ dependencies = [ "rand 0.8.5", "reqwest", "rustls", - "semver 1.0.12", + "semver 1.0.10", "serde", "serde_derive", "tari_common", @@ -7463,7 +7398,7 @@ dependencies = [ "tari_utilities", "tempfile", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", "tokio-stream", "tower", "tower-service", @@ -7500,7 +7435,7 @@ dependencies = [ "tari_shutdown", "tari_test_utils 0.34.0", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", "tower", "tower-service", ] @@ -7510,7 +7445,7 @@ name = "tari_shutdown" version = "0.34.0" dependencies = [ "futures 0.3.21", - "tokio 1.20.1", + "tokio 1.19.2", ] [[package]] @@ -7557,7 +7492,7 @@ dependencies = [ "rand 0.8.5", "tari_shutdown", "tempfile", - "tokio 1.20.1", + "tokio 1.19.2", ] [[package]] @@ -7615,7 +7550,7 @@ dependencies = [ "tari_storage", "tari_test_utils 0.34.0", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", "tokio-stream", "tonic", ] @@ -7668,7 +7603,7 @@ dependencies = [ "tari_utilities", "tempfile", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", "tower", ] @@ -7705,14 +7640,14 @@ dependencies = [ "tari_wallet", "tempfile", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", ] [[package]] name = "tauri" -version = "1.0.5" +version = "1.0.0-rc.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1a56a8b125069c2682bd31610109b4436c050c74447bee1078217a0325c1add" +checksum = "cb533e95e09fd191ef8e0a0ee6b61701b5f32175e48f82854a71a8f8367bdb41" dependencies = [ "anyhow", "attohttpc", @@ -7739,7 +7674,7 @@ dependencies = [ "raw-window-handle", "regex", "rfd", - "semver 1.0.12", + "semver 1.0.10", "serde", "serde_json", "serde_repr", @@ -7753,7 +7688,7 @@ dependencies = [ "tauri-utils", "tempfile", "thiserror", - "tokio 1.20.1", + "tokio 1.19.2", "url 2.2.2", "uuid 1.1.2", "webkit2gtk", @@ -7763,15 +7698,14 @@ dependencies = [ [[package]] name = "tauri-build" -version = "1.0.4" +version = "1.0.0-rc.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acafb1c515c5d14234a294461bd43c723639a84891a45f6a250fd3441ad2e8ed" +checksum = "58f9a1c87ad53f584f970b06c9243b39d1c2aeca6116dd04c641f406133053b0" dependencies = [ "anyhow", "cargo_toml", "heck 0.4.0", - "json-patch", - "semver 1.0.12", + "semver 1.0.10", "serde_json", "tauri-utils", "winres", @@ -7779,35 +7713,32 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.0.4" +version = "1.0.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d62a3c8790d6cba686cea6e3f7f569d12c662c3274c2d165a4fd33e3871b72" +checksum = "ceb3b7cb66f1a6ca30f601cccfa01820477881c27412909a3e6f80b6a2f73815" dependencies = [ "base64 0.13.0", "brotli", "ico", - "json-patch", - "plist", "png 0.17.5", "proc-macro2", "quote", "regex", - "semver 1.0.12", + "semver 1.0.10", "serde", "serde_json", "sha2 0.10.2", "tauri-utils", "thiserror", - "time 0.3.11", "uuid 1.1.2", "walkdir", ] [[package]] name = "tauri-macros" -version = "1.0.4" +version = "1.0.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7296fa17996629f43081e1c66d554703900187ed900c5bf46f97f0bcfb069278" +checksum = "07883238ade4c96be38a6a0025f15cbb5e0539fe99ba92d444af9cdbc656b613" dependencies = [ "heck 0.4.0", "proc-macro2", @@ -7819,15 +7750,14 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.10.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4cff3b4d9469727fa2107c4b3d2eda110df1ba45103fb420178e536362fae4" +checksum = "7bad3a8ce06d4e71a52efef175446c8eb7e9109b6f988782fdc6a234526f226a" dependencies = [ "gtk", "http", "http-range", "infer", - "raw-window-handle", "serde", "serde_json", "tauri-utils", @@ -7839,15 +7769,14 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.10.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fa8c4edaf01d8b556e7172c844b1b4dd3399adcd1a606bd520fc3e65f698546" +checksum = "0c2cbc41ea88305f3e5dc133cc5c717c6913a15f121f99e7a238a0135dac083e" dependencies = [ "cocoa", "gtk", "percent-encoding 2.1.0", "rand 0.8.5", - "raw-window-handle", "tauri-runtime", "tauri-utils", "uuid 1.1.2", @@ -7859,9 +7788,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.0.3" +version = "1.0.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ff4b68d9faeb57c9c727bf58c9c9768d2b67d8e84e62ce6146e7859a2e9c6b" +checksum = "b09e7ec7933a833f3b64e932a9d32d94705687aa5caa3cacf43222876a6d7e24" dependencies = [ "brotli", "ctor", @@ -7874,14 +7803,13 @@ dependencies = [ "phf 0.10.1", "proc-macro2", "quote", - "semver 1.0.12", + "semver 1.0.10", "serde", "serde_json", "serde_with", "thiserror", "url 2.2.2", "walkdir", - "windows 0.37.0", ] [[package]] @@ -7930,7 +7858,7 @@ dependencies = [ "tari_crypto", "tari_script", "tari_utilities", - "tokio 1.20.1", + "tokio 1.19.2", ] [[package]] @@ -8029,11 +7957,10 @@ dependencies = [ [[package]] name = "time" -version = "0.3.11" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c91f41dcb2f096c05f0873d667dceec1087ce5bcf984ec8ffb19acddbb3217" +checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" dependencies = [ - "itoa 1.0.2", "libc", "num_threads", ] @@ -8088,15 +8015,14 @@ dependencies = [ [[package]] name = "tokio" -version = "1.20.1" +version = "1.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" +checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" dependencies = [ - "autocfg 1.1.0", - "bytes 1.2.0", + "bytes 1.1.0", "libc", "memchr", - "mio 0.8.4", + "mio 0.8.3", "num_cpus", "once_cell", "pin-project-lite 0.2.9", @@ -8113,7 +8039,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" dependencies = [ "pin-project-lite 0.2.9", - "tokio 1.20.1", + "tokio 1.19.2", ] [[package]] @@ -8134,7 +8060,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" dependencies = [ "native-tls", - "tokio 1.20.1", + "tokio 1.19.2", ] [[package]] @@ -8144,7 +8070,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ "rustls", - "tokio 1.20.1", + "tokio 1.19.2", "webpki 0.22.0", ] @@ -8156,7 +8082,7 @@ checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" dependencies = [ "futures-core", "pin-project-lite 0.2.9", - "tokio 1.20.1", + "tokio 1.19.2", "tokio-util 0.7.3", ] @@ -8166,13 +8092,13 @@ version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ - "bytes 1.2.0", + "bytes 1.1.0", "futures-core", "futures-io", "futures-sink", "log", "pin-project-lite 0.2.9", - "tokio 1.20.1", + "tokio 1.19.2", ] [[package]] @@ -8181,11 +8107,11 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" dependencies = [ - "bytes 1.2.0", + "bytes 1.1.0", "futures-core", "futures-sink", "pin-project-lite 0.2.9", - "tokio 1.20.1", + "tokio 1.19.2", "tracing", ] @@ -8207,7 +8133,7 @@ dependencies = [ "async-stream", "async-trait", "base64 0.13.0", - "bytes 1.2.0", + "bytes 1.1.0", "futures-core", "futures-util", "h2", @@ -8216,10 +8142,10 @@ dependencies = [ "hyper", "hyper-timeout", "percent-encoding 2.1.0", - "pin-project 1.0.11", + "pin-project 1.0.10", "prost", "prost-derive", - "tokio 1.20.1", + "tokio 1.19.2", "tokio-stream", "tokio-util 0.6.10", "tower", @@ -8256,19 +8182,19 @@ dependencies = [ [[package]] name = "tower" -version = "0.4.13" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +checksum = "9a89fd63ad6adf737582df5db40d286574513c69a11dac5214dc3b5603d6713e" dependencies = [ "futures-core", "futures-util", "hdrhistogram", "indexmap", - "pin-project 1.0.11", + "pin-project 1.0.10", "pin-project-lite 0.2.9", "rand 0.8.5", "slab", - "tokio 1.20.1", + "tokio 1.19.2", "tokio-util 0.7.3", "tower-layer", "tower-service", @@ -8283,9 +8209,9 @@ checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" @@ -8302,9 +8228,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.22" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" +checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" dependencies = [ "proc-macro2", "quote", @@ -8313,9 +8239,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.28" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7" +checksum = "7709595b8878a4965ce5e87ebf880a7d39c9afc6837721b21a5a816a8117d921" dependencies = [ "once_cell", "valuable", @@ -8327,7 +8253,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 1.0.11", + "pin-project 1.0.10", "tracing", ] @@ -8389,13 +8315,13 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.15" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b" +checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" dependencies = [ "ansi_term", + "lazy_static", "matchers 0.1.0", - "once_cell", "regex", "sharded-slab", "smallvec", @@ -8466,8 +8392,8 @@ dependencies = [ "ring", "rustls", "thiserror", - "time 0.3.11", - "tokio 1.20.1", + "time 0.3.9", + "tokio 1.19.2", "trust-dns-proto", "webpki 0.22.0", ] @@ -8496,7 +8422,7 @@ dependencies = [ "smallvec", "thiserror", "tinyvec", - "tokio 1.20.1", + "tokio 1.19.2", "tokio-rustls", "url 2.2.2", "webpki 0.22.0", @@ -8549,9 +8475,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "ucd-trie" -version = "0.1.4" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c" +checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" [[package]] name = "uint" @@ -8582,15 +8508,15 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" +checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" [[package]] name = "unicode-normalization" -version = "0.1.21" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" dependencies = [ "tinyvec", ] @@ -8741,26 +8667,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "vswhom" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" -dependencies = [ - "libc", - "vswhom-sys", -] - -[[package]] -name = "vswhom-sys" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22025f6d8eb903ebf920ea6933b70b1e495be37e2cb4099e62c80454aaf57c39" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "waker-fn" version = "1.1.0" @@ -8794,7 +8700,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cef4e1e9114a4b7f1ac799f16ce71c14de5778500c5450ec6b7b920c55b587e" dependencies = [ - "bytes 1.2.0", + "bytes 1.1.0", "futures-channel", "futures-util", "headers", @@ -8804,12 +8710,12 @@ dependencies = [ "mime", "mime_guess", "percent-encoding 2.1.0", - "pin-project 1.0.11", + "pin-project 1.0.10", "scoped-tls", "serde", "serde_json", "serde_urlencoded", - "tokio 1.20.1", + "tokio 1.19.2", "tokio-stream", "tokio-util 0.6.10", "tower-service", @@ -9060,7 +8966,7 @@ dependencies = [ "leb128", "libloading", "loupe", - "object 0.28.4", + "object", "rkyv", "serde", "tempfile", @@ -9116,7 +9022,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d831335ff3a44ecf451303f6f891175c642488036b92ceceb24ac8623a8fa8b" dependencies = [ - "object 0.28.4", + "object", "thiserror", "wasmer-compiler", "wasmer-types", @@ -9320,9 +9226,9 @@ dependencies = [ [[package]] name = "wildmatch" -version = "2.1.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee583bdc5ff1cf9db20e9db5bb3ff4c3089a8f6b8b31aff265c9aba85812db86" +checksum = "d6c48bd20df7e4ced539c12f570f937c6b4884928a87fee70a479d72f031d4e0" [[package]] name = "winapi" @@ -9379,19 +9285,6 @@ dependencies = [ "windows_x86_64_msvc 0.24.0", ] -[[package]] -name = "windows" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbedf6db9096bc2364adce0ae0aa636dcd89f3c3f2cd67947062aaf0ca2a10ec" -dependencies = [ - "windows_aarch64_msvc 0.32.0", - "windows_i686_gnu 0.32.0", - "windows_i686_msvc 0.32.0", - "windows_x86_64_gnu 0.32.0", - "windows_x86_64_msvc 0.32.0", -] - [[package]] name = "windows" version = "0.37.0" @@ -9432,6 +9325,19 @@ version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f33f2b90a6664e369c41ab5ff262d06f048fc9685d9bf8a0e99a47750bb0463" +[[package]] +name = "windows-sys" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "030b7ff91626e57a05ca64a07c481973cbb2db774e4852c9c7ca342408c6a99a" +dependencies = [ + "windows_aarch64_msvc 0.30.0", + "windows_i686_gnu 0.30.0", + "windows_i686_msvc 0.30.0", + "windows_x86_64_gnu 0.30.0", + "windows_x86_64_msvc 0.30.0", +] + [[package]] name = "windows-sys" version = "0.33.0" @@ -9466,9 +9372,9 @@ checksum = "3263d25f1170419995b78ff10c06b949e8a986c35c208dc24333c64753a87169" [[package]] name = "windows_aarch64_msvc" -version = "0.32.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" +checksum = "29277a4435d642f775f63c7d1faeb927adba532886ce0287bd985bffb16b6bca" [[package]] name = "windows_aarch64_msvc" @@ -9496,9 +9402,9 @@ checksum = "c0866510a3eca9aed73a077490bbbf03e5eaac4e1fd70849d89539e5830501fd" [[package]] name = "windows_i686_gnu" -version = "0.32.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" +checksum = "1145e1989da93956c68d1864f32fb97c8f561a8f89a5125f6a2b7ea75524e4b8" [[package]] name = "windows_i686_gnu" @@ -9526,9 +9432,9 @@ checksum = "bf0ffed56b7e9369a29078d2ab3aaeceea48eb58999d2cff3aa2494a275b95c6" [[package]] name = "windows_i686_msvc" -version = "0.32.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" +checksum = "d4a09e3a0d4753b73019db171c1339cd4362c8c44baf1bcea336235e955954a6" [[package]] name = "windows_i686_msvc" @@ -9556,9 +9462,9 @@ checksum = "384a173630588044205a2993b6864a2f56e5a8c1e7668c07b93ec18cf4888dc4" [[package]] name = "windows_x86_64_gnu" -version = "0.32.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" +checksum = "8ca64fcb0220d58db4c119e050e7af03c69e6f4f415ef69ec1773d9aab422d5a" [[package]] name = "windows_x86_64_gnu" @@ -9586,9 +9492,9 @@ checksum = "9bd8f062d8ca5446358159d79a90be12c543b3a965c847c8f3eedf14b321d399" [[package]] name = "windows_x86_64_msvc" -version = "0.32.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" +checksum = "08cabc9f0066848fef4bc6a1c1668e6efce38b661d2aeec75d18d8617eebb5f1" [[package]] name = "windows_x86_64_msvc" @@ -9639,9 +9545,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.19.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce19dddbd3ce01dc8f14eb6d4c8f914123bf8379aaa838f6da4f981ff7104a3f" +checksum = "138e84a6f7f0ef90004a244a6dd4125b5fb78074b48c4369ab52b3cac68a863e" dependencies = [ "block", "cocoa", diff --git a/base_layer/key_manager/src/key_manager.rs b/base_layer/key_manager/src/key_manager.rs index 45a183fb99..6673212c5b 100644 --- a/base_layer/key_manager/src/key_manager.rs +++ b/base_layer/key_manager/src/key_manager.rs @@ -25,13 +25,15 @@ use std::marker::PhantomData; use derivative::Derivative; use digest::Digest; use serde::{Deserialize, Serialize}; +use tari_common::mac_domain_hasher; use tari_crypto::{ + hash::blake2::Blake256, hashing::LengthExtensionAttackResistant, keys::SecretKey, - tari_utilities::{byte_array::ByteArrayError, hex::Hex}, + tari_utilities::byte_array::ByteArrayError, }; -use crate::cipher_seed::CipherSeed; +use crate::{cipher_seed::CipherSeed, KeyManagerDomain}; #[derive(Clone, Derivative, Serialize, Deserialize)] #[derivative(Debug)] @@ -83,15 +85,21 @@ where } } - /// Derive a new private key from master key: derived_key=SHA256(master_key||branch_seed||index) + /// Derive a new private key from master key: derived_key=H(master_key||branch_seed||index), for some + /// hash function H which is Length attack resistant, such as Blake2b. pub fn derive_key(&self, key_index: u64) -> Result, ByteArrayError> { - let concatenated = format!( - "{}{}{}", - self.seed.entropy().to_vec().to_hex(), - self.branch_seed, - key_index - ); - match K::from_bytes(D::digest(&concatenated.into_bytes()).as_slice()) { + // apply domain separation to generate derive key. Under the hood, the hashing api prepends the length of each + // piece of data for concatenation, reducing the risk of collisions due to redundance of variable length + // input + let derive_key = mac_domain_hasher::() + .chain(self.seed.entropy()) + .chain(self.branch_seed.as_str().as_bytes()) + .chain(key_index.to_le_bytes()) + .finalize(); + + let derive_key = derive_key.as_ref(); + + match K::from_bytes(derive_key) { Ok(k) => Ok(DerivedKey { k, key_index }), Err(e) => Err(e), } diff --git a/base_layer/key_manager/src/lib.rs b/base_layer/key_manager/src/lib.rs index 92594caebc..8d7a7b583f 100644 --- a/base_layer/key_manager/src/lib.rs +++ b/base_layer/key_manager/src/lib.rs @@ -14,6 +14,7 @@ pub mod mnemonic_wordlists; #[cfg(feature = "wasm")] pub mod wasm; +hash_domain!(KeyManagerDomain, "com.tari.tari_project.base_layer.key_manager", 1); hash_domain!( KeyManagerMacGeneration, "com.tari.tari_project.base_layer.key_manager.mac_generation", diff --git a/base_layer/key_manager/src/wasm.rs b/base_layer/key_manager/src/wasm.rs index 53f20eff5c..9df12dfde7 100644 --- a/base_layer/key_manager/src/wasm.rs +++ b/base_layer/key_manager/src/wasm.rs @@ -180,8 +180,8 @@ mod test { #[wasm_bindgen_test] fn it_creates_key_manager_from() { let bytes = &[ - 0, 39, 244, 247, 169, 80, 140, 100, 229, 187, 101, 180, 150, 85, 3, 144, 57, 152, 18, 95, 227, 235, 174, - 186, 145, 234, 30, 75, 253, 139, 131, 84, 51, + 0u8, 175, 181, 246, 157, 116, 78, 216, 151, 75, 19, 156, 105, 61, 136, 116, 128, 66, 73, 68, 229, 223, 123, + 127, 116, 217, 17, 5, 250, 33, 50, 157, 17, ]; let seed = CipherSeed::from_enciphered_bytes(bytes, None).unwrap(); let seed = JsValue::from_serde(&seed).unwrap(); @@ -193,7 +193,7 @@ mod test { let next_key = response.key_manager.next_key().unwrap(); assert_eq!( next_key.k.to_hex(), - "61ceb437f919ddc756f8fc3c572c804a51ed6dc1e4d219205a8ebd37b8b04701".to_string() + "00afb5f69d744ed8974b139c693d887480424944e5df7b7f74d91105fa21329d11".to_string() ) }