diff --git a/Cargo.lock b/Cargo.lock index 1765072d17..0b674a7f14 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" @@ -536,7 +536,7 @@ dependencies = [ "hyper", "hyperlocal", "log", - "pin-project 1.0.11", + "pin-project 1.0.10", "serde", "serde_derive", "serde_json", @@ -661,9 +661,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.10.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c53dfa917ec274df8ed3c572698f381a24eef2efba9492d797301b72b6db408a" +checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc" [[package]] name = "byteorder" @@ -688,9 +688,9 @@ dependencies = [ [[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", @@ -772,7 +772,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6358dedf60f4d9b8db43ad187391afe959746101346fe51bb978126bec61dfb" dependencies = [ - "clap 3.2.8", + "clap 3.2.5", "heck 0.4.0", "indexmap", "log", @@ -987,9 +987,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.8" +version = "3.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190814073e85d238f31ff738fcb0bf6910cedeb73376c87cd69291028966fd83" +checksum = "d53da17d37dba964b9b3ecb5c5a1f193a2762c700e6829201e645b9381c99dc7" dependencies = [ "atty", "bitflags 1.3.2", @@ -1004,9 +1004,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.2.7" +version = "3.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759bf187376e1afa7b85b959e6a664a3e7a95203415dba952ad19139e798f902" +checksum = "c11d40217d16aee8508cc8e5fde8b4ff24639758608e5374e731b53f85749fb9" dependencies = [ "heck 0.4.0", "proc-macro-error", @@ -1017,9 +1017,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", ] @@ -1414,9 +1414,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.5" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" +checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1435,15 +1435,15 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.9" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d" +checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" dependencies = [ "autocfg 1.1.0", "cfg-if 1.0.0", "crossbeam-utils", + "lazy_static", "memoffset", - "once_cell", "scopeguard", ] @@ -1459,12 +1459,12 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.10" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83" +checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" dependencies = [ "cfg-if 1.0.0", - "once_cell", + "lazy_static", ] [[package]] @@ -1509,7 +1509,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", @@ -1562,9 +1562,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.4" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5999502d32b9c48d492abe66392408144895020ec4709e549e840799f3bb74c0" +checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" dependencies = [ "generic-array 0.14.5", "typenum", @@ -1807,9 +1807,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", @@ -2064,22 +2064,9 @@ dependencies = [ [[package]] name = "either" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" - -[[package]] -name = "embed-resource" -version = "1.7.2" +version = "1.6.1" 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" @@ -2247,13 +2234,13 @@ dependencies = [ [[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]] @@ -2268,14 +2255,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.13", - "windows-sys 0.36.1", + "winapi 0.3.9", ] [[package]] @@ -2298,9 +2285,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" @@ -2507,7 +2494,7 @@ dependencies = [ "futures-sink", "futures-task", "futures-util", - "pin-project 1.0.11", + "pin-project 1.0.10", "pin-utils", ] @@ -2700,9 +2687,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", @@ -2745,9 +2732,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", @@ -2922,7 +2909,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", ] @@ -3114,7 +3105,7 @@ dependencies = [ "futures-util", "hex", "hyper", - "pin-project 1.0.11", + "pin-project 1.0.10", "tokio 1.19.2", ] @@ -3184,32 +3175,18 @@ dependencies = [ "byteorder", "color_quant", "num-iter", - "num-rational 0.3.2", - "num-traits", -] - -[[package]] -name = "image" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28edd9d7bc256be2502e325ac0628bde30b7001b9b52e0abe31a1a9dc2701212" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-iter", - "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.1", + "hashbrown 0.11.2", "serde", ] @@ -3248,15 +3225,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" @@ -3598,20 +3575,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" @@ -3704,7 +3672,7 @@ dependencies = [ "serde", "serde_json", "tracing", - "tracing-subscriber 0.3.14", + "tracing-subscriber 0.3.11", ] [[package]] @@ -3744,7 +3712,7 @@ dependencies = [ "dirs-next 2.0.0", "objc-foundation", "objc_id", - "time 0.3.11", + "time 0.3.9", ] [[package]] @@ -3942,9 +3910,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", @@ -4281,17 +4249,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" @@ -4449,9 +4406,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", ] @@ -4482,7 +4439,7 @@ 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.19.2", @@ -4825,7 +4782,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", ] @@ -4977,27 +4934,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", @@ -5006,9 +4963,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", @@ -5063,20 +5020,6 @@ 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.1" @@ -5217,9 +5160,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.40" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" +checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" dependencies = [ "unicode-ident", ] @@ -5325,7 +5268,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f" dependencies = [ "checked_int_cast", - "image 0.23.14", + "image", ] [[package]] @@ -5336,21 +5279,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", ] @@ -5668,13 +5611,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", @@ -5744,9 +5686,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", @@ -5826,21 +5768,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]] @@ -5866,9 +5808,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.7" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0a5f7c728f5d284929a1cccb5bc19884422bfe6ef4d6c409da2c41838983fcf" +checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" [[package]] name = "rustyline" @@ -6026,9 +5968,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", ] @@ -6044,9 +5986,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.138" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1578c6245786b9d168c5447eeacfb96856573ca56c9d68fdcf394be134882a47" +checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" dependencies = [ "serde_derive", ] @@ -6091,9 +6033,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.138" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "023e9b1467aef8a10fb88f25611870ada9800ef7e22afce356bb0d2387b6f27c" +checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" dependencies = [ "proc-macro2", "quote", @@ -6102,9 +6044,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", @@ -6332,7 +6274,7 @@ checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" dependencies = [ "libc", "mio 0.7.14", - "mio 0.8.4", + "mio 0.8.3", "signal-hook 0.3.14", ] @@ -6365,9 +6307,9 @@ 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" @@ -6600,9 +6542,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", @@ -6649,9 +6591,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.12.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a71c32c2fa7bba46b01becf9cf470f6a781573af7e376c5e317a313ecce27545" +checksum = "d2497feadd60f2a5a7f124572d7a44b2aba589a0ad2a65d3aaf2d073c327c3b8" dependencies = [ "bitflags 1.3.2", "cairo-rs", @@ -6669,7 +6611,6 @@ dependencies = [ "glib", "glib-sys", "gtk", - "image 0.24.2", "instant", "jni 0.19.0", "lazy_static", @@ -6682,17 +6623,28 @@ dependencies = [ "once_cell", "parking_lot 0.11.2", "paste", - "png 0.17.5", "raw-window-handle", "scopeguard", "serde", + "tao-core-video-sys", "unicode-segmentation", - "uuid 0.8.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" @@ -6732,7 +6684,7 @@ dependencies = [ name = "tari_app_utilities" version = "0.33.0" dependencies = [ - "clap 3.2.8", + "clap 3.2.5", "config", "dirs-next 1.0.2", "futures 0.3.21", @@ -6759,7 +6711,7 @@ dependencies = [ "async-trait", "bincode", "chrono", - "clap 3.2.8", + "clap 3.2.5", "config", "crossterm 0.23.2", "derive_more", @@ -6848,7 +6800,7 @@ name = "tari_collectibles" version = "0.1.0" dependencies = [ "blake2 0.9.2", - "clap 3.2.8", + "clap 3.2.5", "derivative", "diesel", "diesel_migrations", @@ -6950,7 +6902,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", @@ -6999,7 +6951,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", @@ -7043,7 +6995,7 @@ version = "0.33.0" dependencies = [ "bitflags 1.3.2", "chrono", - "clap 3.2.8", + "clap 3.2.5", "config", "crossterm 0.17.7", "digest 0.9.0", @@ -7107,7 +7059,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", @@ -7190,7 +7142,7 @@ dependencies = [ "anyhow", "async-trait", "blake2 0.9.2", - "clap 3.2.8", + "clap 3.2.5", "digest 0.9.0", "futures 0.3.21", "lmdb-zero", @@ -7343,7 +7295,7 @@ dependencies = [ "bincode", "bytes 1.1.0", "chrono", - "clap 3.2.8", + "clap 3.2.5", "config", "crossterm 0.17.7", "derivative", @@ -7394,7 +7346,7 @@ dependencies = [ "base64 0.13.0", "bufstream", "chrono", - "clap 3.2.8", + "clap 3.2.5", "config", "crossbeam", "crossterm 0.17.7", @@ -7477,7 +7429,7 @@ dependencies = [ "rand 0.8.5", "reqwest", "rustls", - "semver 1.0.12", + "semver 1.0.10", "serde", "serde_derive", "tari_common", @@ -7602,7 +7554,7 @@ dependencies = [ "async-trait", "blake2 0.9.2", "bytecodec", - "clap 3.2.8", + "clap 3.2.5", "config", "digest 0.9.0", "futures 0.3.21", @@ -7727,13 +7679,13 @@ dependencies = [ [[package]] name = "tauri" -version = "1.0.2" +version = "1.0.0-rc.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "421641ec549d34935530886151a42ce5ecbbb57beb30e5eec1b22f8e08e10ee9" +checksum = "cb533e95e09fd191ef8e0a0ee6b61701b5f32175e48f82854a71a8f8367bdb41" dependencies = [ "anyhow", "attohttpc", - "clap 3.2.8", + "clap 3.2.5", "cocoa", "dirs-next 2.0.0", "embed_plist", @@ -7757,7 +7709,7 @@ dependencies = [ "raw-window-handle", "regex", "rfd", - "semver 1.0.12", + "semver 1.0.10", "serde", "serde_json", "serde_repr", @@ -7781,14 +7733,14 @@ dependencies = [ [[package]] name = "tauri-build" -version = "1.0.2" +version = "1.0.0-rc.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598bd36884ee15ac73dfca9921066fd87d13d9beea60384b99a66c3a5d800d70" +checksum = "58f9a1c87ad53f584f970b06c9243b39d1c2aeca6116dd04c641f406133053b0" dependencies = [ "anyhow", "cargo_toml", "heck 0.4.0", - "semver 1.0.12", + "semver 1.0.10", "serde_json", "tauri-utils", "winres", @@ -7796,34 +7748,32 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.0.2" +version = "1.0.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048a7b404b92c86e7dc32458fd0963f042a76d520681e6f598d73a97c2feeeef" +checksum = "ceb3b7cb66f1a6ca30f601cccfa01820477881c27412909a3e6f80b6a2f73815" dependencies = [ "base64 0.13.0", "brotli", "ico", - "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.2" +version = "1.0.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf70098bfab21efde9b2c089008b319ba333f4ee6e55c38bdea188dea86497f" +checksum = "07883238ade4c96be38a6a0025f15cbb5e0539fe99ba92d444af9cdbc656b613" dependencies = [ "heck 0.4.0", "proc-macro2", @@ -7835,15 +7785,14 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.10.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d34f58c61a6790ba3de5753daea61b5beb6926b2384d1ad03b9dfe622c72be" +checksum = "7bad3a8ce06d4e71a52efef175446c8eb7e9109b6f988782fdc6a234526f226a" dependencies = [ "gtk", "http", "http-range", "infer", - "raw-window-handle", "serde", "serde_json", "tauri-utils", @@ -7855,15 +7804,14 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.10.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9a56e25146ff1f13f37bdb010ed0d692e7e81c824b9f977ae439f446f37ab4" +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", @@ -7875,9 +7823,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.0.2" +version = "1.0.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616f178da1e0466ca45963ed108a1567d4b8803662addaca313169d0dcd97715" +checksum = "b09e7ec7933a833f3b64e932a9d32d94705687aa5caa3cacf43222876a6d7e24" dependencies = [ "brotli", "ctor", @@ -7890,14 +7838,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]] @@ -8045,11 +7992,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", ] @@ -8111,7 +8057,7 @@ dependencies = [ "bytes 1.1.0", "libc", "memchr", - "mio 0.8.4", + "mio 0.8.3", "num_cpus", "once_cell", "pin-project-lite 0.2.9", @@ -8231,7 +8177,7 @@ dependencies = [ "hyper", "hyper-timeout", "percent-encoding 2.1.0", - "pin-project 1.0.11", + "pin-project 1.0.10", "prost", "prost-derive", "tokio 1.19.2", @@ -8271,15 +8217,15 @@ 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", @@ -8298,9 +8244,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" @@ -8317,9 +8263,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", @@ -8328,9 +8274,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", @@ -8342,7 +8288,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", ] @@ -8404,13 +8350,13 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.14" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a713421342a5a666b7577783721d3117f1b69a393df803ee17bb73b1e122a59" +checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" dependencies = [ "ansi_term", + "lazy_static", "matchers 0.1.0", - "once_cell", "regex", "sharded-slab", "smallvec", @@ -8481,7 +8427,7 @@ dependencies = [ "ring", "rustls", "thiserror", - "time 0.3.11", + "time 0.3.9", "tokio 1.19.2", "trust-dns-proto", "webpki 0.22.0", @@ -8603,9 +8549,9 @@ 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", ] @@ -8756,26 +8702,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" @@ -8819,7 +8745,7 @@ dependencies = [ "mime", "mime_guess", "percent-encoding 2.1.0", - "pin-project 1.0.11", + "pin-project 1.0.10", "scoped-tls", "serde", "serde_json", @@ -8943,9 +8869,9 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f0c17267a5ffd6ae3d897589460e21db1673c84fb7016b909c9691369a75ea" +checksum = "f76068e87fe9b837a6bc2ccded66784173eadb828c4168643e9fddf6f9ed2e61" dependencies = [ "leb128", ] @@ -9189,9 +9115,9 @@ checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" [[package]] name = "wast" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "badcb03f976f983ff0daf294da9697be659442f61e6b0942bb37a2b6cbfe9dd4" +checksum = "408feaebf6dbf9d154957873b14d00e8fba4cbc17a8cbb1bc9e4c1db425c50a8" dependencies = [ "leb128", "memchr", @@ -9201,9 +9127,9 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.44" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b92f20b742ac527066c8414bc0637352661b68cab07ef42586cefaba71c965cf" +checksum = "2b70bfff0cfaf33dc9d641196dbcd0023a2da8b4b9030c59535cb44e2884983b" dependencies = [ "wast", ] @@ -9335,9 +9261,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" @@ -9434,6 +9360,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,6 +9405,12 @@ version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3263d25f1170419995b78ff10c06b949e8a986c35c208dc24333c64753a87169" +[[package]] +name = "windows_aarch64_msvc" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29277a4435d642f775f63c7d1faeb927adba532886ce0287bd985bffb16b6bca" + [[package]] name = "windows_aarch64_msvc" version = "0.33.0" @@ -9490,6 +9435,12 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0866510a3eca9aed73a077490bbbf03e5eaac4e1fd70849d89539e5830501fd" +[[package]] +name = "windows_i686_gnu" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1145e1989da93956c68d1864f32fb97c8f561a8f89a5125f6a2b7ea75524e4b8" + [[package]] name = "windows_i686_gnu" version = "0.33.0" @@ -9514,6 +9465,12 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf0ffed56b7e9369a29078d2ab3aaeceea48eb58999d2cff3aa2494a275b95c6" +[[package]] +name = "windows_i686_msvc" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a09e3a0d4753b73019db171c1339cd4362c8c44baf1bcea336235e955954a6" + [[package]] name = "windows_i686_msvc" version = "0.33.0" @@ -9538,6 +9495,12 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "384a173630588044205a2993b6864a2f56e5a8c1e7668c07b93ec18cf4888dc4" +[[package]] +name = "windows_x86_64_gnu" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca64fcb0220d58db4c119e050e7af03c69e6f4f415ef69ec1773d9aab422d5a" + [[package]] name = "windows_x86_64_gnu" version = "0.33.0" @@ -9562,6 +9525,12 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bd8f062d8ca5446358159d79a90be12c543b3a965c847c8f3eedf14b321d399" +[[package]] +name = "windows_x86_64_msvc" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08cabc9f0066848fef4bc6a1c1668e6efce38b661d2aeec75d18d8617eebb5f1" + [[package]] name = "windows_x86_64_msvc" version = "0.33.0" @@ -9611,9 +9580,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/dan_layer/core/src/workers/states/starting.rs b/dan_layer/core/src/workers/states/starting.rs index 360aba2947..5fd702baf3 100644 --- a/dan_layer/core/src/workers/states/starting.rs +++ b/dan_layer/core/src/workers/states/starting.rs @@ -64,7 +64,8 @@ impl Starting { // get latest checkpoint on the base layer let mut outputs = base_node_client .get_current_contract_outputs( - tip.height_of_longest_chain - asset_definition.base_layer_confirmation_time, + tip.height_of_longest_chain + .saturating_sub(asset_definition.base_layer_confirmation_time), asset_definition.contract_id, OutputType::ContractConstitution, ) diff --git a/dan_layer/core/src/workers/states/synchronizing.rs b/dan_layer/core/src/workers/states/synchronizing.rs index d937ea8425..4a7331a508 100644 --- a/dan_layer/core/src/workers/states/synchronizing.rs +++ b/dan_layer/core/src/workers/states/synchronizing.rs @@ -63,7 +63,8 @@ impl> Synchronizing< let tip = base_node_client.get_tip_info().await?; let mut last_checkpoint = base_node_client .get_current_contract_outputs( - tip.height_of_longest_chain - asset_definition.base_layer_confirmation_time, + tip.height_of_longest_chain + .saturating_sub(asset_definition.base_layer_confirmation_time), asset_definition.contract_id, OutputType::ContractCheckpoint, ) @@ -79,7 +80,8 @@ impl> Synchronizing< let mut constitution = base_node_client .get_current_contract_outputs( - tip.height_of_longest_chain - asset_definition.base_layer_confirmation_time, + tip.height_of_longest_chain + .saturating_sub(asset_definition.base_layer_confirmation_time), asset_definition.contract_id, OutputType::ContractConstitution, )