diff --git a/Cargo.lock b/Cargo.lock index 79ac3156dc5..e6d80942024 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -35,9 +35,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", @@ -48,18 +48,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "amcl" @@ -90,9 +90,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.5" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -104,9 +104,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -138,9 +138,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "arbitrary" @@ -320,18 +320,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -340,7 +340,7 @@ version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f77d243921b0979fbbd728dd2d5162e68ac8252976797c24eb5b3a6af9090dc" dependencies = [ - "http", + "http 0.2.12", "log", "native-tls", "rustls", @@ -362,9 +362,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "axum" @@ -377,7 +377,7 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http", + "http 0.2.12", "http-body", "hyper", "itoa", @@ -403,7 +403,7 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", + "http 0.2.12", "http-body", "mime", "rustversion", @@ -434,9 +434,9 @@ checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -444,15 +444,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" -[[package]] -name = "basic-toml" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f2139706359229bfa8f19142ac1155b4b80beafb7a60471ac5dd109d4a19778" -dependencies = [ - "serde", -] - [[package]] name = "bincode" version = "1.3.3" @@ -485,9 +476,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bitvec" @@ -526,7 +517,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" dependencies = [ "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.6", "serde", ] @@ -569,9 +560,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "camino" @@ -613,9 +604,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" dependencies = [ "jobserver", "libc", @@ -653,9 +644,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -663,7 +654,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -706,9 +697,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.11" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -716,33 +707,33 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim", + "strsim 0.11.1", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "clru" @@ -762,9 +753,9 @@ dependencies = [ [[package]] name = "color-eyre" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" +checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" dependencies = [ "backtrace", "color-spantrace", @@ -927,9 +918,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -1045,9 +1036,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] @@ -1100,45 +1091,37 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.16" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", ] [[package]] name = "crossbeam-queue" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9bcf5bdbfdd6030fb4a1c497b5d5fc5921aa2f60d359a17e249c0e6df3de153" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.17" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crossterm" @@ -1189,9 +1172,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", @@ -1212,7 +1195,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -1239,7 +1222,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -1256,14 +1239,14 @@ checksum = "587663dd5fb3d10932c8aecfe7c844db1bcf0aee93eeab08fac13dc1212c2e7f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] name = "darling" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ "darling_core", "darling_macro", @@ -1271,27 +1254,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim", - "syn 2.0.41", + "strsim 0.10.0", + "syn 2.0.60", ] [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -1340,9 +1323,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", "serde", @@ -1422,7 +1405,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -1475,9 +1458,9 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek", "ed25519", @@ -1490,9 +1473,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "elliptic-curve" @@ -1555,9 +1538,9 @@ dependencies = [ [[package]] name = "expect-test" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3" +checksum = "9e0be0a561335815e06dab7c62e50353134c796e7a6155402a64bcff66b6a5e0" dependencies = [ "dissimilar", "once_cell", @@ -1565,9 +1548,9 @@ dependencies = [ [[package]] name = "eyre" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" dependencies = [ "indenter", "once_cell", @@ -1587,9 +1570,9 @@ checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "ff" @@ -1739,7 +1722,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -1787,7 +1770,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "debugid", "fxhash", "serde", @@ -1835,7 +1818,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" dependencies = [ "fallible-iterator", - "indexmap 2.1.0", + "indexmap 2.2.6", "stable_deref_trait", ] @@ -1893,7 +1876,7 @@ dependencies = [ "gix-date", "itoa", "thiserror", - "winnow", + "winnow 0.5.40", ] [[package]] @@ -1946,7 +1929,7 @@ dependencies = [ "smallvec", "thiserror", "unicode-bom", - "winnow", + "winnow 0.5.40", ] [[package]] @@ -1955,7 +1938,7 @@ version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbd06203b1a9b33a78c88252a625031b094d9e1b647260070c25b09910c0a804" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "bstr", "gix-path", "libc", @@ -2034,7 +2017,7 @@ version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae6232f18b262770e343dcdd461c0011c9b9ae27f0c805e115012aa2b902c1b8" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "bstr", "gix-features", "gix-path", @@ -2067,7 +2050,7 @@ version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e50e63df6c8d4137f7fb882f27643b3a9756c468a1a2cdbe1ce443010ca8778" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "bstr", "btoi", "filetime", @@ -2105,7 +2088,7 @@ checksum = "1dff438f14e67e7713ab9332f5fd18c8f20eb7eb249494f6c2bf170522224032" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -2124,7 +2107,7 @@ dependencies = [ "itoa", "smallvec", "thiserror", - "winnow", + "winnow 0.5.40", ] [[package]] @@ -2208,7 +2191,7 @@ dependencies = [ "gix-validate", "memmap2", "thiserror", - "winnow", + "winnow 0.5.40", ] [[package]] @@ -2262,7 +2245,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fddc27984a643b20dd03e97790555804f98cf07404e0e552c0ad8133266a79a1" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "gix-path", "libc", "windows-sys 0.52.0", @@ -2358,17 +2341,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 2.1.0", + "http 0.2.12", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -2428,7 +2411,7 @@ dependencies = [ "base64", "bytes", "headers-core", - "http", + "http 0.2.12", "httpdate", "mime", "sha1", @@ -2440,7 +2423,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.12", ] [[package]] @@ -2449,6 +2432,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -2508,9 +2497,20 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -2524,7 +2524,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.12", "pin-project-lite", ] @@ -2548,22 +2548,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", "h2", - "http", + "http 0.2.12", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower-service", "tracing", @@ -2663,9 +2663,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -2727,7 +2727,7 @@ dependencies = [ "tempfile", "thread-local-panic-hook", "tokio", - "toml 0.8.8", + "toml 0.8.12", "tracing", "vergen", ] @@ -2745,7 +2745,7 @@ dependencies = [ "eyre", "futures-util", "hex", - "http", + "http 0.2.12", "iroha", "iroha_config", "iroha_crypto", @@ -2769,11 +2769,11 @@ dependencies = [ "test_network", "thiserror", "tokio", - "tokio-tungstenite", - "toml 0.8.8", + "tokio-tungstenite 0.20.1", + "toml 0.8.12", "tracing-flame", "tracing-subscriber", - "tungstenite", + "tungstenite 0.20.1", "url", ] @@ -2820,7 +2820,7 @@ dependencies = [ "stacker", "strum 0.25.0", "thiserror", - "toml 0.8.8", + "toml 0.8.12", "tracing", "tracing-subscriber", "trybuild", @@ -2840,7 +2840,7 @@ dependencies = [ "serde_json", "serde_with", "thiserror", - "toml 0.8.8", + "toml 0.8.12", ] [[package]] @@ -2857,7 +2857,7 @@ dependencies = [ "eyre", "futures", "hex", - "indexmap 2.1.0", + "indexmap 2.2.6", "iroha_config", "iroha_crypto", "iroha_data_model", @@ -2894,7 +2894,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -2982,7 +2982,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 2.0.41", + "syn 2.0.60", "trybuild", ] @@ -2996,7 +2996,7 @@ dependencies = [ "manyhow", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", "trybuild", ] @@ -3021,7 +3021,7 @@ dependencies = [ "manyhow", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -3047,7 +3047,7 @@ dependencies = [ "quote", "rustc-hash", "strum 0.25.0", - "syn 2.0.41", + "syn 2.0.60", "trybuild", ] @@ -3073,7 +3073,7 @@ dependencies = [ "manyhow", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -3127,7 +3127,7 @@ dependencies = [ "manyhow", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -3200,7 +3200,7 @@ dependencies = [ "manyhow", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -3223,7 +3223,7 @@ dependencies = [ "manyhow", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", "trybuild", ] @@ -3260,7 +3260,7 @@ dependencies = [ "manyhow", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -3315,7 +3315,7 @@ dependencies = [ "streaming-stats", "tokio", "tokio-stream", - "tokio-tungstenite", + "tokio-tungstenite 0.20.1", "url", "vergen", ] @@ -3329,7 +3329,7 @@ dependencies = [ "manyhow", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", "trybuild", ] @@ -3377,7 +3377,7 @@ dependencies = [ "manyhow", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", "warp", ] @@ -3399,7 +3399,7 @@ dependencies = [ "manyhow", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -3430,7 +3430,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 2.0.41", + "syn 2.0.60", "trybuild", ] @@ -3511,9 +3511,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "ittapi" @@ -3566,9 +3566,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", "ecdsa", @@ -3628,9 +3628,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.151" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libflate" @@ -3668,16 +3668,16 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", "redox_syscall", ] [[package]] name = "libsodium-sys-stable" -version = "1.20.4" +version = "1.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1d164bc6f9139c5f95efb4f0be931b2bd5a9edf7e4e3c945d26b95ab8fa669b" +checksum = "956ff84815195b3d40db429f6cb8c7b1c6548c618797b3b919e08fec250bcdd2" dependencies = [ "cc", "libc", @@ -3717,9 +3717,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lru" @@ -3749,7 +3749,7 @@ dependencies = [ "manyhow-macros", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -3780,9 +3780,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memfd" @@ -3804,9 +3804,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -3863,18 +3863,18 @@ checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -3891,7 +3891,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http", + "http 0.2.12", "httparse", "log", "memchr", @@ -3975,6 +3975,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" version = "0.1.45" @@ -3987,9 +3993,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -4016,13 +4022,13 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "crc32fast", "hashbrown 0.14.3", - "indexmap 2.1.0", + "indexmap 2.2.6", "memchr", ] @@ -4046,11 +4052,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.61" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -4067,7 +4073,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -4087,9 +4093,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.97" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -4251,7 +4257,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -4272,7 +4278,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap 2.2.6", ] [[package]] @@ -4292,14 +4298,14 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -4319,15 +4325,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platforms" -version = "3.2.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" +checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" [[package]] name = "plotters" @@ -4377,7 +4383,7 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "pprof" version = "0.13.0" -source = "git+https://github.com/Erigara/pprof-rs?branch=fix_pointer_align#55fa41916b9bb7f2029643e26168556efda19333" +source = "git+https://github.com/Erigara/pprof-rs?branch=fix_pointer_align#5f624c20fdd36f3396b78b954edbc7fc8b85773c" dependencies = [ "backtrace", "cfg-if", @@ -4447,9 +4453,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -4482,13 +4488,13 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.4.1", + "bitflags 2.5.0", "lazy_static", "num-traits", "rand", "rand_chacha", "rand_xorshift", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", "rusty-fork", "tempfile", "unarray", @@ -4514,7 +4520,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -4568,9 +4574,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -4622,9 +4628,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -4632,9 +4638,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -4675,14 +4681,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -4696,13 +4702,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -4713,9 +4719,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rfc6979" @@ -4749,9 +4755,9 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" [[package]] name = "rust_decimal" -version = "1.34.3" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39449a79f45e8da28c57c341891b69a183044b29518bb8f86dbac9df60bb7df" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" dependencies = [ "arrayvec", "num-traits", @@ -4781,11 +4787,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -4855,9 +4861,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -4921,9 +4927,9 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.28.0" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acea373acb8c21ecb5a23741452acd2593ed44ee3d343e72baaa143bc89d0d5" +checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" dependencies = [ "rand", "secp256k1-sys", @@ -4932,9 +4938,9 @@ dependencies = [ [[package]] name = "secp256k1-sys" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd97a086ec737e30053fd5c46f097465d25bb81dd3608825f65298c4c98be83" +checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb" dependencies = [ "cc", ] @@ -4964,38 +4970,38 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.193" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -5025,16 +5031,17 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.4.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" +checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" dependencies = [ "base64", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", + "serde_derive", "serde_json", "serde_with_macros", "time", @@ -5042,23 +5049,23 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.4.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" +checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] name = "serde_yaml" -version = "0.9.29" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15e0ef66bf939a7c890a0bf6d5a733c70202225f9888a89ed5c62298b019129" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -5087,7 +5094,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -5120,9 +5127,9 @@ dependencies = [ [[package]] name = "sha256" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7895c8ae88588ccead14ff438b939b0c569cd619116f14b4d13fdff7b8333386" +checksum = "18278f6a914fa3070aa316493f7d2ddfb9ac86ebc06fa3b83bffda487e9065b0" dependencies = [ "async-trait", "bytes", @@ -5223,31 +5230,21 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" dependencies = [ "serde", ] [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5326,6 +5323,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "strum" version = "0.24.1" @@ -5347,7 +5350,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -5360,11 +5363,11 @@ version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -5429,9 +5432,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.41" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -5463,28 +5466,27 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -5514,22 +5516,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -5560,13 +5562,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -5582,10 +5585,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -5616,9 +5620,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -5627,7 +5631,7 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", "tracing", "windows-sys 0.48.0", @@ -5651,7 +5655,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -5676,9 +5680,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -5700,10 +5704,22 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-rustls", - "tungstenite", + "tungstenite 0.20.1", "webpki-roots 0.25.3", ] +[[package]] +name = "tokio-tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.21.0", +] + [[package]] name = "tokio-util" version = "0.7.10" @@ -5729,14 +5745,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.8" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.0", + "toml_edit 0.22.9", ] [[package]] @@ -5754,22 +5770,22 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.6", ] [[package]] @@ -5784,7 +5800,7 @@ dependencies = [ "base64", "bytes", "h2", - "http", + "http 0.2.12", "http-body", "hyper", "hyper-timeout", @@ -5851,7 +5867,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -5933,17 +5949,17 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "trybuild" -version = "1.0.85" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196a58260a906cedb9bf6d8034b6379d0c11f552416960452f267402ceeddff1" +checksum = "8ad7eb6319ebadebca3dacf1f85a93bc54b73dd81b9036795f73de7ddfe27d5a" dependencies = [ - "basic-toml", "glob", "once_cell", "serde", "serde_derive", "serde_json", "termcolor", + "toml 0.8.12", ] [[package]] @@ -5955,7 +5971,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.12", "httparse", "log", "native-tls", @@ -5969,6 +5985,25 @@ dependencies = [ "webpki-roots 0.24.0", ] +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + [[package]] name = "typenum" version = "1.17.0" @@ -5998,9 +6033,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-bom" @@ -6016,9 +6051,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -6062,9 +6097,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "untrusted" @@ -6119,9 +6154,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom", ] @@ -6213,15 +6248,15 @@ dependencies = [ [[package]] name = "warp" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e92e22e03ff1230c03a1a8ee37d2f89cd489e2e541b7550d6afad96faed169" +checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" dependencies = [ "bytes", "futures-channel", "futures-util", "headers", - "http", + "http 0.2.12", "hyper", "log", "mime", @@ -6229,14 +6264,12 @@ dependencies = [ "multer", "percent-encoding", "pin-project", - "rustls-pemfile", "scoped-tls", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-stream", - "tokio-tungstenite", + "tokio-tungstenite 0.21.0", "tokio-util", "tower-service", "tracing", @@ -6269,7 +6302,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -6291,7 +6324,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6313,18 +6346,18 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.38.1" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad2b51884de9c7f4fe2fd1043fccb8dcad4b1e29558146ee57a144d15779f3f" +checksum = "111495d6204760238512f57a9af162f45086504da332af210f2f75dd80b34f1d" dependencies = [ "leb128", ] [[package]] name = "wasm-opt" -version = "0.116.0" +version = "0.116.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc942673e7684671f0c5708fc18993569d184265fd5223bb51fc8e5b9b6cfd52" +checksum = "2fd87a4c135535ffed86123b6fb0f0a5a0bc89e50416c942c5f0662c645f679c" dependencies = [ "anyhow", "libc", @@ -6366,7 +6399,7 @@ version = "0.116.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a58e28b80dd8340cb07b8242ae654756161f6fc8d0038123d679b7b99964fa50" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "semver", ] @@ -6382,7 +6415,7 @@ dependencies = [ "bumpalo", "cfg-if", "fxprof-processed-profile", - "indexmap 2.1.0", + "indexmap 2.2.6", "libc", "log", "object", @@ -6445,7 +6478,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser", @@ -6507,7 +6540,7 @@ dependencies = [ "anyhow", "cranelift-entity", "gimli", - "indexmap 2.1.0", + "indexmap 2.2.6", "log", "object", "serde", @@ -6592,7 +6625,7 @@ dependencies = [ "anyhow", "cc", "cfg-if", - "indexmap 2.1.0", + "indexmap 2.2.6", "libc", "log", "mach", @@ -6633,7 +6666,7 @@ checksum = "f50f51f8d79bfd2aa8e9d9a0ae7c2d02b45fe412e62ff1b87c0c81b07c738231" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -6643,8 +6676,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b804dfd3d0c0d6d37aa21026fe7772ba1a769c89ee4f5c4f13b82d91d75216f" dependencies = [ "anyhow", - "heck", - "indexmap 2.1.0", + "heck 0.4.1", + "indexmap 2.2.6", "wit-parser", ] @@ -6656,21 +6689,21 @@ checksum = "9b6060bc082cc32d9a45587c7640e29e3c7b89ada82677ac25d87850aaccb368" [[package]] name = "wast" -version = "69.0.1" +version = "70.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ee37317321afde358e4d7593745942c48d6d17e0e6e943704de9bbee121e7a" +checksum = "2ee4bc54bbe1c6924160b9f75e374a1d07532e7580eb632c0ee6cdd109bb217e" dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder 0.38.1", + "wasm-encoder 0.39.0", ] [[package]] name = "wat" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeb338ee8dee4d4cd05e6426683f21c5087dc7cfc8903e839ccf48d43332da3c" +checksum = "9f0dce8cdc288c717cf01e461a1e451a7b8445d53451123536ba576e423a101a" dependencies = [ "wast", ] @@ -6950,22 +6983,31 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.28" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2" +checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" dependencies = [ "memchr", ] [[package]] name = "wit-parser" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15df6b7b28ce94b8be39d8df5cb21a08a4f3b9f33b631aedb4aa5776f785ead3" +checksum = "df4913a2219096373fd6512adead1fb77ecdaa59d7fc517972a7d30b12f625be" dependencies = [ "anyhow", "id-arena", - "indexmap 2.1.0", + "indexmap 2.2.6", "log", "semver", "serde", @@ -6985,9 +7027,9 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", "rand_core", @@ -6995,9 +7037,9 @@ dependencies = [ [[package]] name = "xattr" -version = "1.1.3" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dae5072fe1f8db8f8d29059189ac175196e410e40ba42d5d4684ae2f750995" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys", @@ -7006,22 +7048,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -7041,7 +7083,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 920f79097f1..9a384f0fd44 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,76 +54,76 @@ iroha_executor_derive = { version = "=2.0.0-pre-rc.20", path = "smart_contract/e iroha_trigger_derive = { version = "=2.0.0-pre-rc.20", path = "smart_contract/trigger/derive" } test_network = { version = "=2.0.0-pre-rc.20", path = "core/test_network" } -proc-macro2 = "1.0.69" -syn = { version = "2.0.38", default-features = false } -quote = "1.0.33" +proc-macro2 = "1.0.81" +syn = { version = "2.0.60", default-features = false } +quote = "1.0.36" manyhow = { version = "0.8.1", features = ["darling"] } -darling = "0.20.3" +darling = "0.20.8" drop_bomb = "0.1.5" futures = { version = "0.3.30", default-features = false } -tokio = "1.33.0" -tokio-stream = "0.1.14" +tokio = "1.37.0" +tokio-stream = "0.1.15" tokio-tungstenite = "0.20.1" tungstenite = "0.20.1" -crossbeam-queue = "0.3.8" +crossbeam-queue = "0.3.11" parking_lot = { version = "0.12.1" } -once_cell = "1.18.0" -tempfile = "3.8.0" +once_cell = "1.19.0" +tempfile = "3.10.1" path-absolutize = "3.1.1" pathdiff = "0.2.1" -bytes = "1.5.0" +bytes = "1.6.0" vergen = { version = "8.3.1", default-features = false } -trybuild = "1.0.85" +trybuild = "1.0.91" impls = "1.0.3" -base64 = { version = "0.21.4", default-features = false } +base64 = { version = "0.21.7", default-features = false } hex = { version = "0.4.3", default-features = false } nonzero_ext = { version = "0.3.0", default-features = false } -url = "2.4.1" +url = "2.5.0" prometheus = { version = "0.13.3", default-features = false } -clap = "4.4.6" +clap = "4.5.4" owo-colors = "3.5.0" supports-color = "2.1.0" inquire = "0.6.2" spinoff = "0.8.0" criterion = "0.5.1" -expect-test = "1.4.1" +expect-test = "1.5.0" -eyre = "0.6.8" -color-eyre = "0.6.2" -thiserror = { version = "1.0.49", default-features = false } +eyre = "0.6.12" +color-eyre = "0.6.3" +thiserror = { version = "1.0.58", default-features = false } displaydoc = { version = "0.2.4", default-features = false } cfg-if = "1.0.0" derive_more = { version = "0.99.17", default-features = false } -async-trait = "0.1.73" +async-trait = "0.1.80" strum = { version = "0.25.0", default-features = false } getset = "0.1.2" hex-literal = "0.4.1" rand = { version = "0.8.5", default-features = false, features = ["getrandom", "alloc"] } -warp = { version = "0.3.6", default-features = false } -wasmtime = "15.0.0" +warp = { version = "0.3.7", default-features = false } +wasmtime = "15.0.1" -tracing = "0.1.37" -tracing-subscriber = { version = "0.3.17", default-features = false } +tracing = "0.1.40" +tracing-subscriber = { version = "0.3.18", default-features = false } dashmap = "5.5.3" rustc-hash = "1.1.0" -serde = { version = "1.0.188", default-features = false } -serde_json = { version = "1.0.107", default-features = false } -serde_yaml = "0.9.29" -serde_with = { version = "3.3.0", default-features = false } -parity-scale-codec = { version = "3.6.5", default-features = false } +serde = { version = "1.0.198", default-features = false } +serde_json = { version = "1.0.116", default-features = false } +serde_yaml = "0.9.34" +serde_with = { version = "3.7.0", default-features = false } +parity-scale-codec = { version = "3.6.9", default-features = false } json5 = "0.4.1" -toml = "0.8.8" +toml = "0.8.12" storage = { git = "https://github.com/Erigara/storage.git", rev = "e0afe4b42810e9b3cf067cfbaa63a6ad7af6e2ba" } @@ -188,7 +188,7 @@ clippy.string_lit_as_bytes = "warn" clippy.suspicious_operation_groupings = "warn" clippy.useless_let_if_seq = "warn" -#cargo +# cargo clippy.redundant_feature_names = "deny" clippy.wildcard_dependencies = "deny" diff --git a/client/Cargo.toml b/client/Cargo.toml index c3c866b0ad2..d0cb86be9bc 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -59,7 +59,7 @@ iroha_version = { workspace = true, features = ["http"] } attohttpc = { version = "0.26.1", default-features = false } eyre = { workspace = true } -http = "0.2.9" +http = "0.2.12" url = { workspace = true } rand = { workspace = true } serde = { workspace = true, features = ["derive"] } @@ -73,7 +73,7 @@ parity-scale-codec = { workspace = true, default-features = false, features = [" tokio = { workspace = true, features = ["rt"] } tokio-tungstenite = { workspace = true } tungstenite = { workspace = true } -futures-util = "0.3.28" +futures-util = "0.3.30" merge = "0.1.0" toml = { workspace = true } nonzero_ext = { workspace = true } diff --git a/client/src/client.rs b/client/src/client.rs index dbb738c7880..2a4eed202d7 100644 --- a/client/src/client.rs +++ b/client/src/client.rs @@ -651,7 +651,7 @@ impl Client { match transaction_event.status() { TransactionStatus::Queued => {} TransactionStatus::Approved => { - block_height = transaction_event.block_height; + block_height = transaction_event.block_height(); } TransactionStatus::Rejected(reason) => { return Err((Clone::clone(&**reason)).into()); diff --git a/client/src/http.rs b/client/src/http.rs index 905c4965838..9547195da52 100644 --- a/client/src/http.rs +++ b/client/src/http.rs @@ -35,19 +35,13 @@ pub trait RequestBuilder { /// Add a single query param #[must_use] - fn param(self, key: K, value: &V) -> Self - where - K: AsRef, - V: ToString; + fn param, V: ToString + ?Sized>(self, key: K, value: &V) -> Self; /// Add multiple headers at once. Uses [`RequestBuilder::header`] for each param. #[must_use] - fn headers(mut self, headers: H) -> Self + fn headers, V: ToString>(mut self, headers: H) -> Self where - H: IntoIterator, H::Item: Borrow<(N, V)>, - N: AsRef, - V: ToString, Self: Sized, { for pair in headers { @@ -59,10 +53,7 @@ pub trait RequestBuilder { /// Add a single header #[must_use] - fn header(self, name: N, value: &V) -> Self - where - N: AsRef, - V: ToString; + fn header, V: ToString + ?Sized>(self, name: N, value: &V) -> Self; /// Set request's binary body #[must_use] diff --git a/client/src/http_default.rs b/client/src/http_default.rs index b1900898cfb..0639ed2d74c 100644 --- a/client/src/http_default.rs +++ b/client/src/http_default.rs @@ -77,21 +77,13 @@ impl RequestBuilder for DefaultRequestBuilder { } } - fn header(self, key: K, value: &V) -> Self - where - K: AsRef, - V: ToString, - { + fn header, V: ToString + ?Sized>(self, key: K, value: &V) -> Self { self.and_then(|builder| { Ok(builder.header(header_name_from_str(key.as_ref())?, value.to_string())) }) } - fn param(self, key: K, value: &V) -> Self - where - K: AsRef, - V: ToString, - { + fn param, V: ToString + ?Sized>(self, key: K, value: &V) -> Self { self.and_then(|b| Ok(b.param(key, value.to_string()))) } @@ -157,11 +149,7 @@ impl RequestBuilder for DefaultWebSocketRequestBuilder { Self(self.0.and(Err(eyre!("No params expected")))) } - fn header(self, name: N, value: &V) -> Self - where - N: AsRef, - V: ToString, - { + fn header, V: ToString + ?Sized>(self, name: N, value: &V) -> Self { self.and_then(|b| Ok(b.header(header_name_from_str(name.as_ref())?, value.to_string()))) } diff --git a/client_cli/Cargo.toml b/client_cli/Cargo.toml index e311cfa6e20..33d21b9d01d 100644 --- a/client_cli/Cargo.toml +++ b/client_cli/Cargo.toml @@ -37,4 +37,4 @@ erased-serde = "0.3.31" [build-dependencies] vergen = { version = "8.3.1", default-features = false } -color-eyre = "0.6.2" +color-eyre = "0.6.3" diff --git a/client_cli/src/main.rs b/client_cli/src/main.rs index 7a817316e57..666f6902c91 100644 --- a/client_cli/src/main.rs +++ b/client_cli/src/main.rs @@ -57,7 +57,7 @@ impl MetadataArgs { /// Should be combined with `#[command(flatten)]` attr. #[derive(clap::Args, Debug, Clone, PartialEq, Eq)] pub struct MetadataValueArg { - /// Wrapper around MetadataValue to accept possible values and fallback to json. + /// Wrapper around `MetadataValue` to accept possible values and fallback to json. /// /// The following types are supported: /// Numbers: decimal with optional point @@ -400,10 +400,10 @@ mod domain { /// Domain name as double-quited string #[arg(short, long)] pub id: DomainId, - /// Account from which to transfer (in form `name@domain_name') + /// Account from which to transfer (in form `name@domain_name`) #[arg(short, long)] pub from: AccountId, - /// Account to which to transfer (in form `name@domain_name') + /// Account to which to transfer (in form `name@domain_name`) #[arg(short, long)] pub to: AccountId, #[command(flatten)] @@ -531,7 +531,7 @@ mod account { /// Register account #[derive(clap::Args, Debug)] pub struct Register { - /// Id of account in form `name@domain_name' + /// Id of account in form `name@domain_name` #[arg(short, long)] pub id: AccountId, /// Its public key diff --git a/config/Cargo.toml b/config/Cargo.toml index fd23c7f8cad..032d64b2176 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -37,7 +37,7 @@ toml = { workspace = true } merge = "0.1.0" [dev-dependencies] -proptest = "1.3.1" +proptest = "1.4.0" stacker = "0.1.15" expect-test = { workspace = true } trybuild = { workspace = true } diff --git a/config/base/Cargo.toml b/config/base/Cargo.toml index bc61fe6c1d2..4d59b0b38ed 100644 --- a/config/base/Cargo.toml +++ b/config/base/Cargo.toml @@ -22,7 +22,7 @@ eyre = { workspace = true } serde = { workspace = true, features = ["derive"] } serde_with = { workspace = true, features = ["macros", "std"] } thiserror = { workspace = true } -num-traits = "0.2.17" +num-traits = "0.2.18" serde_json = { version = "1", optional = true } diff --git a/config/base/src/lib.rs b/config/base/src/lib.rs index d17496c6c70..c80b77c696e 100644 --- a/config/base/src/lib.rs +++ b/config/base/src/lib.rs @@ -585,6 +585,12 @@ impl<'a> Iterator for ExtendsPathsIter<'a> { mod tests { use super::*; + impl ExtendsPaths { + fn as_str_vec(&self) -> Vec<&str> { + self.iter().map(|p| p.to_str().unwrap()).collect() + } + } + #[test] fn single_missing_field() { let mut emitter: Emitter = Emitter::new(); @@ -670,12 +676,6 @@ mod tests { #[test] fn iterating_over_extends() { - impl ExtendsPaths { - fn as_str_vec(&self) -> Vec<&str> { - self.iter().map(|p| p.to_str().unwrap()).collect() - } - } - let single = ExtendsPaths::Single("single".into()); assert_eq!(single.as_str_vec(), vec!["single"]); diff --git a/configs/swarm/executor.wasm b/configs/swarm/executor.wasm index 30c512a75f5..c941553eb1e 100644 Binary files a/configs/swarm/executor.wasm and b/configs/swarm/executor.wasm differ diff --git a/core/Cargo.toml b/core/Cargo.toml index fea0db275ef..68897f6a1a6 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -64,8 +64,8 @@ parking_lot = { workspace = true, features = ["deadlock_detection"] } derive_more = { workspace = true } nonzero_ext = { workspace = true } -uuid = { version = "1.4.1", features = ["v4"] } -indexmap = "2.1.0" +uuid = { version = "1.8.0", features = ["v4"] } +indexmap = "2.2.6" [dev-dependencies] criterion = { workspace = true } diff --git a/core/src/block.rs b/core/src/block.rs index 468999e3269..a17f9e759d1 100644 --- a/core/src/block.rs +++ b/core/src/block.rs @@ -79,7 +79,7 @@ pub enum BlockValidationError { /// Error during signature verification #[derive(thiserror::Error, displaydoc::Display, Debug, Clone, Copy, PartialEq, Eq)] pub enum SignatureVerificationError { - /// The block doesn't have enough valid signatures to be committed ({votes_count} out of {min_votes_for_commit}) + /// The block doesn't have enough valid signatures to be committed (`votes_count` out of `min_votes_for_commit`) NotEnoughSignatures { /// Current number of signatures votes_count: usize, @@ -607,8 +607,7 @@ mod valid { let payload = payload(&block).clone(); key_pairs .iter() - .enumerate() - .map(|(_, key_pair)| SignatureOf::new(key_pair, &payload)) + .map(|key_pair| SignatureOf::new(key_pair, &payload)) .try_for_each(|signature| block.add_signature(signature)) .expect("Failed to add signatures"); diff --git a/core/src/kura.rs b/core/src/kura.rs index 69e1cdcbecd..ef36bbdf19e 100644 --- a/core/src/kura.rs +++ b/core/src/kura.rs @@ -811,7 +811,7 @@ pub enum Error { Codec(#[from] parity_scale_codec::Error), /// Failed to allocate buffer Alloc(#[from] std::collections::TryReserveError), - /// Tried reading block data out of bounds: {start_block_height}, {block_count} + /// Tried reading block data out of bounds: `start_block_height`, `block_count` OutOfBoundsBlockRead { /// The block height from which the read was supposed to start start_block_height: u64, diff --git a/core/src/query/store.rs b/core/src/query/store.rs index 039c2caa90d..90581752356 100644 --- a/core/src/query/store.rs +++ b/core/src/query/store.rs @@ -33,7 +33,7 @@ pub enum Error { /// Unknown cursor error. #[error(transparent)] UnknownCursor(#[from] UnknownCursor), - /// Connection with LiveQueryStore is closed. + /// Connection with `LiveQueryStore` is closed. #[error("Connection with LiveQueryStore is closed")] ConnectionClosed, /// Fetch size is too big. diff --git a/core/src/queue.rs b/core/src/queue.rs index 7c439a37887..51e3ad38a5b 100644 --- a/core/src/queue.rs +++ b/core/src/queue.rs @@ -590,10 +590,7 @@ pub mod tests { .expect("Failed to accept Transaction.") }; // Check that fully signed transaction passes signature check - assert!(matches!( - fully_signed_tx.check_signature_condition(&state_view), - true - )); + assert!(fully_signed_tx.check_signature_condition(&state_view)); let get_tx = |key_pair| { AcceptedTransaction::accept(tx.clone().sign(&key_pair), &chain_id, &tx_limits) diff --git a/core/src/smartcontracts/isi/account.rs b/core/src/smartcontracts/isi/account.rs index fd238417169..0661f8618e6 100644 --- a/core/src/smartcontracts/isi/account.rs +++ b/core/src/smartcontracts/isi/account.rs @@ -728,7 +728,7 @@ pub mod query { domain.accounts.values().filter(move |account| { let asset_id = AssetId::new(asset_definition_id.clone(), account.id().clone()); - account.assets.get(&asset_id).is_some() + account.assets.contains_key(&asset_id) }) })? .cloned(), diff --git a/core/src/smartcontracts/isi/domain.rs b/core/src/smartcontracts/isi/domain.rs index 0ac5b2d57ba..0ae2a44fde1 100644 --- a/core/src/smartcontracts/isi/domain.rs +++ b/core/src/smartcontracts/isi/domain.rs @@ -62,7 +62,7 @@ pub mod isi { } let domain = state_transaction.world.domain_mut(&account_id.domain_id)?; - if domain.accounts.get(&account_id).is_some() { + if domain.accounts.contains_key(&account_id) { return Err(RepetitionError { instruction_type: InstructionType::Register, id: IdBox::AccountId(account_id), @@ -121,7 +121,7 @@ pub mod isi { let domain = state_transaction .world .domain_mut(&asset_definition_id.domain_id)?; - if domain.asset_definitions.get(&asset_definition_id).is_some() { + if domain.asset_definitions.contains_key(&asset_definition_id) { return Err(RepetitionError { instruction_type: InstructionType::Register, id: IdBox::AssetDefinitionId(asset_definition_id), diff --git a/core/src/smartcontracts/isi/triggers/set.rs b/core/src/smartcontracts/isi/triggers/set.rs index 63d7732e92b..8c8bc729ff5 100644 --- a/core/src/smartcontracts/isi/triggers/set.rs +++ b/core/src/smartcontracts/isi/triggers/set.rs @@ -469,13 +469,13 @@ impl Set { /// Apply `f` to triggers that belong to the given [`DomainId`] /// /// Return an empty list if [`Set`] doesn't contain any triggers belonging to [`DomainId`]. - pub fn inspect_by_domain_id<'a, F: 'a, R>( + pub fn inspect_by_domain_id<'a, F, R>( &'a self, domain_id: &DomainId, f: F, ) -> impl Iterator + '_ where - F: Fn(&TriggerId, &dyn LoadedActionTrait) -> R, + F: Fn(&TriggerId, &dyn LoadedActionTrait) -> R + 'a, { let domain_id = domain_id.clone(); diff --git a/core/src/smartcontracts/isi/world.rs b/core/src/smartcontracts/isi/world.rs index 27ef3abdc0c..30af4f45561 100644 --- a/core/src/smartcontracts/isi/world.rs +++ b/core/src/smartcontracts/isi/world.rs @@ -126,9 +126,9 @@ pub mod isi { .collect::>(); let world = &mut state_transaction.world; - triggers_in_domain.iter().for_each(|trigger_id| { + for trigger_id in &triggers_in_domain { assert!(world.triggers.remove(trigger_id)); - }); + } if world.domains.remove(domain_id.clone()).is_none() { return Err(FindError::Domain(domain_id).into()); } diff --git a/core/src/snapshot.rs b/core/src/snapshot.rs index f88a69d6dcf..c2b5f331be0 100644 --- a/core/src/snapshot.rs +++ b/core/src/snapshot.rs @@ -216,14 +216,14 @@ pub enum TryReadError { IO(#[source] std::io::Error, PathBuf), /// Error (de)serializing state snapshot Serialization(#[from] serde_json::Error), - /// Snapshot is in a non-consistent state. Snapshot has greater height ({snapshot_height}) than kura block store ({kura_height}) + /// Snapshot is in a non-consistent state. Snapshot has greater height (`snapshot_height`) than kura block store (`kura_height`) MismatchedHeight { /// The amount of block hashes stored by snapshot snapshot_height: usize, /// The amount of blocks stored by [`Kura`] kura_height: usize, }, - /// Snapshot is in a non-consistent state. Hash of the block at height {height} is different between snapshot ({snapshot_block_hash}) and kura ({kura_block_hash}) + /// Snapshot is in a non-consistent state. Hash of the block at height `height` is different between snapshot (`snapshot_block_hash`) and kura (`kura_block_hash`) MismatchedHash { /// Height at which block hashes differs between snapshot and [`Kura`] height: usize, diff --git a/core/test_network/Cargo.toml b/core/test_network/Cargo.toml index 22cbae6888a..71e24f95f18 100644 --- a/core/test_network/Cargo.toml +++ b/core/test_network/Cargo.toml @@ -25,5 +25,5 @@ rand = { workspace = true } tempfile = { workspace = true } tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros"] } unique_port = "0.2.1" -parity-scale-codec = { version = "3.6.5", default-features = false } +parity-scale-codec = { version = "3.6.9", default-features = false } serde_json = { workspace = true } diff --git a/core/test_network/src/lib.rs b/core/test_network/src/lib.rs index 2c966af2b23..1816fdff7d3 100644 --- a/core/test_network/src/lib.rs +++ b/core/test_network/src/lib.rs @@ -33,9 +33,6 @@ use tokio::{ }; pub use unique_port; -#[derive(Debug, Clone, Copy)] -struct ShutdownRuntime; - /// Network of peers pub struct Network { /// Genesis peer which sends genesis block to everyone diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml index 19c9629cdfd..1217613a56b 100644 --- a/crypto/Cargo.toml +++ b/crypto/Cargo.toml @@ -56,33 +56,33 @@ serde_with = { workspace = true, features = ["macros", "hex"] } hex = { workspace = true, features = ["alloc", "serde"] } getset = { workspace = true } -thiserror = { version = "1.0.50", optional = true } +thiserror = { version = "1.0.58", optional = true } displaydoc = { version = "0.2.4", default-features = false } digest = { version = "0.10.7", default-features = false, features = ["alloc"] } blake2 = { version = "0.10.6", default-features = false } sha2 = { version = "0.10.8", default-features = false } -hkdf = { version = "0.12.3", default-features = false } +hkdf = { version = "0.12.4", default-features = false } w3f-bls = { version = "0.1.3", default-features = false } -signature = { version = "2.1.0", default-features = false, features = ["alloc"] } -ed25519-dalek = { version = "2.1.0", default-features = false, features = ["alloc", "rand_core", "zeroize"] } -curve25519-dalek = { version = "4.1.1", default-features = false } -x25519-dalek = { version = "2.0.0", default-features = false, features = ["static_secrets"] } +signature = { version = "2.2.0", default-features = false, features = ["alloc"] } +ed25519-dalek = { version = "2.1.1", default-features = false, features = ["alloc", "rand_core", "zeroize"] } +curve25519-dalek = { version = "4.1.2", default-features = false } +x25519-dalek = { version = "2.0.1", default-features = false, features = ["static_secrets"] } rand = { workspace = true, default-features = false, features = ["std_rng", "alloc"] } rand_core = { version = "0.6.4", default-features = false, features = ["alloc"] } rand_chacha = { version = "0.3.1", default-features = false } -zeroize = { version = "1.6.0", default-features = false } +zeroize = { version = "1.7.0", default-features = false } arrayref = { version = "0.3.7", default-features = false } aead = { version = "0.5.2", default-features = false, features = ["alloc"] } chacha20poly1305 = { version = "0.10.1", default-features = false } -elliptic-curve = { version = "0.13.6", default-features = false } -k256 = { version = "0.13.1", default-features = false, features = ["alloc", "ecdsa", "sha256"] } +elliptic-curve = { version = "0.13.8", default-features = false } +k256 = { version = "0.13.3", default-features = false, features = ["alloc", "ecdsa", "sha256"] } [dev-dependencies] hex-literal = { workspace = true } @@ -91,6 +91,6 @@ serde_json = { workspace = true, features = ["std"] } # these crypto libraries are not used to implement actual crypto algorithms # but to test some of the primitives against them amcl = { version = "0.2.0", default-features = false, features = ["secp256k1"] } -secp256k1 = { version = "0.28.0", features = ["rand", "serde"] } -libsodium-sys-stable = "1.20.3" -openssl = { version = "0.10.59", features = ["vendored"] } +secp256k1 = { version = "0.28.2", features = ["rand", "serde"] } +libsodium-sys-stable = "1.20.5" +openssl = { version = "0.10.64", features = ["vendored"] } diff --git a/crypto/src/hash.rs b/crypto/src/hash.rs index 0351c9d71c1..a122ca05fd5 100644 --- a/crypto/src/hash.rs +++ b/crypto/src/hash.rs @@ -95,7 +95,7 @@ impl AsRef<[u8; Hash::LENGTH]> for Hash { #[allow(unsafe_code, trivial_casts)] // SAFETY: `Hash` and `[u8; Hash::LENGTH]` have the same memory layout unsafe { - &*((self as *const Self).cast::<[u8; Self::LENGTH]>()) + &*(core::ptr::from_ref(self).cast::<[u8; Self::LENGTH]>()) } } } diff --git a/crypto/src/multihash.rs b/crypto/src/multihash.rs index a7400063f00..7e6dbdc81b0 100644 --- a/crypto/src/multihash.rs +++ b/crypto/src/multihash.rs @@ -27,17 +27,17 @@ pub const BLS12_381_G2_PUB: &str = "bls12_381-g2-pub"; #[repr(u64)] #[derive(Debug, Display, Clone, Copy, PartialEq, Eq, Default)] pub enum DigestFunction { - /// Ed25519 + /// `Ed25519` #[display(fmt = "{ED_25519_PUB_STR}")] #[default] Ed25519Pub = 0xed, - /// Secp256k1 + /// `Secp256k1` #[display(fmt = "{SECP_256_K1_PUB_STR}")] Secp256k1Pub = 0xe7, - /// Bls12381G1 + /// `Bls12381G1` #[display(fmt = "{BLS12_381_G1_PUB}")] Bls12381G1Pub = 0xea, - /// Bls12381G2 + /// `Bls12381G2` #[display(fmt = "{BLS12_381_G2_PUB}")] Bls12381G2Pub = 0xeb, } diff --git a/data_model/src/block.rs b/data_model/src/block.rs index ab92e076a3f..25e7d882ea1 100644 --- a/data_model/src/block.rs +++ b/data_model/src/block.rs @@ -37,8 +37,8 @@ mod model { Eq, PartialOrd, Ord, - Getters, CopyGetters, + Getters, Decode, Encode, Deserialize, diff --git a/data_model/src/events/pipeline.rs b/data_model/src/events/pipeline.rs index 2e6c8c08dae..2b7bba7f745 100644 --- a/data_model/src/events/pipeline.rs +++ b/data_model/src/events/pipeline.rs @@ -18,7 +18,7 @@ use crate::{ #[model] mod model { - use getset::Getters; + use getset::{CopyGetters, Getters}; use super::*; @@ -71,6 +71,7 @@ mod model { Eq, PartialOrd, Ord, + CopyGetters, Getters, Decode, Encode, @@ -169,6 +170,7 @@ mod model { PartialOrd, Ord, Default, + CopyGetters, Getters, Decode, Encode, @@ -203,7 +205,6 @@ mod model { pub struct TransactionEventFilter { #[getset(get = "pub")] pub hash: Option>, - #[getset(get_copy = "pub")] pub block_height: Option>, #[getset(get = "pub")] pub status: Option, @@ -266,6 +267,12 @@ impl TransactionEventFilter { self.status = Some(status); self } + + /// Block height + // TODO: Derive with getset + pub fn block_height(&self) -> Option> { + self.block_height + } } #[cfg(feature = "transparent_api")] diff --git a/data_model/src/ipfs.rs b/data_model/src/ipfs.rs index 46f57cad0ad..635900ba5c2 100644 --- a/data_model/src/ipfs.rs +++ b/data_model/src/ipfs.rs @@ -107,6 +107,9 @@ impl Decode for IpfsPath { #[cfg(test)] mod tests { + #[cfg(not(feature = "std"))] + use alloc::string::ToString as _; + use parity_scale_codec::DecodeAll as _; use super::*; diff --git a/data_model/src/name.rs b/data_model/src/name.rs index e4370fac05b..e9b5f86221e 100644 --- a/data_model/src/name.rs +++ b/data_model/src/name.rs @@ -149,6 +149,9 @@ pub mod prelude { #[cfg(test)] mod tests { + #[cfg(not(feature = "std"))] + use alloc::borrow::ToOwned as _; + use parity_scale_codec::DecodeAll; use super::*; diff --git a/data_model/src/transaction.rs b/data_model/src/transaction.rs index 46653ffa88a..0a541f70d04 100644 --- a/data_model/src/transaction.rs +++ b/data_model/src/transaction.rs @@ -12,8 +12,6 @@ use derive_more::{DebugCustom, Display}; use iroha_crypto::SignaturesOf; use iroha_data_model_derive::model; use iroha_macro::FromVariant; -#[cfg(feature = "std")] -use iroha_primitives::time::TimeSource; use iroha_schema::IntoSchema; use iroha_version::{declare_versioned, version}; use parity_scale_codec::{Decode, Encode}; @@ -650,7 +648,7 @@ mod http { pub fn new_with_time_source( chain_id: ChainId, authority: AccountId, - time_source: &TimeSource, + time_source: &iroha_primitives::time::TimeSource, ) -> Self { let creation_time_ms = time_source .get_unix_time() diff --git a/ffi/derive/src/attr_parse/getset.rs b/ffi/derive/src/attr_parse/getset.rs index 821389b2fed..083adf5957d 100644 --- a/ffi/derive/src/attr_parse/getset.rs +++ b/ffi/derive/src/attr_parse/getset.rs @@ -312,7 +312,7 @@ impl GetSetFieldAttrs { Entry::Occupied(mut o) => { let o = o.get_mut(); // visibility is overwritten, while the "with_prefix" is merged - o.visibility = options.visibility.clone(); + o.visibility.clone_from(&options.visibility); o.with_prefix |= options.with_prefix; } Entry::Vacant(v) => { diff --git a/ffi/derive/src/convert.rs b/ffi/derive/src/convert.rs index e3be05e1d25..1b5118d9cb3 100644 --- a/ffi/derive/src/convert.rs +++ b/ffi/derive/src/convert.rs @@ -170,13 +170,12 @@ pub struct FfiTypeInput { pub ident: syn::Ident, pub generics: syn::Generics, pub data: FfiTypeData, - pub doc_attrs: DocAttrs, pub derive_attr: DeriveAttrs, pub repr_attr: Repr, pub ffi_type_attr: FfiTypeAttr, pub getset_attr: GetSetStructAttrs, pub span: Span, - /// The original DeriveInput this structure was parsed from + /// The original `DeriveInput` this structure was parsed from pub ast: syn::DeriveInput, } @@ -193,7 +192,6 @@ impl darling::FromDeriveInput for FfiTypeInput { let ident = input.ident.clone(); let generics = input.generics.clone(); let data = darling::ast::Data::try_from(&input.data)?; - let doc_attrs = DocAttrs::from_attributes(&input.attrs)?; let derive_attr = DeriveAttrs::from_attributes(&input.attrs)?; let repr_attr = Repr::from_attributes(&input.attrs)?; let ffi_type_attr = FfiTypeAttr::from_attributes(&input.attrs)?; @@ -205,7 +203,6 @@ impl darling::FromDeriveInput for FfiTypeInput { ident, generics, data, - doc_attrs, derive_attr, repr_attr, ffi_type_attr, diff --git a/ffi/src/lib.rs b/ffi/src/lib.rs index 8467a87c981..d04d87c7a48 100644 --- a/ffi/src/lib.rs +++ b/ffi/src/lib.rs @@ -644,6 +644,7 @@ macro_rules! impl_tuple { // NOTE: This is a trick to index tuples ( @decl_priv_out_ptr $( $ty:ident ),+ $(,)? ) => { mod private_out_ptr { + #[allow(dead_code)] pub struct OutPtr<'itm, $($ty: $crate::FfiOutPtrWrite),+> { $(pub $ty: &'itm mut core::mem::MaybeUninit::<$ty::OutPtr>),+ } diff --git a/ffi/src/repr_c.rs b/ffi/src/repr_c.rs index 2a88e9657d6..7421c12cb7b 100644 --- a/ffi/src/repr_c.rs +++ b/ffi/src/repr_c.rs @@ -1049,7 +1049,7 @@ impl<'slice, R: Clone> CTypeConvert<'slice, &'slice [Opaque], RefSlice<*const R> type FfiStore = Box<[R]>; fn into_repr_c(self, store: &mut Self::RustStore) -> RefSlice<*const R> { - *store = self.iter().map(|item| item as *const R).collect(); + *store = self.iter().map(core::ptr::from_ref).collect(); RefSlice::from_slice(Some(store)) } @@ -1096,8 +1096,7 @@ impl<'slice, R: Clone> CTypeConvert<'slice, &mut [Opaque], RefMutSlice<*mut R>> type FfiStore = Box<[R]>; fn into_repr_c(self, store: &mut Self::RustStore) -> RefMutSlice<*mut R> { - *store = self.iter_mut().map(|item| item as *mut R).collect(); - + *store = self.iter_mut().map(core::ptr::from_mut).collect(); RefMutSlice::from_slice(Some(store)) } diff --git a/ffi/tests/ffi_import_opaque.rs b/ffi/tests/ffi_import_opaque.rs index 6b1be273f54..2d381c3ab2a 100644 --- a/ffi/tests/ffi_import_opaque.rs +++ b/ffi/tests/ffi_import_opaque.rs @@ -133,8 +133,8 @@ fn fallible_output() { #[allow(trivial_casts)] fn compare_opaque_eq(opaque1: &T, opaque2: &T) { unsafe { - let opaque1: &*const U = &*(opaque1 as *const T).cast::<*const U>(); - let opaque2: &*const U = &*(opaque2 as *const T).cast::<*const U>(); + let opaque1: &*const U = &*(core::ptr::from_ref(opaque1)).cast::<*const U>(); + let opaque2: &*const U = &*(core::ptr::from_ref(opaque2)).cast::<*const U>(); assert_eq!(**opaque1, **opaque2) } diff --git a/futures/Cargo.toml b/futures/Cargo.toml index 9ac3a719bfa..21058ecbc9d 100644 --- a/futures/Cargo.toml +++ b/futures/Cargo.toml @@ -26,4 +26,4 @@ serde = { workspace = true, features = ["derive"] } tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros"] } [dev-dependencies] -tokio-stream = "0.1.14" +tokio-stream = "0.1.15" diff --git a/logger/Cargo.toml b/logger/Cargo.toml index fa0d977f260..2457e70acbd 100644 --- a/logger/Cargo.toml +++ b/logger/Cargo.toml @@ -17,7 +17,7 @@ iroha_data_model = { workspace = true } color-eyre = { workspace = true } serde_json = { workspace = true } tracing = { workspace = true } -tracing-core = "0.1.31" +tracing-core = "0.1.32" tracing-futures = { version = "0.2.5", default-features = false, features = ["std-future", "std"] } tracing-subscriber = { workspace = true, features = ["fmt", "ansi", "json"] } tokio = { workspace = true, features = ["sync", "rt", "macros"] } diff --git a/macro/derive/src/lib.rs b/macro/derive/src/lib.rs index 942d4faa316..1024a99f251 100644 --- a/macro/derive/src/lib.rs +++ b/macro/derive/src/lib.rs @@ -279,7 +279,7 @@ fn try_into_variant_single( impl #impl_generics core::convert::TryFrom<#enum_ty #ty_generics> for #variant_ty #where_clause { type Error = ::iroha_macro::error::ErrorTryFromEnum<#enum_ty #ty_generics, Self>; - fn try_from(origin: #enum_ty #ty_generics) -> core::result::Result { + fn try_from(origin: #enum_ty #ty_generics) -> core::result::Result> { let #enum_ty :: #variant(variant) = origin; Ok(variant) } @@ -300,7 +300,7 @@ fn try_into_variant( impl #impl_generics core::convert::TryFrom<#enum_ty #ty_generics> for #variant_ty #where_clause { type Error = ::iroha_macro::error::ErrorTryFromEnum<#enum_ty #ty_generics, Self>; - fn try_from(origin: #enum_ty #ty_generics) -> core::result::Result { + fn try_from(origin: #enum_ty #ty_generics) -> core::result::Result> { if let #enum_ty :: #variant(variant) = origin { Ok(variant) } else { diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index b7c6d0687d7..14f6c12e6f8 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -37,7 +37,7 @@ parity-scale-codec = { workspace = true, features = ["derive"] } derive_more = { workspace = true, features = ["display", "from", "as_ref", "as_mut", "deref", "constructor", "into_iterator"] } serde = { workspace = true, features = ["derive"] } serde_with = { workspace = true, features = ["macros"] } -smallvec = { version = "1.11.1", default-features = false, features = ["serde", "union"] } +smallvec = { version = "1.13.2", default-features = false, features = ["serde", "union"] } smallstr = { version = "0.3.0", default-features = false, features = ["serde", "union"] } thiserror = { workspace = true, optional = true } displaydoc = { workspace = true } diff --git a/primitives/numeric/Cargo.toml b/primitives/numeric/Cargo.toml index e22e7922b39..132afe69a59 100644 --- a/primitives/numeric/Cargo.toml +++ b/primitives/numeric/Cargo.toml @@ -37,7 +37,7 @@ serde_with = { workspace = true, features = ["macros"] } thiserror = { workspace = true, optional = true } displaydoc = { workspace = true } -rust_decimal = { version = "1.34", default-features = false, features = ["serde", "serde-with-str"] } +rust_decimal = { version = "1.35", default-features = false, features = ["serde", "serde-with-str"] } [dev-dependencies] -serde_json = { workspace = true, features = ["alloc"] } \ No newline at end of file +serde_json = { workspace = true, features = ["alloc"] } diff --git a/smart_contract/executor/derive/src/validate.rs b/smart_contract/executor/derive/src/validate.rs index 130ee7cd4fa..a577087cf83 100644 --- a/smart_contract/executor/derive/src/validate.rs +++ b/smart_contract/executor/derive/src/validate.rs @@ -184,23 +184,19 @@ enum IsiName { Revoke, } -impl ToString for IsiName { - fn to_string(&self) -> String { +impl core::fmt::Display for IsiName { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { match self { - IsiName::Grant => "grant", - IsiName::Revoke => "revoke", + IsiName::Grant => write!(f, "grant"), + IsiName::Revoke => write!(f, "revoke"), } - .to_string() } } fn gen_validate_impl(isi_name: IsiName, pass_condition: &Type) -> proc_macro2::TokenStream { use quote::ToTokens; - let fn_name = Ident::new( - &format!("validate_{}", isi_name.to_string()), - Span::call_site(), - ); + let fn_name = Ident::new(&format!("validate_{isi_name}"), Span::call_site()); let doc_intro = match isi_name { IsiName::Grant => { diff --git a/smart_contract/src/lib.rs b/smart_contract/src/lib.rs index 64563291dd7..b97c3800336 100644 --- a/smart_contract/src/lib.rs +++ b/smart_contract/src/lib.rs @@ -465,7 +465,7 @@ mod tests { #[derive(Decode)] enum QueryRequest { Query(QueryWithParameters), - Cursor(#[allow(unused_tuple_struct_fields)] ForwardCursor), + Cursor(#[allow(dead_code)] ForwardCursor), } #[derive(Decode)] diff --git a/telemetry/Cargo.toml b/telemetry/Cargo.toml index e1fb573541b..8cc76ece1d4 100644 --- a/telemetry/Cargo.toml +++ b/telemetry/Cargo.toml @@ -24,7 +24,7 @@ iroha_futures = { workspace = true, features = ["telemetry"] } iroha_telemetry_derive = { workspace = true } async-trait = { workspace = true } -chrono = "0.4.31" +chrono = "0.4.38" eyre = { workspace = true } futures = { workspace = true, features = ["std", "async-await"] } serde_json = { workspace = true } diff --git a/tools/parity_scale_decoder/Cargo.toml b/tools/parity_scale_decoder/Cargo.toml index 909795cff49..dad49471364 100644 --- a/tools/parity_scale_decoder/Cargo.toml +++ b/tools/parity_scale_decoder/Cargo.toml @@ -27,7 +27,7 @@ iroha_genesis = { workspace = true } clap = { workspace = true, features = ["derive", "cargo"] } eyre = { workspace = true } parity-scale-codec = { workspace = true } -colored = "2.0.4" +colored = "2.1.0" [build-dependencies] iroha_data_model = { workspace = true } diff --git a/tools/swarm/src/cli.rs b/tools/swarm/src/cli.rs index e72a247ebce..178824f3cdc 100644 --- a/tools/swarm/src/cli.rs +++ b/tools/swarm/src/cli.rs @@ -15,7 +15,7 @@ pub struct Cli { /// The health checks use predefined settings. /// /// For more details on health check configurations in Docker Compose files, visit: - /// https://docs.docker.com/compose/compose-file/compose-file-v3/#healthcheck + /// #[arg(long)] pub health_check: bool, /// Re-create the target file if it already exists. diff --git a/tools/wasm_test_runner/Cargo.toml b/tools/wasm_test_runner/Cargo.toml index 682ad1ccce1..fc53963d1ac 100644 --- a/tools/wasm_test_runner/Cargo.toml +++ b/tools/wasm_test_runner/Cargo.toml @@ -13,4 +13,4 @@ workspace = true [dependencies] wasmtime = { workspace = true } -anyhow = "1.0.75" +anyhow = "1.0.82" diff --git a/torii/src/routing.rs b/torii/src/routing.rs index a03c6fac676..e071a8916ef 100644 --- a/torii/src/routing.rs +++ b/torii/src/routing.rs @@ -214,7 +214,7 @@ pub mod subscription { Consumer(#[from] Box), /// Event reception error Event(#[from] tokio::sync::broadcast::error::RecvError), - /// WebSocket error + /// `WebSocket` error WebSocket(#[from] warp::Error), /// A `Close` message is received. Not strictly an Error CloseMessage, diff --git a/torii/src/stream.rs b/torii/src/stream.rs index b776907260c..7c34599c977 100644 --- a/torii/src/stream.rs +++ b/torii/src/stream.rs @@ -26,7 +26,7 @@ where SendTimeout, /// An empty message was received NoMessage, - /// Error in internal stream representation (typically WebSocket) + /// Error in internal stream representation (typically `WebSocket`) /// /// Made without `from` macro because it will break `IrohaVersion` variant conversion InternalStream(#[source] InternalStreamError), diff --git a/wasm_builder/Cargo.toml b/wasm_builder/Cargo.toml index 00434bd7c2c..90d70c615a5 100644 --- a/wasm_builder/Cargo.toml +++ b/wasm_builder/Cargo.toml @@ -14,6 +14,6 @@ workspace = true [dependencies] eyre = { workspace = true } serde_json = { workspace = true, features = ["std"] } -sha256 = "1.4.0" +sha256 = "1.5.0" path-absolutize = { workspace = true } -wasm-opt = "0.116.0" +wasm-opt = "0.116.1"