diff --git a/Cargo.lock b/Cargo.lock index 78120280a65e2..8717747317f0e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -42,7 +42,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -51,18 +51,18 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "rand_core 0.6.4", ] [[package]] name = "aead" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c192eb8f11fc081b0fe4259ba5af04217d4e0faddd02417310a927911abd7c8" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ "crypto-common", - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -95,7 +95,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" dependencies = [ "cfg-if", - "cipher 0.4.3", + "cipher 0.4.4", "cpufeatures", ] @@ -119,9 +119,9 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c" dependencies = [ - "aead 0.5.1", + "aead 0.5.2", "aes 0.8.2", - "cipher 0.4.3", + "cipher 0.4.4", "ctr 0.9.2", "ghash 0.5.0", "subtle", @@ -153,7 +153,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", "once_cell", "version_check", ] @@ -165,7 +165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if", - "getrandom 0.2.8", + "getrandom 0.2.9", "once_cell", "version_check", ] @@ -203,17 +203,60 @@ dependencies = [ "winapi", ] +[[package]] +name = "anstream" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + [[package]] name = "anstyle" -version = "0.3.5" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] [[package]] name = "anyhow" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" [[package]] name = "approx" @@ -417,6 +460,16 @@ dependencies = [ "tracing-subscriber 0.2.25", ] +[[package]] +name = "ark-scale" +version = "0.0.2" +source = "git+https://github.com/w3f/ark-scale#ded339ee875fbb8901d89ab3ea6f1e0ccde2f842" +dependencies = [ + "ark-serialize", + "ark-std", + "parity-scale-codec", +] + [[package]] name = "ark-serialize" version = "0.4.2" @@ -458,9 +511,9 @@ checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -492,9 +545,9 @@ dependencies = [ [[package]] name = "asn1-rs" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" dependencies = [ "asn1-rs-derive 0.4.0", "asn1-rs-impl", @@ -543,20 +596,20 @@ dependencies = [ [[package]] name = "asn1_der" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" +checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247" [[package]] name = "assert_cmd" -version = "2.0.10" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0b2340f55d9661d76793b2bfc2eb0e62689bd79d067a95707ea762afd5e9dd" +checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" dependencies = [ "anstyle", "bstr", "doc-comment", - "predicates 3.0.2", + "predicates 3.0.3", "predicates-core", "predicates-tree", "wait-timeout", @@ -581,39 +634,38 @@ dependencies = [ [[package]] name = "async-io" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock", "autocfg", + "cfg-if", "concurrent-queue", "futures-lite", - "libc", "log", "parking", "polling", + "rustix 0.37.12", "slab", "socket2", "waker-fn", - "windows-sys 0.42.0", ] [[package]] name = "async-lock" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" dependencies = [ "event-listener", - "futures-lite", ] [[package]] name = "async-stream" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad445822218ce64be7a341abfb0b1ea43b5c23aa83902542a4542e78309d8e5e" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" dependencies = [ "async-stream-impl", "futures-core", @@ -622,24 +674,24 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "async-trait" -version = "0.1.64" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -657,9 +709,9 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" [[package]] name = "atty" @@ -731,9 +783,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "basic-toml" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e819b667739967cd44d308b8c7b71305d8bb0729ac44a248aa08f33d01950b4" +checksum = "5c0de75129aa8d0cceaf750b89013f0e08804d6ec61416da787b35ad0d7cddf1" dependencies = [ "serde", ] @@ -868,7 +920,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -877,7 +929,7 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -925,9 +977,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bstr" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" +checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" dependencies = [ "memchr", "once_cell", @@ -964,9 +1016,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" [[package]] name = "byteorder" @@ -993,9 +1045,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6031a462f977dd38968b6f23378356512feeace69cef817e1a4475108093cec3" +checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" dependencies = [ "serde", ] @@ -1011,13 +1063,13 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.15.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a1ec454bc3eead8719cb56e15dbbfecdbc14e4b3a3ae4936cc6e31f5fc0d07" +checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.16", + "semver 1.0.17", "serde", "serde_json", "thiserror", @@ -1109,7 +1161,7 @@ name = "chain-spec-builder" version = "2.0.0" dependencies = [ "ansi_term", - "clap 4.1.8", + "clap 4.2.3", "node-cli", "rand 0.8.5", "sc-chain-spec", @@ -1120,9 +1172,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ "iana-time-zone", "js-sys", @@ -1179,7 +1231,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -1188,14 +1240,14 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] name = "cipher" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common", "inout", @@ -1212,9 +1264,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -1235,39 +1287,47 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.8" +version = "4.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5" +checksum = "49f9152d70e42172fdb87de2efd7327160beee37886027cf86f30a233d5b30b4" dependencies = [ - "bitflags", + "clap_builder", "clap_derive", - "clap_lex 0.3.2", - "is-terminal", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e067b220911598876eb55d52725ddcc201ffe3f0904018195973bc5b012ea2ca" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex 0.4.1", "strsim", - "termcolor", ] [[package]] name = "clap_complete" -version = "4.1.4" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501ff0a401473ea1d4c3b125ff95506b62c5bc5768d818634195fbb7c4ad5ff4" +checksum = "01c22dcfb410883764b29953103d9ef7bb8fe21b3fa1158bc99986c2067294bd" dependencies = [ - "clap 4.1.8", + "clap 4.2.3", ] [[package]] name = "clap_derive" -version = "4.1.8" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -1281,12 +1341,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.3.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09" -dependencies = [ - "os_str_bytes", -] +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "codespan-reporting" @@ -1298,6 +1355,12 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "comfy-table" version = "6.1.4" @@ -1311,9 +1374,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" dependencies = [ "crossbeam-utils", ] @@ -1326,9 +1389,9 @@ checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" [[package]] name = "constant_time_eq" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" +checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" [[package]] name = "core-foundation" @@ -1342,9 +1405,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "core2" @@ -1366,9 +1429,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" dependencies = [ "libc", ] @@ -1536,9 +1599,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1589,7 +1652,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "rand_core 0.6.4", "subtle", "zeroize", @@ -1601,7 +1664,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "rand_core 0.6.4", "subtle", "zeroize", @@ -1613,7 +1676,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "rand_core 0.6.4", "typenum", ] @@ -1624,7 +1687,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "subtle", ] @@ -1653,7 +1716,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cipher 0.4.3", + "cipher 0.4.4", ] [[package]] @@ -1698,9 +1761,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.91" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" dependencies = [ "cc", "cxxbridge-flags", @@ -1710,9 +1773,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.91" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" dependencies = [ "cc", "codespan-reporting", @@ -1720,31 +1783,31 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "cxxbridge-flags" -version = "1.0.91" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" [[package]] name = "cxxbridge-macro" -version = "1.0.91" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "darling" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ "darling_core", "darling_macro", @@ -1752,9 +1815,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", @@ -1766,9 +1829,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core", "quote", @@ -1814,9 +1877,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc906908ea6458456e5eaa160a9c08543ec3d1e6f71e2235cedd660cb65f9df0" +checksum = "82b10af9f9f9f2134a42d3f8aa74658660f2e0234b0eb81bd171df8aa32779ed" dependencies = [ "const-oid", "zeroize", @@ -1838,11 +1901,11 @@ dependencies = [ [[package]] name = "der-parser" -version = "8.1.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" dependencies = [ - "asn1-rs 0.5.1", + "asn1-rs 0.5.2", "displaydoc", "nom", "num-bigint", @@ -1941,7 +2004,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -1951,6 +2014,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.4", + "const-oid", "crypto-common", "subtle", ] @@ -2033,9 +2097,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00704156a7de8df8da0911424e30c2049957b0a714542a44e05fe693dd85313" +checksum = "65d09067bfacaa79114679b279d7f5885b53295b1e2cfb4e79c8e4bd3d633169" [[package]] name = "dyn-clonable" @@ -2078,14 +2142,15 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.16.1" +version = "0.16.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1b0a1222f8072619e8a6b667a854020a03d363738303203c09468b3424a420a" +checksum = "a48e5d537b8a30c0b023116d981b16334be1485af7ca68db3a2b7024cbc957fd" dependencies = [ - "der 0.7.1", - "elliptic-curve 0.13.2", + "der 0.7.3", + "digest 0.10.6", + "elliptic-curve 0.13.4", "rfc6979 0.4.0", - "signature 2.0.0", + "signature 2.1.0", ] [[package]] @@ -2142,7 +2207,7 @@ dependencies = [ "der 0.6.1", "digest 0.10.6", "ff 0.12.1", - "generic-array 0.14.6", + "generic-array 0.14.7", "group 0.12.1", "hkdf", "pem-rfc7468", @@ -2155,19 +2220,19 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.13.2" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea5a92946e8614bb585254898bb7dd1ddad241ace60c52149e3765e34cc039d" +checksum = "75c71eaa367f2e5d556414a8eea812bc62985c879748d6403edabd9cb03f16e7" dependencies = [ "base16ct 0.2.0", "crypto-bigint 0.5.1", "digest 0.10.6", "ff 0.13.0", - "generic-array 0.14.6", + "generic-array 0.14.7", "group 0.13.0", - "pkcs8 0.10.1", + "pkcs8 0.10.2", "rand_core 0.6.4", - "sec1 0.7.1", + "sec1 0.7.2", "subtle", "zeroize", ] @@ -2186,22 +2251,22 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.5" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb" +checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" dependencies = [ "enumflags2_derive", ] [[package]] name = "enumflags2_derive" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" +checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -2249,13 +2314,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -2348,9 +2413,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.1.17" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90" +checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "file-per-thread-logger" @@ -2364,14 +2429,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ "cfg-if", "libc", "redox_syscall 0.2.16", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -2501,7 +2566,7 @@ dependencies = [ "Inflector", "array-bytes", "chrono", - "clap 4.1.8", + "clap 4.2.3", "comfy-table", "frame-benchmarking", "frame-support", @@ -2566,7 +2631,7 @@ dependencies = [ "quote", "scale-info", "sp-arithmetic", - "syn 2.0.14", + "syn 2.0.15", "trybuild", ] @@ -2592,7 +2657,7 @@ dependencies = [ name = "frame-election-solution-type-fuzzer" version = "2.0.0-alpha.5" dependencies = [ - "clap 4.1.8", + "clap 4.2.3", "frame-election-provider-solution-type", "frame-election-provider-support", "frame-support", @@ -2704,7 +2769,7 @@ dependencies = [ "proc-macro-warning", "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.15", ] [[package]] @@ -2715,7 +2780,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.15", ] [[package]] @@ -2724,7 +2789,7 @@ version = "3.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.15", ] [[package]] @@ -2918,9 +2983,9 @@ checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ "fastrand", "futures-core", @@ -2939,7 +3004,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.15", ] [[package]] @@ -3022,9 +3087,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -3054,9 +3119,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", "js-sys", @@ -3158,9 +3223,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.16" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" +checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" dependencies = [ "bytes", "fnv", @@ -3363,9 +3428,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.24" +version = "0.14.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" dependencies = [ "bytes", "futures-channel", @@ -3402,16 +3467,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows 0.48.0", ] [[package]] @@ -3463,9 +3528,9 @@ dependencies = [ [[package]] name = "if-watch" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba7abdbb86e485125dad06c2691e1e393bf3b08c7b743b43aa162a00fd39062e" +checksum = "a9465340214b296cd17a0009acdb890d6160010b8adf8f78a00d0d7ab270f79f" dependencies = [ "async-io", "core-foundation", @@ -3477,7 +3542,7 @@ dependencies = [ "rtnetlink", "system-configuration", "tokio", - "windows", + "windows 0.34.0", ] [[package]] @@ -3511,9 +3576,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", @@ -3532,7 +3597,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -3580,12 +3645,13 @@ checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" [[package]] name = "io-lifetimes" -version = "1.0.5" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ + "hermit-abi 0.3.1", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -3608,20 +3674,20 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" [[package]] name = "is-terminal" -version = "0.4.4" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", - "io-lifetimes 1.0.5", - "rustix 0.36.8", - "windows-sys 0.45.0", + "io-lifetimes 1.0.10", + "rustix 0.37.12", + "windows-sys 0.48.0", ] [[package]] @@ -3635,9 +3701,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jobserver" @@ -3783,13 +3849,13 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955890845095ccf31ef83ad41a05aabb4d8cc23dc3cac5a9f5c89cf26dd0da75" +checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" dependencies = [ "cfg-if", - "ecdsa 0.16.1", - "elliptic-curve 0.13.2", + "ecdsa 0.16.6", + "elliptic-curve 0.13.4", "once_cell", "sha2 0.10.6", ] @@ -3969,9 +4035,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.140" +version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] name = "libgit2-sys" @@ -4009,14 +4075,14 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "libp2p" -version = "0.50.0" +version = "0.50.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e0a0d2f693675f49ded13c5d510c48b78069e23cbd9108d7ccd59f6dc568819" +checksum = "9c7b0104790be871edcf97db9bd2356604984e623a08d825c3f27852290266b8" dependencies = [ "bytes", "futures", "futures-timer", - "getrandom 0.2.8", + "getrandom 0.2.9", "instant", "libp2p-core 0.38.0", "libp2p-dns", @@ -4025,7 +4091,7 @@ dependencies = [ "libp2p-mdns", "libp2p-metrics", "libp2p-mplex", - "libp2p-noise 0.41.0", + "libp2p-noise", "libp2p-ping", "libp2p-quic", "libp2p-request-response", @@ -4077,36 +4143,30 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.39.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881d9a54e97d97cdaa4125d48269d97ca8c40e5fefec6b85b30440dc60cc551f" +checksum = "9b7f8b7d65c070a5a1b5f8f0510648189da08f787b8963f8e21219e0710733af" dependencies = [ - "asn1_der", - "bs58", - "ed25519-dalek", "either", "fnv", "futures", "futures-timer", "instant", + "libp2p-identity", "log", - "multiaddr 0.17.0", + "multiaddr 0.17.1", "multihash 0.17.0", "multistream-select", "once_cell", "parking_lot 0.12.1", "pin-project", - "prost", - "prost-build", + "quick-protobuf", "rand 0.8.5", "rw-stream-sink", - "sec1 0.3.0", - "sha2 0.10.6", "smallvec", "thiserror", "unsigned-varint", "void", - "zeroize", ] [[package]] @@ -4144,6 +4204,24 @@ dependencies = [ "void", ] +[[package]] +name = "libp2p-identity" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a8ea433ae0cea7e3315354305237b9897afe45278b2118a7a57ca744e70fd27" +dependencies = [ + "bs58", + "ed25519-dalek", + "log", + "multiaddr 0.17.1", + "multihash 0.17.0", + "prost", + "quick-protobuf", + "rand 0.8.5", + "thiserror", + "zeroize", +] + [[package]] name = "libp2p-kad" version = "0.42.1" @@ -4247,29 +4325,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "libp2p-noise" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1216f9ec823ac7a2289b954674c54cbce81c9e45920b4fcf173018ede4295246" -dependencies = [ - "bytes", - "curve25519-dalek 3.2.0", - "futures", - "libp2p-core 0.39.0", - "log", - "once_cell", - "prost", - "prost-build", - "rand 0.8.5", - "sha2 0.10.6", - "snow", - "static_assertions", - "thiserror", - "x25519-dalek 1.1.1", - "zeroize", -] - [[package]] name = "libp2p-ping" version = "0.41.0" @@ -4288,15 +4343,15 @@ dependencies = [ [[package]] name = "libp2p-quic" -version = "0.7.0-alpha.2" +version = "0.7.0-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5971f629ff7519f4d4889a7c981f0dc09c6ad493423cd8a13ee442de241bc8c8" +checksum = "01e7c867e95c8130667b24409d236d37598270e6da69b3baf54213ba31ffca59" dependencies = [ "bytes", "futures", "futures-timer", "if-watch", - "libp2p-core 0.39.0", + "libp2p-core 0.38.0", "libp2p-tls", "log", "parking_lot 0.12.1", @@ -4376,13 +4431,14 @@ dependencies = [ [[package]] name = "libp2p-tls" -version = "0.1.0-alpha.2" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9baf6f6292149e124ee737d9a79dbee783f29473fc368c7faad9d157841078a" +checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781" dependencies = [ "futures", "futures-rustls", - "libp2p-core 0.39.0", + "libp2p-core 0.39.1", + "libp2p-identity", "rcgen 0.10.0", "ring", "rustls 0.20.8", @@ -4408,9 +4464,9 @@ dependencies = [ [[package]] name = "libp2p-webrtc" -version = "0.4.0-alpha.2" +version = "0.4.0-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4401ec550d36f413310ba5d4bf564bb21f89fb1601cadb32b2300f8bc1eb5b" +checksum = "cdb6cd86dd68cba72308ea05de1cebf3ba0ae6e187c40548167955d4e3970f6a" dependencies = [ "async-trait", "asynchronous-codec", @@ -4419,10 +4475,10 @@ dependencies = [ "futures-timer", "hex", "if-watch", - "libp2p-core 0.39.0", - "libp2p-noise 0.42.0", + "libp2p-core 0.38.0", + "libp2p-noise", "log", - "multihash 0.17.0", + "multihash 0.16.3", "prost", "prost-build", "prost-codec", @@ -4590,9 +4646,9 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "linux-raw-sys" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "3f508063cc7bb32987c71511216bd5a32be15bccb6a80b52df8b9d7f01fc3aa2" [[package]] name = "lite-json" @@ -4734,11 +4790,11 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memfd" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" +checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" dependencies = [ - "rustix 0.36.8", + "rustix 0.37.12", ] [[package]] @@ -4872,9 +4928,9 @@ dependencies = [ [[package]] name = "mockall" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326" +checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" dependencies = [ "cfg-if", "downcast", @@ -4887,9 +4943,9 @@ dependencies = [ [[package]] name = "mockall_derive" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0" +checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" dependencies = [ "cfg-if", "proc-macro2", @@ -4917,13 +4973,14 @@ dependencies = [ [[package]] name = "multiaddr" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b53e0cc5907a5c216ba6584bf74be8ab47d6d6289f72793b2dddbf15dc3bf8c" +checksum = "2b36f567c7099511fa8612bbbb52dda2419ce0bdbacf31714e3a5ffdb766d3bd" dependencies = [ "arrayref", "byteorder", "data-encoding", + "log", "multibase", "multihash 0.17.0", "percent-encoding", @@ -5010,9 +5067,9 @@ dependencies = [ [[package]] name = "nalgebra" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6515c882ebfddccaa73ead7320ca28036c4bc84c9bcca3cc0cbba8efe89223a" +checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511" dependencies = [ "approx", "matrixmultiply", @@ -5099,9 +5156,9 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "260e21fbb6f3d253a14df90eb0000a6066780a15dd901a7519ce02d77a94985b" +checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" dependencies = [ "bytes", "futures", @@ -5141,7 +5198,7 @@ name = "node-bench" version = "0.9.0-dev" dependencies = [ "array-bytes", - "clap 4.1.8", + "clap 4.2.3", "derive_more", "fs_extra", "futures", @@ -5178,7 +5235,7 @@ version = "3.0.0-dev" dependencies = [ "array-bytes", "assert_cmd", - "clap 4.1.8", + "clap 4.2.3", "clap_complete", "criterion", "frame-benchmarking-cli", @@ -5300,7 +5357,7 @@ dependencies = [ name = "node-inspect" version = "0.9.0-dev" dependencies = [ - "clap 4.1.8", + "clap 4.2.3", "parity-scale-codec", "sc-cli", "sc-client-api", @@ -5359,7 +5416,7 @@ dependencies = [ name = "node-runtime-generate-bags" version = "3.0.0" dependencies = [ - "clap 4.1.8", + "clap 4.2.3", "generate-bags", "kitchensink-runtime", ] @@ -5368,7 +5425,7 @@ dependencies = [ name = "node-template" version = "4.0.0-dev" dependencies = [ - "clap 4.1.8", + "clap 4.2.3", "frame-benchmarking", "frame-benchmarking-cli", "frame-system", @@ -5644,7 +5701,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" dependencies = [ - "asn1-rs 0.5.1", + "asn1-rs 0.5.2", ] [[package]] @@ -5679,9 +5736,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "os_str_bytes" -version = "6.4.1" +version = "6.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" [[package]] name = "output_vt100" @@ -6106,7 +6163,7 @@ version = "4.0.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.15", ] [[package]] @@ -6989,7 +7046,7 @@ dependencies = [ "proc-macro2", "quote", "sp-runtime", - "syn 2.0.14", + "syn 2.0.15", ] [[package]] @@ -7314,9 +7371,9 @@ checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304" [[package]] name = "parking" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" [[package]] name = "parking_lot" @@ -7368,9 +7425,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "pbkdf2" @@ -7422,9 +7479,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.5" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660" +checksum = "7b1403e8401ad5dedea73c626b99758535b342502f8d1e361f4a2dd952749122" dependencies = [ "thiserror", "ucd-trie", @@ -7432,9 +7489,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.5" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac3922aac69a40733080f53c1ce7f91dcf57e1a5f6c52f421fadec7fbdc4b69" +checksum = "be99c4c1d2fc2769b1d00239431d711d08f6efedcecb8b6e30707160aee99c15" dependencies = [ "pest", "pest_generator", @@ -7442,22 +7499,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.5" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06646e185566b5961b4058dd107e0a7f56e77c3f484549fb119867773c0f202" +checksum = "e56094789873daa36164de2e822b3888c6ae4b4f9da555a1103587658c805b1e" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "pest_meta" -version = "2.5.5" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6f60b2ba541577e2a0c307c8f39d1439108120eb7903adeb6497fa880c59616" +checksum = "6733073c7cff3d8459fda0e42f13a047870242aed8b509fe98000928975f359e" dependencies = [ "once_cell", "pest", @@ -7524,12 +7581,12 @@ dependencies = [ [[package]] name = "pkcs8" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d2820d87d2b008616e5c27212dd9e0e694fb4c6b522de06094106813328cb49" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.1", - "spki 0.7.0", + "der 0.7.3", + "spki 0.7.1", ] [[package]] @@ -7580,16 +7637,18 @@ dependencies = [ [[package]] name = "polling" -version = "2.5.2" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" +checksum = "4be1c66a6add46bff50935c313dae30a5030cf8385c5206e8a95e9e9def974aa" dependencies = [ "autocfg", + "bitflags", "cfg-if", + "concurrent-queue", "libc", "log", - "wepoll-ffi", - "windows-sys 0.42.0", + "pin-project-lite 0.2.9", + "windows-sys 0.48.0", ] [[package]] @@ -7649,9 +7708,9 @@ dependencies = [ [[package]] name = "predicates" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c575290b64d24745b6c57a12a31465f0a66f3a4799686a6921526a33b0797965" +checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" dependencies = [ "anstyle", "difflib", @@ -7667,9 +7726,9 @@ checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" [[package]] name = "predicates-tree" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" dependencies = [ "predicates-core", "termtree", @@ -7689,9 +7748,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.23" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ "proc-macro2", "syn 1.0.109", @@ -7803,9 +7862,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48e50df39172a3e7eb17e14642445da64996989bc212b583015435d39a58537" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes", "prost-derive", @@ -7813,9 +7872,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c828f93f5ca4826f97fedcbd3f9a536c16b12cff3dbbb4a007f932bbad95b12" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", "heck", @@ -7848,9 +7907,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea9b0f8cbe5e15a8a042d030bd96668db28ecb567ec37d691971ff5731d2b1b" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools", @@ -7861,9 +7920,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379119666929a1afd7a043aa6cf96fa67a6dce9af60c88095a4686dbce4c9c88" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ "prost", ] @@ -7883,6 +7942,15 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quick-protobuf" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f" +dependencies = [ + "byteorder", +] + [[package]] name = "quickcheck" version = "1.0.3" @@ -7905,9 +7973,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4ced82a24bb281af338b9e8f94429b6eca01b4e66d899f40031f074e74c9" +checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c" dependencies = [ "bytes", "rand 0.8.5", @@ -7995,7 +8063,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", ] [[package]] @@ -8034,9 +8102,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -8044,9 +8112,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.2" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -8103,29 +8171,29 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed" +checksum = "f43faa91b1c8b36841ee70e97188a869d37ae21759da6846d4be66de5bf7b12c" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f" +checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -8297,9 +8365,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -8328,7 +8396,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.16", + "semver 1.0.17", ] [[package]] @@ -8356,13 +8424,13 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.8" +version = "0.36.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +checksum = "e0af200a3324fa5bcd922e84e9b55a298ea9f431a489f01961acdebc6e908f25" dependencies = [ "bitflags", - "errno 0.2.8", - "io-lifetimes 1.0.5", + "errno 0.3.1", + "io-lifetimes 1.0.10", "libc", "linux-raw-sys 0.1.4", "windows-sys 0.45.0", @@ -8370,16 +8438,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.7" +version = "0.37.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d" +checksum = "722529a737f5a942fdbac3a46cee213053196737c5eaa3386d52e85b786f2659" dependencies = [ "bitflags", - "errno 0.3.0", - "io-lifetimes 1.0.5", + "errno 0.3.1", + "io-lifetimes 1.0.10", "libc", - "linux-raw-sys 0.3.1", - "windows-sys 0.45.0", + "linux-raw-sys 0.3.2", + "windows-sys 0.48.0", ] [[package]] @@ -8430,9 +8498,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "rusty-fork" @@ -8458,9 +8526,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "safe-mix" @@ -8595,7 +8663,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.15", ] [[package]] @@ -8604,7 +8672,7 @@ version = "0.10.0-dev" dependencies = [ "array-bytes", "chrono", - "clap 4.1.8", + "clap 4.2.3", "fdlimit", "futures", "futures-timer", @@ -9144,7 +9212,7 @@ dependencies = [ "once_cell", "parity-scale-codec", "paste", - "rustix 0.36.8", + "rustix 0.36.12", "sc-allocator", "sc-executor-common", "sc-runtime-test", @@ -9720,7 +9788,7 @@ dependencies = [ name = "sc-storage-monitor" version = "0.1.0" dependencies = [ - "clap 4.1.8", + "clap 4.2.3", "fs4", "futures", "log", @@ -9824,7 +9892,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.15", ] [[package]] @@ -9962,9 +10030,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" [[package]] name = "sct" @@ -10006,7 +10074,7 @@ checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ "base16ct 0.1.1", "der 0.6.1", - "generic-array 0.14.6", + "generic-array 0.14.7", "pkcs8 0.9.0", "subtle", "zeroize", @@ -10014,14 +10082,14 @@ dependencies = [ [[package]] name = "sec1" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e" +checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e" dependencies = [ "base16ct 0.2.0", - "der 0.7.1", - "generic-array 0.14.6", - "pkcs8 0.10.1", + "der 0.7.3", + "generic-array 0.14.7", + "pkcs8 0.10.2", "subtle", "zeroize", ] @@ -10096,9 +10164,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" dependencies = [ "serde", ] @@ -10111,29 +10179,29 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "serde_json" -version = "1.0.93" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", @@ -10211,9 +10279,9 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" +checksum = "54c2bb1a323307527314a36bfb73f24febb08ce2b8a554bf4ffd6f51ad15198c" dependencies = [ "digest 0.10.6", "keccak", @@ -10255,9 +10323,9 @@ dependencies = [ [[package]] name = "signature" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" dependencies = [ "digest 0.10.6", "rand_core 0.6.4", @@ -10265,9 +10333,9 @@ dependencies = [ [[package]] name = "simba" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4" +checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" dependencies = [ "approx", "num-complex", @@ -10384,7 +10452,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.15", ] [[package]] @@ -10465,14 +10533,16 @@ dependencies = [ [[package]] name = "sp-ark-bls12-377" version = "0.4.0" -source = "git+https://github.com/paritytech/ark-substrate#783bb6f0cb1313af8481225e037e3e043ea8e732" +source = "git+https://github.com/paritytech/ark-substrate?branch=ark-scale-integration#0cacab2f7950a7d7a2b9fd9ff2372e3bd2581ea8" dependencies = [ "ark-bls12-377", "ark-ff", "ark-r1cs-std", + "ark-scale", "ark-serialize", "ark-std", - "sp-ark-models 0.4.0 (git+https://github.com/paritytech/ark-substrate)", + "parity-scale-codec", + "sp-ark-models 0.4.0 (git+https://github.com/paritytech/ark-substrate?branch=ark-scale-integration)", "sp-ark-utils", "sp-arkworks", ] @@ -10480,14 +10550,16 @@ dependencies = [ [[package]] name = "sp-ark-bls12-381" version = "0.4.0" -source = "git+https://github.com/paritytech/ark-substrate#783bb6f0cb1313af8481225e037e3e043ea8e732" +source = "git+https://github.com/paritytech/ark-substrate?branch=ark-scale-integration#0cacab2f7950a7d7a2b9fd9ff2372e3bd2581ea8" dependencies = [ "ark-bls12-381", "ark-ec", "ark-ff", + "ark-scale", "ark-serialize", "ark-std", - "sp-ark-models 0.4.0 (git+https://github.com/paritytech/ark-substrate)", + "parity-scale-codec", + "sp-ark-models 0.4.0 (git+https://github.com/paritytech/ark-substrate?branch=ark-scale-integration)", "sp-ark-utils", "sp-arkworks", ] @@ -10495,13 +10567,15 @@ dependencies = [ [[package]] name = "sp-ark-bw6-761" version = "0.4.0" -source = "git+https://github.com/paritytech/ark-substrate#783bb6f0cb1313af8481225e037e3e043ea8e732" +source = "git+https://github.com/paritytech/ark-substrate?branch=ark-scale-integration#0cacab2f7950a7d7a2b9fd9ff2372e3bd2581ea8" dependencies = [ "ark-bw6-761", "ark-ff", + "ark-scale", "ark-serialize", "ark-std", - "sp-ark-models 0.4.0 (git+https://github.com/paritytech/ark-substrate)", + "parity-scale-codec", + "sp-ark-models 0.4.0 (git+https://github.com/paritytech/ark-substrate?branch=ark-scale-integration)", "sp-ark-utils", "sp-arkworks", ] @@ -10509,28 +10583,32 @@ dependencies = [ [[package]] name = "sp-ark-ed-on-bls12-377" version = "0.4.0" -source = "git+https://github.com/paritytech/ark-substrate#783bb6f0cb1313af8481225e037e3e043ea8e732" +source = "git+https://github.com/paritytech/ark-substrate?branch=ark-scale-integration#0cacab2f7950a7d7a2b9fd9ff2372e3bd2581ea8" dependencies = [ "ark-ed-on-bls12-377", "ark-ff", "ark-r1cs-std", + "ark-scale", "ark-serialize", "ark-std", - "sp-ark-models 0.4.0 (git+https://github.com/paritytech/ark-substrate)", + "parity-scale-codec", + "sp-ark-models 0.4.0 (git+https://github.com/paritytech/ark-substrate?branch=ark-scale-integration)", "sp-ark-utils", ] [[package]] name = "sp-ark-ed-on-bls12-381" version = "0.4.0" -source = "git+https://github.com/paritytech/ark-substrate#783bb6f0cb1313af8481225e037e3e043ea8e732" +source = "git+https://github.com/paritytech/ark-substrate?branch=ark-scale-integration#0cacab2f7950a7d7a2b9fd9ff2372e3bd2581ea8" dependencies = [ "ark-ed-on-bls12-381", "ark-ff", "ark-r1cs-std", + "ark-scale", "ark-serialize", "ark-std", - "sp-ark-models 0.4.0 (git+https://github.com/paritytech/ark-substrate)", + "parity-scale-codec", + "sp-ark-models 0.4.0 (git+https://github.com/paritytech/ark-substrate?branch=ark-scale-integration)", "sp-ark-utils", ] @@ -10545,7 +10623,7 @@ dependencies = [ "ark-serialize", "ark-std", "derivative", - "getrandom 0.2.8", + "getrandom 0.2.9", "itertools", "num-traits", "zeroize", @@ -10554,14 +10632,14 @@ dependencies = [ [[package]] name = "sp-ark-models" version = "0.4.0" -source = "git+https://github.com/paritytech/ark-substrate#783bb6f0cb1313af8481225e037e3e043ea8e732" +source = "git+https://github.com/paritytech/ark-substrate?branch=ark-scale-integration#0cacab2f7950a7d7a2b9fd9ff2372e3bd2581ea8" dependencies = [ "ark-ec", "ark-ff", "ark-serialize", "ark-std", "derivative", - "getrandom 0.2.8", + "getrandom 0.2.9", "itertools", "num-traits", "zeroize", @@ -10570,7 +10648,7 @@ dependencies = [ [[package]] name = "sp-ark-utils" version = "0.4.0" -source = "git+https://github.com/paritytech/ark-substrate#783bb6f0cb1313af8481225e037e3e043ea8e732" +source = "git+https://github.com/paritytech/ark-substrate?branch=ark-scale-integration#0cacab2f7950a7d7a2b9fd9ff2372e3bd2581ea8" dependencies = [ "ark-serialize", "ark-std", @@ -10587,6 +10665,7 @@ dependencies = [ "ark-ed-on-bls12-377", "ark-ed-on-bls12-381", "ark-ff", + "ark-scale", "ark-serialize", "ark-std", "parity-scale-codec", @@ -10843,7 +10922,7 @@ dependencies = [ "proc-macro2", "quote", "sp-core-hashing", - "syn 2.0.14", + "syn 2.0.15", ] [[package]] @@ -10860,7 +10939,7 @@ version = "5.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.15", ] [[package]] @@ -10996,7 +11075,7 @@ dependencies = [ name = "sp-npos-elections-fuzzer" version = "2.0.0-alpha.5" dependencies = [ - "clap 4.1.8", + "clap 4.2.3", "honggfuzz", "parity-scale-codec", "rand 0.8.5", @@ -11091,7 +11170,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.15", ] [[package]] @@ -11316,7 +11395,7 @@ dependencies = [ "proc-macro2", "quote", "sp-version", - "syn 2.0.14", + "syn 2.0.15", ] [[package]] @@ -11354,9 +11433,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spin" -version = "0.9.5" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dccf47db1b41fa1573ed27ccf5e08e3ca771cb994f776668c5ebda893b248fc" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "spki" @@ -11370,12 +11449,12 @@ dependencies = [ [[package]] name = "spki" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0445c905640145c7ea8c1993555957f65e7c46d0535b91ba501bc9bfc85522f" +checksum = "37a5be806ab6f127c3da44b7378837ebf01dadca8510a0e572460216b228bd0e" dependencies = [ "base64ct", - "der 0.7.1", + "der 0.7.3", ] [[package]] @@ -11484,7 +11563,7 @@ dependencies = [ name = "subkey" version = "3.0.0" dependencies = [ - "clap 4.1.8", + "clap 4.2.3", "sc-cli", ] @@ -11526,7 +11605,7 @@ dependencies = [ name = "substrate-frame-cli" version = "4.0.0-dev" dependencies = [ - "clap 4.1.8", + "clap 4.2.3", "frame-support", "frame-system", "sc-cli", @@ -11742,7 +11821,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.15", ] [[package]] @@ -11798,9 +11877,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.14" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf316d5356ed6847742d036f8a39c3b8435cac10bd528a4bd461928a6ab34d5" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2", "quote", @@ -11861,7 +11940,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix 0.37.7", + "rustix 0.37.12", "windows-sys 0.45.0", ] @@ -11876,9 +11955,9 @@ dependencies = [ [[package]] name = "termtree" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "textwrap" @@ -11888,22 +11967,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -12059,7 +12138,7 @@ checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.15", ] [[package]] @@ -12409,7 +12488,7 @@ version = "0.10.0-dev" dependencies = [ "assert_cmd", "async-trait", - "clap 4.1.8", + "clap 4.2.3", "frame-remote-externalities", "frame-try-runtime", "hex", @@ -12445,9 +12524,9 @@ dependencies = [ [[package]] name = "trybuild" -version = "1.0.77" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44da5a6f2164c8e14d3bbc0657d69c5966af9f5f6930d4f600b1f5c4a673413" +checksum = "501dbdbb99861e4ab6b60eb6a7493956a9defb644fd034bc4a5ef27c693c8a3a" dependencies = [ "basic-toml", "dissimilar", @@ -12522,15 +12601,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.10" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-normalization" @@ -12559,7 +12638,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "subtle", ] @@ -12602,13 +12681,19 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", ] [[package]] @@ -12661,12 +12746,11 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -12766,9 +12850,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "wasm-encoder" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f7d56227d910901ce12dfd19acc40c12687994dfb3f57c90690f80be946ec5" +checksum = "4eff853c4f09eec94d76af527eddad4e9de13b11d6286a1ef7134bc30135a2b7" dependencies = [ "leb128", ] @@ -12864,7 +12948,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e61a7006b0fdf24f6bbe8dcfdad5ca1b350de80061fb2827f31c82fbbb9565a" dependencies = [ - "spin 0.9.5", + "spin 0.9.8", "wasmi_arena", "wasmi_core 0.12.0", "wasmparser-nostd", @@ -12979,7 +13063,7 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rustix 0.36.8", + "rustix 0.36.12", "serde", "sha2 0.10.6", "toml 0.5.11", @@ -13059,7 +13143,7 @@ checksum = "d0245e8a9347017c7185a72e215218a802ff561545c242953c11ba00fccc930f" dependencies = [ "object 0.29.0", "once_cell", - "rustix 0.36.8", + "rustix 0.36.12", ] [[package]] @@ -13090,7 +13174,7 @@ dependencies = [ "memoffset 0.6.5", "paste", "rand 0.8.5", - "rustix 0.36.8", + "rustix 0.36.12", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", @@ -13111,9 +13195,9 @@ dependencies = [ [[package]] name = "wast" -version = "54.0.1" +version = "56.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d48d9d731d835f4f8dacbb8de7d47be068812cb9877f5c60d408858778d8d2a" +checksum = "6b54185c051d7bbe23757d50fe575880a2426a2f06d2e9f6a10fd9a4a42920c0" dependencies = [ "leb128", "memchr", @@ -13123,9 +13207,9 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.60" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1db2e3ed05ea31243761439194bec3af6efbbaf87c4c8667fb879e4f23791a0" +checksum = "56681922808216ab86d96bb750f70d500b5a7800e41564290fd46bb773581299" dependencies = [ "wast", ] @@ -13239,7 +13323,7 @@ dependencies = [ "byteorder", "ccm", "curve25519-dalek 3.2.0", - "der-parser 8.1.0", + "der-parser 8.2.0", "elliptic-curve 0.12.3", "hkdf", "hmac 0.12.1", @@ -13381,15 +13465,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "wepoll-ffi" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", -] - [[package]] name = "which" version = "4.4.0" @@ -13461,19 +13536,28 @@ dependencies = [ "windows_x86_64_msvc 0.34.0", ] +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.0", +] + [[package]] name = "windows-sys" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.1", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -13482,29 +13566,59 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", ] [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.1", + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" @@ -13514,9 +13628,15 @@ checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" @@ -13526,9 +13646,15 @@ checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" @@ -13538,9 +13664,15 @@ checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" @@ -13550,15 +13682,27 @@ checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" @@ -13568,9 +13712,15 @@ checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" @@ -13646,10 +13796,10 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" dependencies = [ - "asn1-rs 0.5.1", + "asn1-rs 0.5.2", "base64 0.13.1", "data-encoding", - "der-parser 8.1.0", + "der-parser 8.2.0", "lazy_static", "nom", "oid-registry 0.6.1", @@ -13680,32 +13830,31 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "yasna" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ "time 0.3.20", ] [[package]] name = "zeroize" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.3.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", - "synstructure", + "syn 2.0.15", ] [[package]] @@ -13748,9 +13897,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.7+zstd.1.5.4" +version = "2.0.8+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" dependencies = [ "cc", "libc", diff --git a/primitives/arkworks/Cargo.toml b/primitives/arkworks/Cargo.toml index 16af2ac3c9b07..86b82f28705ea 100644 --- a/primitives/arkworks/Cargo.toml +++ b/primitives/arkworks/Cargo.toml @@ -22,6 +22,7 @@ ark-ed-on-bls12-381 = { version = "0.4.0", default-features = false } ark-ed-on-bls12-377 = { version = "0.4.0", default-features = false } sp-std = { version = "5.0.0", path = "../std", default-features = false } codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false } +ark-scale = { git = "https://github.com/w3f/ark-scale", default-features = false } [features] default = [ "std" ] @@ -37,4 +38,5 @@ std = [ "ark-ed-on-bls12-377/std", "sp-std/std", "codec/std", + "ark-scale/std", ] diff --git a/primitives/arkworks/src/bls12_377.rs b/primitives/arkworks/src/bls12_377.rs index 871089d9cf3f4..7855ee92e97a2 100644 --- a/primitives/arkworks/src/bls12_377.rs +++ b/primitives/arkworks/src/bls12_377.rs @@ -26,34 +26,42 @@ use crate::utils::{ use ark_bls12_377::{g1, g2, Bls12_377}; use sp_std::vec::Vec; -pub fn multi_miller_loop(a: Vec>, b: Vec>) -> Result, ()> { +/// Compute a multi miller loop through arkworks +pub fn multi_miller_loop(a: Vec, b: Vec) -> Result, ()> { multi_miller_loop_generic::(a, b) } +/// Compute a final exponentiation through arkworks pub fn final_exponentiation(target: Vec) -> Result, ()> { final_exponentiation_generic::(target) } -pub fn msm_g1(bases: Vec>, scalars: Vec>) -> Vec { +/// Compute a multi scalar multiplication for short_weierstrass through arkworks on G1 +pub fn msm_g1(bases: Vec, scalars: Vec) -> Result, ()> { msm_sw_generic::(bases, scalars) } -pub fn msm_g2(bases: Vec>, scalars: Vec>) -> Vec { +/// Compute a multi scalar multiplication for short_weierstrass through arkworks on G2 +pub fn msm_g2(bases: Vec, scalars: Vec) -> Result, ()> { msm_sw_generic::(bases, scalars) } -pub fn mul_projective_g1(base: Vec, scalar: Vec) -> Vec { +/// Compute a projective scalar multiplication for short_weierstrass through arkworks on G1 +pub fn mul_projective_g1(base: Vec, scalar: Vec) -> Result, ()> { mul_projective_generic::(base, scalar) } -pub fn mul_projective_g2(base: Vec, scalar: Vec) -> Vec { +/// Compute a projective scalar multiplication for short_weierstrass through arkworks on G2 +pub fn mul_projective_g2(base: Vec, scalar: Vec) -> Result, ()> { mul_projective_generic::(base, scalar) } -pub fn mul_affine_g1(base: Vec, scalar: Vec) -> Vec { +/// Compute a affine scalar multiplication for short_weierstrass through arkworks on G1 +pub fn mul_affine_g1(base: Vec, scalar: Vec) -> Result, ()> { mul_affine_generic::(base, scalar) } -pub fn mul_affine_g2(base: Vec, scalar: Vec) -> Vec { +/// Compute a affine scalar multiplication for short_weierstrass through arkworks on G2 +pub fn mul_affine_g2(base: Vec, scalar: Vec) -> Result, ()> { mul_affine_generic::(base, scalar) } diff --git a/primitives/arkworks/src/bls12_381.rs b/primitives/arkworks/src/bls12_381.rs index 70491d6e1b27b..bd87c43cb08c2 100644 --- a/primitives/arkworks/src/bls12_381.rs +++ b/primitives/arkworks/src/bls12_381.rs @@ -26,34 +26,42 @@ use crate::utils::{ use ark_bls12_381::{g1, g2, Bls12_381}; use sp_std::vec::Vec; -pub fn multi_miller_loop(a: Vec>, b: Vec>) -> Result, ()> { +/// Compute a multi miller loop through arkworks +pub fn multi_miller_loop(a: Vec, b: Vec) -> Result, ()> { multi_miller_loop_generic::(a, b) } +/// Compute a final exponentiation through arkworks pub fn final_exponentiation(target: Vec) -> Result, ()> { final_exponentiation_generic::(target) } -pub fn msm_g1(bases: Vec>, scalars: Vec>) -> Vec { +/// Compute a multi scalar multiplication for short_weierstrass through arkworks on G1 +pub fn msm_g1(bases: Vec, scalars: Vec) -> Result, ()> { msm_sw_generic::(bases, scalars) } -pub fn msm_g2(bases: Vec>, scalars: Vec>) -> Vec { +/// Compute a multi scalar multiplication for short_weierstrass through arkworks on G2 +pub fn msm_g2(bases: Vec, scalars: Vec) -> Result, ()> { msm_sw_generic::(bases, scalars) } -pub fn mul_projective_g1(base: Vec, scalar: Vec) -> Vec { +/// Compute a projective scalar multiplication for short_weierstrass through arkworks on G1 +pub fn mul_projective_g1(base: Vec, scalar: Vec) -> Result, ()> { mul_projective_generic::(base, scalar) } -pub fn mul_projective_g2(base: Vec, scalar: Vec) -> Vec { +/// Compute a projective scalar multiplication for short_weierstrass through arkworks on G2 +pub fn mul_projective_g2(base: Vec, scalar: Vec) -> Result, ()> { mul_projective_generic::(base, scalar) } -pub fn mul_affine_g1(base: Vec, scalar: Vec) -> Vec { +/// Compute a affine scalar multiplication for short_weierstrass through arkworks on G1 +pub fn mul_affine_g1(base: Vec, scalar: Vec) -> Result, ()> { mul_affine_generic::(base, scalar) } -pub fn mul_affine_g2(base: Vec, scalar: Vec) -> Vec { +/// Compute a affine scalar multiplication for short_weierstrass through arkworks on G2 +pub fn mul_affine_g2(base: Vec, scalar: Vec) -> Result, ()> { mul_affine_generic::(base, scalar) } diff --git a/primitives/arkworks/src/bw6_761.rs b/primitives/arkworks/src/bw6_761.rs index 080ea0fb4a633..880a9ba475182 100644 --- a/primitives/arkworks/src/bw6_761.rs +++ b/primitives/arkworks/src/bw6_761.rs @@ -26,34 +26,42 @@ use crate::utils::{ use ark_bw6_761::{g1, g2, BW6_761}; use sp_std::vec::Vec; -pub fn multi_miller_loop(a: Vec>, b: Vec>) -> Result, ()> { +/// Compute a multi miller loop through arkworks +pub fn multi_miller_loop(a: Vec, b: Vec) -> Result, ()> { multi_miller_loop_generic::(a, b) } +/// Compute a final exponentiation through arkworks pub fn final_exponentiation(target: Vec) -> Result, ()> { final_exponentiation_generic::(target) } -pub fn msm_g1(bases: Vec>, scalars: Vec>) -> Vec { +/// Compute a multi scalar multiplication for short_weierstrass through arkworks on G1 +pub fn msm_g1(bases: Vec, scalars: Vec) -> Result, ()> { msm_sw_generic::(bases, scalars) } -pub fn msm_g2(bases: Vec>, scalars: Vec>) -> Vec { +/// Compute a multi scalar multiplication for short_weierstrass through arkworks on G2 +pub fn msm_g2(bases: Vec, scalars: Vec) -> Result, ()> { msm_sw_generic::(bases, scalars) } -pub fn mul_projective_g1(base: Vec, scalar: Vec) -> Vec { +/// Compute a projective scalar multiplication for short_weierstrass through arkworks on G1 +pub fn mul_projective_g1(base: Vec, scalar: Vec) -> Result, ()> { mul_projective_generic::(base, scalar) } -pub fn mul_projective_g2(base: Vec, scalar: Vec) -> Vec { +/// Compute a projective scalar multiplication for short_weierstrass through arkworks on G2 +pub fn mul_projective_g2(base: Vec, scalar: Vec) -> Result, ()> { mul_projective_generic::(base, scalar) } -pub fn mul_affine_g1(base: Vec, scalar: Vec) -> Vec { +/// Compute a affine scalar multiplication for short_weierstrass through arkworks on G1 +pub fn mul_affine_g1(base: Vec, scalar: Vec) -> Result, ()> { mul_affine_generic::(base, scalar) } -pub fn mul_affine_g2(base: Vec, scalar: Vec) -> Vec { +/// Compute a affine scalar multiplication for short_weierstrass through arkworks on G2 +pub fn mul_affine_g2(base: Vec, scalar: Vec) -> Result, ()> { mul_affine_generic::(base, scalar) } diff --git a/primitives/arkworks/src/ed_on_bls12_377.rs b/primitives/arkworks/src/ed_on_bls12_377.rs index 928c221d8313f..9d04a101af36f 100644 --- a/primitives/arkworks/src/ed_on_bls12_377.rs +++ b/primitives/arkworks/src/ed_on_bls12_377.rs @@ -23,14 +23,17 @@ use crate::utils::{msm_te_generic, mul_affine_te_generic, mul_projective_te_gene use ark_ed_on_bls12_377::EdwardsConfig; use sp_std::vec::Vec; -pub fn mul_projective(base: Vec, scalar: Vec) -> Vec { +/// Compute a projective scalar multiplication for twisted_edwards through arkworks +pub fn mul_projective(base: Vec, scalar: Vec) -> Result, ()> { mul_projective_te_generic::(base, scalar) } -pub fn mul_affine(base: Vec, scalar: Vec) -> Vec { +/// Compute a scalar multiplication for twisted_edwards through arkworks +pub fn mul_affine(base: Vec, scalar: Vec) -> Result, ()> { mul_affine_te_generic::(base, scalar) } -pub fn msm(bases: Vec>, scalars: Vec>) -> Vec { +/// Compute a multi scalar mulitplication for twisted_edwards through arkworks +pub fn msm(bases: Vec, scalars: Vec) -> Result, ()> { msm_te_generic::(bases, scalars) } diff --git a/primitives/arkworks/src/ed_on_bls12_381.rs b/primitives/arkworks/src/ed_on_bls12_381.rs index f641e7fa4613b..f730e08a2b161 100644 --- a/primitives/arkworks/src/ed_on_bls12_381.rs +++ b/primitives/arkworks/src/ed_on_bls12_381.rs @@ -26,26 +26,32 @@ use crate::utils::{ use ark_ed_on_bls12_381::JubjubConfig; use sp_std::vec::Vec; -pub fn sw_mul_projective(base: Vec, scalar: Vec) -> Vec { +/// Compute a projective scalar multiplication for short_weierstrass through arkworks +pub fn sw_mul_projective(base: Vec, scalar: Vec) -> Result, ()> { mul_projective_generic::(base, scalar) } -pub fn sw_mul_affine(base: Vec, scalar: Vec) -> Vec { +/// Compute a affine scalar multiplication for short_weierstrass through arkworks +pub fn sw_mul_affine(base: Vec, scalar: Vec) -> Result, ()> { mul_affine_generic::(base, scalar) } -pub fn te_mul_projective(base: Vec, scalar: Vec) -> Vec { +/// Compute a projective scalar multiplication for twisted_edwards through arkworks +pub fn te_mul_projective(base: Vec, scalar: Vec) -> Result, ()> { mul_projective_te_generic::(base, scalar) } -pub fn te_mul_affine(base: Vec, scalar: Vec) -> Vec { +/// Compute a scalar multiplication for twisted_edwards through arkworks +pub fn te_mul_affine(base: Vec, scalar: Vec) -> Result, ()> { mul_affine_te_generic::(base, scalar) } -pub fn te_msm(bases: Vec>, scalars: Vec>) -> Vec { +/// Compute a multi scalar mulitplication for twisted_edwards through arkworks +pub fn te_msm(bases: Vec, scalars: Vec) -> Result, ()> { msm_te_generic::(bases, scalars) } -pub fn sw_msm(bases: Vec>, scalars: Vec>) -> Vec { +/// Compute a multi scalar multiplication for short_weierstrass through arkworks +pub fn sw_msm(bases: Vec, scalars: Vec) -> Result, ()> { msm_sw_generic::(bases, scalars) } diff --git a/primitives/arkworks/src/utils.rs b/primitives/arkworks/src/utils.rs index b18f00d7425d6..19ae564a0e020 100644 --- a/primitives/arkworks/src/utils.rs +++ b/primitives/arkworks/src/utils.rs @@ -1,124 +1,150 @@ use ark_ec::{ - pairing::{MillerLoopOutput, Pairing}, + pairing::{MillerLoopOutput, Pairing, PairingOutput}, short_weierstrass, short_weierstrass::SWCurveConfig, twisted_edwards, twisted_edwards::TECurveConfig, CurveConfig, VariableBaseMSM, }; -use ark_serialize::{CanonicalDeserialize, CanonicalSerialize, Compress, Validate}; -use ark_std::{io::Cursor, vec, vec::Vec}; - -fn serialize_result(result: impl CanonicalSerialize) -> Vec { - let mut serialized_result = vec![0u8; result.serialized_size(Compress::No)]; - let mut cursor = Cursor::new(&mut serialized_result[..]); - result.serialize_uncompressed(&mut cursor).unwrap(); - serialized_result -} +use ark_std::vec::Vec; +use codec::{Decode, Encode}; -fn deserialize_argument(argument: &Vec) -> Field { - let cursor = Cursor::new(argument); - Field::deserialize_with_mode(cursor, Compress::No, Validate::No).unwrap() -} +const HOST_CALL: ark_scale::Usage = ark_scale::HOST_CALL; +type ArkScale = ark_scale::ArkScale; -/// Compute a multi miller loop through arkworks -pub fn multi_miller_loop_generic( - a_vec: Vec>, - b_vec: Vec>, +pub(crate) fn multi_miller_loop_generic( + g1: Vec, + g2: Vec, ) -> Result, ()> { - let g1: Vec<_> = a_vec - .iter() - .map(|elem| deserialize_argument::<::G1Affine>(elem)) - .collect(); - let g2: Vec<_> = b_vec - .iter() - .map(|elem| deserialize_argument::<::G2Affine>(elem)) - .collect(); - - let result = Curve::multi_miller_loop(g1, g2).0; - - Ok(serialize_result(result)) + let g1 = + ::G1Affine>> as Decode>::decode(&mut g1.clone().as_slice()) + .map_err(|_| ())?; + let g2 = + ::G2Affine>> as Decode>::decode(&mut g2.clone().as_slice()) + .map_err(|_| ())?; + + let result = Curve::multi_miller_loop(g1.0, g2.0).0; + + let result: ArkScale<::TargetField> = result.into(); + Ok(::TargetField> as Encode>::encode(&result)) } -/// Compute a final exponentiation through arkworks -pub fn final_exponentiation_generic(target: Vec) -> Result, ()> { - let target = deserialize_argument::<::TargetField>(&target); +pub(crate) fn final_exponentiation_generic(target: Vec) -> Result, ()> { + let target = ::TargetField> as Decode>::decode( + &mut target.clone().as_slice(), + ) + .map_err(|_| ())?; - let result = Curve::final_exponentiation(MillerLoopOutput(target)); + let result = Curve::final_exponentiation(MillerLoopOutput(target.0)).ok_or(())?; - result.map(serialize_result).ok_or(()) + let result: ArkScale> = result.into(); + Ok(> as Encode>::encode(&result)) } -/// Compute a multi scalar multiplication for short_weierstrass through arkworks -pub fn msm_sw_generic(bases: Vec>, scalars: Vec>) -> Vec { - let bases: Vec<_> = bases - .iter() - .map(|a| deserialize_argument::>(a)) - .collect(); - let scalars: Vec<_> = scalars - .iter() - .map(|a| deserialize_argument::<::ScalarField>(a)) - .collect(); +pub(crate) fn msm_sw_generic( + bases: Vec, + scalars: Vec, +) -> Result, ()> { + let bases = >> as Decode>::decode( + &mut bases.clone().as_slice(), + ) + .map_err(|_| ())?; + let scalars = ::ScalarField>> as Decode>::decode( + &mut scalars.clone().as_slice(), + ) + .map_err(|_| ())?; let result = - as VariableBaseMSM>::msm(&bases, &scalars).unwrap(); + as VariableBaseMSM>::msm(&bases.0, &scalars.0) + .map_err(|_| ())?; - serialize_result(result) + let result: ArkScale> = result.into(); + Ok(> as Encode>::encode(&result)) } -/// Compute a multi scalar mulitplication for twisted_edwards through arkworks -pub fn msm_te_generic(bases: Vec>, scalars: Vec>) -> Vec { - let bases: Vec<_> = bases - .iter() - .map(|a| deserialize_argument::>(a)) - .collect(); - let scalars: Vec<_> = scalars - .iter() - .map(|a| deserialize_argument::<::ScalarField>(a)) - .collect(); +pub(crate) fn msm_te_generic( + bases: Vec, + scalars: Vec, +) -> Result, ()> { + let bases = >> as Decode>::decode( + &mut bases.clone().as_slice(), + ) + .map_err(|_| ())?; + let scalars = ::ScalarField>> as Decode>::decode( + &mut scalars.clone().as_slice(), + ) + .map_err(|_| ())?; let result = - as VariableBaseMSM>::msm(&bases, &scalars).unwrap(); + as VariableBaseMSM>::msm(&bases.0, &scalars.0).unwrap(); - serialize_result(result) + let result: ArkScale> = result.into(); + Ok(> as Encode>::encode(&result)) } -/// Compute a projective scalar multiplication on G2 through arkworks -pub fn mul_projective_generic(base: Vec, scalar: Vec) -> Vec { - let base = deserialize_argument::>(&base); - let scalar = deserialize_argument::>(&scalar); +pub(crate) fn mul_projective_generic( + base: Vec, + scalar: Vec, +) -> Result, ()> { + let base = > as Decode>::decode( + &mut base.clone().as_slice(), + ) + .map_err(|_| ())?; + let scalar = + > as Decode>::decode(&mut scalar.clone().as_slice()).map_err(|_| ())?; - let result = ::mul_projective(&base, &scalar); + let result = ::mul_projective(&base.0, &scalar.0); - serialize_result(result) + let result: ArkScale> = result.into(); + Ok(> as Encode>::encode(&result)) } -/// Compute a projective scalar multiplication for twisted_edwards through arkworks -pub fn mul_projective_te_generic(base: Vec, scalar: Vec) -> Vec { - let base = deserialize_argument::>(&base); - let scalar = deserialize_argument::>(&scalar); +pub(crate) fn mul_projective_te_generic( + base: Vec, + scalar: Vec, +) -> Result, ()> { + let base = > as Decode>::decode( + &mut base.clone().as_slice(), + ) + .map_err(|_| ())?; + let scalar = + > as Decode>::decode(&mut scalar.clone().as_slice()).map_err(|_| ())?; - let result = ::mul_projective(&base, &scalar); + let result = ::mul_projective(&base.0, &scalar.0); - serialize_result(result) + let result: ArkScale> = result.into(); + Ok(> as Encode>::encode(&result)) } -/// Compute a affine scalar multiplication through arkworks -pub fn mul_affine_generic(base: Vec, scalar: Vec) -> Vec { - let base = deserialize_argument::>(&base); - let scalar = deserialize_argument::>(&scalar); +pub(crate) fn mul_affine_generic( + base: Vec, + scalar: Vec, +) -> Result, ()> { + let base = > as Decode>::decode( + &mut base.clone().as_slice(), + ) + .map_err(|_| ())?; + let scalar = + > as Decode>::decode(&mut scalar.clone().as_slice()).map_err(|_| ())?; - let result = ::mul_affine(&base, &scalar); + let result = ::mul_affine(&base.0, &scalar.0); - serialize_result(result) + let result: ArkScale> = result.into(); + Ok(> as Encode>::encode(&result)) } -/// Compute a scalar multiplication on G2 through arkworks -pub fn mul_affine_te_generic(base: Vec, scalar: Vec) -> Vec { - let base = deserialize_argument::>(&base); - let scalar = deserialize_argument::>(&scalar); +pub(crate) fn mul_affine_te_generic( + base: Vec, + scalar: Vec, +) -> Result, ()> { + let base = + > as Decode>::decode(&mut base.clone().as_slice()) + .map_err(|_| ())?; + let scalar = + > as Decode>::decode(&mut scalar.clone().as_slice()).map_err(|_| ())?; - let result = ::mul_affine(&base, &scalar); + let result = ::mul_affine(&base.0, &scalar.0); - serialize_result(result) + let result: ArkScale> = result.into(); + Ok(> as Encode>::encode(&result)) } diff --git a/primitives/arkworks/test/tests/bls12_377.rs b/primitives/arkworks/test/tests/bls12_377.rs index 0c3b2d5ab8ab7..a3a79540df9a7 100644 --- a/primitives/arkworks/test/tests/bls12_377.rs +++ b/primitives/arkworks/test/tests/bls12_377.rs @@ -5,18 +5,30 @@ use sp_ark_bls12_377::HostFunctions; pub struct Host {} impl HostFunctions for Host { - fn bls12_377_multi_miller_loop(a: Vec>, b: Vec>) -> Result, ()> { + fn bls12_377_multi_miller_loop(a: Vec, b: Vec) -> Result, ()> { sp_io::elliptic_curves::bls12_377_multi_miller_loop(a, b) } fn bls12_377_final_exponentiation(f12: Vec) -> Result, ()> { sp_io::elliptic_curves::bls12_377_final_exponentiation(f12) } - fn bls12_377_msm_g1(bases: Vec>, bigints: Vec>) -> Vec { + fn bls12_377_msm_g1(bases: Vec, bigints: Vec) -> Result, ()> { sp_io::elliptic_curves::bls12_377_msm_g1(bases, bigints) } - fn bls12_377_msm_g2(bases: Vec>, bigints: Vec>) -> Vec { + fn bls12_377_msm_g2(bases: Vec, bigints: Vec) -> Result, ()> { sp_io::elliptic_curves::bls12_377_msm_g2(bases, bigints) } + fn bls12_377_mul_projective_g1(base: Vec, scalar: Vec) -> Result, ()> { + sp_io::elliptic_curves::bls12_377_mul_projective_g1(base, scalar) + } + fn bls12_377_mul_affine_g1(base: Vec, scalar: Vec) -> Result, ()> { + sp_io::elliptic_curves::bls12_377_mul_affine_g1(base, scalar) + } + fn bls12_377_mul_projective_g2(base: Vec, scalar: Vec) -> Result, ()> { + sp_io::elliptic_curves::bls12_377_mul_projective_g2(base, scalar) + } + fn bls12_377_mul_affine_g2(base: Vec, scalar: Vec) -> Result, ()> { + sp_io::elliptic_curves::bls12_377_mul_affine_g2(base, scalar) + } } test_group!(g1; sp_ark_bls12_377::G1Projective; sw); diff --git a/primitives/arkworks/test/tests/bls12_381/mod.rs b/primitives/arkworks/test/tests/bls12_381/mod.rs index e42f5ae5481bf..ed4630c48ec87 100755 --- a/primitives/arkworks/test/tests/bls12_381/mod.rs +++ b/primitives/arkworks/test/tests/bls12_381/mod.rs @@ -1,30 +1,41 @@ use ark_algebra_test_templates::*; use ark_ff::{fields::Field, UniformRand, Zero}; -use sp_ark_models::{AffineRepr, CurveGroup, Group}; use ark_serialize::{CanonicalDeserialize, CanonicalSerialize, Compress, Validate}; use ark_std::{rand::Rng, test_rng, vec, vec::Vec, One}; - +use sp_ark_models::{AffineRepr, CurveGroup, Group}; use sp_ark_bls12_381::{ - Fq, Fq2, Fr, G1Affine as G1Affine_Host, G1Projective as G1Projective_Host, + fq::Fq, fq2::Fq2, fr::Fr, G1Affine as G1Affine_Host, G1Projective as G1Projective_Host, G2Affine as G2Affine_Host, G2Projective as G2Projective_Host, HostFunctions, }; pub struct Host {} impl HostFunctions for Host { - fn bls12_381_multi_miller_loop(a: Vec>, b: Vec> ) -> Result, ()> { + fn bls12_381_multi_miller_loop(a: Vec, b: Vec) -> Result, ()> { sp_io::elliptic_curves::bls12_381_multi_miller_loop(a, b) } fn bls12_381_final_exponentiation(f12: Vec) -> Result, ()> { sp_io::elliptic_curves::bls12_381_final_exponentiation(f12) } - fn bls12_381_msm_g1(bases: Vec>, bigints: Vec>) -> Vec { + fn bls12_381_msm_g1(bases: Vec, bigints: Vec) -> Result, ()> { sp_io::elliptic_curves::bls12_381_msm_g1(bases, bigints) } - fn bls12_381_msm_g2(bases: Vec>, bigints: Vec>) -> Vec { + fn bls12_381_msm_g2(bases: Vec, bigints: Vec) -> Result, ()> { sp_io::elliptic_curves::bls12_381_msm_g2(bases, bigints) } + fn bls12_381_mul_projective_g1(base: Vec, scalar: Vec) -> Result, ()> { + sp_io::elliptic_curves::bls12_381_mul_projective_g1(base, scalar) + } + fn bls12_381_mul_affine_g1(base: Vec, scalar: Vec) -> Result, ()> { + sp_io::elliptic_curves::bls12_381_mul_affine_g1(base, scalar) + } + fn bls12_381_mul_projective_g2(base: Vec, scalar: Vec) -> Result, ()> { + sp_io::elliptic_curves::bls12_381_mul_projective_g2(base, scalar) + } + fn bls12_381_mul_affine_g2(base: Vec, scalar: Vec) -> Result, ()> { + sp_io::elliptic_curves::bls12_381_mul_affine_g2(base, scalar) + } } type G1Projective = G1Projective_Host; diff --git a/primitives/arkworks/test/tests/bw6_761.rs b/primitives/arkworks/test/tests/bw6_761.rs index 61c3a5733b79b..e09b9a342a819 100644 --- a/primitives/arkworks/test/tests/bw6_761.rs +++ b/primitives/arkworks/test/tests/bw6_761.rs @@ -6,18 +6,30 @@ use sp_ark_bw6_761::HostFunctions; pub struct Host; impl HostFunctions for Host { - fn bw6_761_multi_miller_loop(a: Vec>, b: Vec>) -> Result, ()> { + fn bw6_761_multi_miller_loop(a: Vec, b: Vec) -> Result, ()> { sp_io::elliptic_curves::bw6_761_multi_miller_loop(a, b) } fn bw6_761_final_exponentiation(f12: Vec) -> Result, ()> { sp_io::elliptic_curves::bw6_761_final_exponentiation(f12) } - fn bw6_761_msm_g1(bases: Vec>, bigints: Vec>) -> Vec { + fn bw6_761_msm_g1(bases: Vec, bigints: Vec) -> Result, ()> { sp_io::elliptic_curves::bw6_761_msm_g1(bases, bigints) } - fn bw6_761_msm_g2(bases: Vec>, bigints: Vec>) -> Vec { + fn bw6_761_msm_g2(bases: Vec, bigints: Vec) -> Result, ()> { sp_io::elliptic_curves::bw6_761_msm_g2(bases, bigints) } + fn bw6_761_mul_projective_g1(base: Vec, scalar: Vec) -> Result, ()> { + sp_io::elliptic_curves::bw6_761_mul_projective_g1(base, scalar) + } + fn bw6_761_mul_projective_g2(base: Vec, scalar: Vec) -> Result, ()> { + sp_io::elliptic_curves::bw6_761_mul_projective_g2(base, scalar) + } + fn bw6_761_mul_affine_g1(base: Vec, scalar: Vec) -> Result, ()> { + sp_io::elliptic_curves::bw6_761_mul_affine_g1(base, scalar) + } + fn bw6_761_mul_affine_g2(base: Vec, scalar: Vec) -> Result, ()> { + sp_io::elliptic_curves::bw6_761_mul_affine_g2(base, scalar) + } } test_group!(g1; sp_ark_bw6_761::g1::G1Projective; sw); diff --git a/primitives/arkworks/test/tests/ed_on_bls12_377.rs b/primitives/arkworks/test/tests/ed_on_bls12_377.rs index 8b4a4d3d13784..9bbfdcf78bb99 100644 --- a/primitives/arkworks/test/tests/ed_on_bls12_377.rs +++ b/primitives/arkworks/test/tests/ed_on_bls12_377.rs @@ -5,9 +5,15 @@ use sp_ark_ed_on_bls12_377::HostFunctions; pub struct Host {} impl HostFunctions for Host { - fn ed_on_bls12_377_msm(bases: Vec>, scalars: Vec>) -> Vec { + fn ed_on_bls12_377_msm(bases: Vec, scalars: Vec) -> Result, ()> { sp_io::elliptic_curves::ed_on_bls12_377_msm(bases, scalars) } + fn ed_on_bls12_377_mul_affine(base: Vec, scalar: Vec) -> Result, ()> { + sp_io::elliptic_curves::ed_on_bls12_377_mul_affine(base, scalar) + } + fn ed_on_bls12_377_mul_projective(base: Vec, scalar: Vec) -> Result, ()> { + sp_io::elliptic_curves::ed_on_bls12_377_mul_projective(base, scalar) + } } test_group!(te; sp_ark_ed_on_bls12_377::EdwardsProjective; te); diff --git a/primitives/arkworks/test/tests/ed_on_bls12_381.rs b/primitives/arkworks/test/tests/ed_on_bls12_381.rs index a3bd0b5a82847..030ecd792ef55 100644 --- a/primitives/arkworks/test/tests/ed_on_bls12_381.rs +++ b/primitives/arkworks/test/tests/ed_on_bls12_381.rs @@ -5,12 +5,24 @@ use sp_ark_ed_on_bls12_381::HostFunctions; pub struct Host {} impl HostFunctions for Host { - fn ed_on_bls12_381_te_msm(bases: Vec>, scalars: Vec>) -> Vec { + fn ed_on_bls12_381_te_msm(bases: Vec, scalars: Vec) -> Result, ()> { sp_io::elliptic_curves::ed_on_bls12_381_te_msm(bases, scalars) } - fn ed_on_bls12_381_sw_msm(bases: Vec>, scalars: Vec>) -> Vec { + fn ed_on_bls12_381_sw_msm(bases: Vec, scalars: Vec) -> Result, ()> { sp_io::elliptic_curves::ed_on_bls12_381_sw_msm(bases, scalars) } + fn ed_on_bls12_381_sw_mul_affine(base: Vec, scalar: Vec) -> Result, ()> { + sp_io::elliptic_curves::ed_on_bls12_381_sw_mul_affine(base, scalar) + } + fn ed_on_bls12_381_te_mul_projective(base: Vec, scalar: Vec) -> Result, ()> { + sp_io::elliptic_curves::ed_on_bls12_381_te_mul_projective(base, scalar) + } + fn ed_on_bls12_381_te_mul_affine(base: Vec, scalar: Vec) -> Result, ()> { + sp_io::elliptic_curves::ed_on_bls12_381_te_mul_affine(base, scalar) + } + fn ed_on_bls12_381_sw_mul_projective(base: Vec, scalar: Vec) -> Result, ()> { + sp_io::elliptic_curves::ed_on_bls12_381_sw_mul_projective(base, scalar) + } } test_group!(sw; sp_ark_ed_on_bls12_381::SWProjective; sw); diff --git a/primitives/arkworks/test/tests/mod.rs b/primitives/arkworks/test/tests/mod.rs new file mode 100644 index 0000000000000..e99ccc69281f3 --- /dev/null +++ b/primitives/arkworks/test/tests/mod.rs @@ -0,0 +1,5 @@ +mod bls12_377; +mod bls12_381; +mod bw6_761; +mod ed_on_bls12_377; +mod ed_on_bls12_381; diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs index df58d4dab105a..03ce7563c6037 100644 --- a/primitives/io/src/lib.rs +++ b/primitives/io/src/lib.rs @@ -1146,7 +1146,7 @@ pub trait Crypto { #[runtime_interface] pub trait EllipticCurves { /// Compute a multi Miller loop on bls12_381 - fn bls12_381_multi_miller_loop(a: Vec>, b: Vec>) -> Result, ()> { + fn bls12_381_multi_miller_loop(a: Vec, b: Vec) -> Result, ()> { sp_arkworks::bls12_381::multi_miller_loop(a, b) } @@ -1156,37 +1156,37 @@ pub trait EllipticCurves { } /// Compute a projective multiplication on G1 for bls12_381 - fn bls12_381_mul_projective_g1(base: Vec, scalar: Vec) -> Vec { + fn bls12_381_mul_projective_g1(base: Vec, scalar: Vec) -> Result, ()> { sp_arkworks::bls12_381::mul_projective_g1(base, scalar) } /// Compute a projective multiplication on G1 for bls12_381 - fn bls12_381_mul_affine_g1(base: Vec, scalar: Vec) -> Vec { + fn bls12_381_mul_affine_g1(base: Vec, scalar: Vec) -> Result, ()> { sp_arkworks::bls12_381::mul_affine_g1(base, scalar) } /// Compute a projective multiplication on G2 for bls12_381 - fn bls12_381_mul_projective_g2(base: Vec, scalar: Vec) -> Vec { + fn bls12_381_mul_projective_g2(base: Vec, scalar: Vec) -> Result, ()> { sp_arkworks::bls12_381::mul_projective_g2(base, scalar) } /// Compute a affine multiplication on G2 for bls12_381 - fn bls12_381_mul_affine_g2(base: Vec, scalar: Vec) -> Vec { + fn bls12_381_mul_affine_g2(base: Vec, scalar: Vec) -> Result, ()> { sp_arkworks::bls12_381::mul_affine_g2(base, scalar) } /// Compute a msm on G1 for bls12_381 - fn bls12_381_msm_g1(bases: Vec>, scalars: Vec>) -> Vec { + fn bls12_381_msm_g1(bases: Vec, scalars: Vec) -> Result, ()> { sp_arkworks::bls12_381::msm_g1(bases, scalars) } /// Compute a msm on G2 for bls12_381 - fn bls12_381_msm_g2(bases: Vec>, scalars: Vec>) -> Vec { + fn bls12_381_msm_g2(bases: Vec, scalars: Vec) -> Result, ()> { sp_arkworks::bls12_381::msm_g2(bases, scalars) } /// Compute a multi Miller loop for bls12_377 - fn bls12_377_multi_miller_loop(a: Vec>, b: Vec>) -> Result, ()> { + fn bls12_377_multi_miller_loop(a: Vec, b: Vec) -> Result, ()> { sp_arkworks::bls12_377::multi_miller_loop(a, b) } @@ -1196,37 +1196,37 @@ pub trait EllipticCurves { } /// Compute a projective multiplication on G1 for bls12_377 - fn bls12_377_mul_projective_g1(base: Vec, scalar: Vec) -> Vec { + fn bls12_377_mul_projective_g1(base: Vec, scalar: Vec) -> Result, ()> { sp_arkworks::bls12_377::mul_projective_g1(base, scalar) } /// Compute a affine multiplication on G1 for bls12_377 - fn bls12_377_mul_affine_g1(base: Vec, scalar: Vec) -> Vec { + fn bls12_377_mul_affine_g1(base: Vec, scalar: Vec) -> Result, ()> { sp_arkworks::bls12_377::mul_affine_g1(base, scalar) } /// Compute a projective multiplication on G2 for bls12_377 - fn bls12_377_mul_projective_g2(base: Vec, scalar: Vec) -> Vec { + fn bls12_377_mul_projective_g2(base: Vec, scalar: Vec) -> Result, ()> { sp_arkworks::bls12_377::mul_projective_g2(base, scalar) } /// Compute a affine multiplication on G2 for bls12_377 - fn bls12_377_mul_affine_g2(base: Vec, scalar: Vec) -> Vec { + fn bls12_377_mul_affine_g2(base: Vec, scalar: Vec) -> Result, ()> { sp_arkworks::bls12_377::mul_affine_g2(base, scalar) } /// Compute a msm on G1 for bls12_377 - fn bls12_377_msm_g1(bases: Vec>, scalars: Vec>) -> Vec { + fn bls12_377_msm_g1(bases: Vec, scalars: Vec) -> Result, ()> { sp_arkworks::bls12_377::msm_g1(bases, scalars) } /// Compute a msm on G2 for bls12_377 - fn bls12_377_msm_g2(bases: Vec>, scalars: Vec>) -> Vec { + fn bls12_377_msm_g2(bases: Vec, scalars: Vec) -> Result, ()> { sp_arkworks::bls12_377::msm_g2(bases, scalars) } /// Compute a multi Miller loop on bw6_761 - fn bw6_761_multi_miller_loop(a: Vec>, b: Vec>) -> Result, ()> { + fn bw6_761_multi_miller_loop(a: Vec, b: Vec) -> Result, ()> { sp_arkworks::bw6_761::multi_miller_loop(a, b) } @@ -1236,77 +1236,77 @@ pub trait EllipticCurves { } /// Compute a projective multiplication on G1 for bw6_761 - fn bw6_761_mul_projective_g1(base: Vec, scalar: Vec) -> Vec { + fn bw6_761_mul_projective_g1(base: Vec, scalar: Vec) -> Result, ()> { sp_arkworks::bw6_761::mul_projective_g1(base, scalar) } /// Compute a projective multiplication on G2 for bw6_761 - fn bw6_761_mul_projective_g2(base: Vec, scalar: Vec) -> Vec { + fn bw6_761_mul_projective_g2(base: Vec, scalar: Vec) -> Result, ()> { sp_arkworks::bw6_761::mul_projective_g2(base, scalar) } /// Compute a affine multiplication on G1 for bw6_761 - fn bw6_761_mul_affine_g1(base: Vec, scalar: Vec) -> Vec { + fn bw6_761_mul_affine_g1(base: Vec, scalar: Vec) -> Result, ()> { sp_arkworks::bw6_761::mul_affine_g1(base, scalar) } /// Compute a affine multiplication on G2 for bw6_761 - fn bw6_761_mul_affine_g2(base: Vec, scalar: Vec) -> Vec { + fn bw6_761_mul_affine_g2(base: Vec, scalar: Vec) -> Result, ()> { sp_arkworks::bw6_761::mul_affine_g2(base, scalar) } /// Compute a msm on G1 for bw6_761 - fn bw6_761_msm_g1(bases: Vec>, bigints: Vec>) -> Vec { + fn bw6_761_msm_g1(bases: Vec, bigints: Vec) -> Result, ()> { sp_arkworks::bw6_761::msm_g1(bases, bigints) } /// Compute a msm on G2 for bw6_761 - fn bw6_761_msm_g2(bases: Vec>, bigints: Vec>) -> Vec { + fn bw6_761_msm_g2(bases: Vec, bigints: Vec) -> Result, ()> { sp_arkworks::bw6_761::msm_g2(bases, bigints) } /// Compute a short weierstrass affine multiplication on ed_on_bls12_381 - fn ed_on_bls12_381_sw_mul_affine(base: Vec, scalar: Vec) -> Vec { + fn ed_on_bls12_381_sw_mul_affine(base: Vec, scalar: Vec) -> Result, ()> { sp_arkworks::ed_on_bls12_381::sw_mul_affine(base, scalar) } /// Compute twisted edwards projective multiplication on ed_on_bls12_381 - fn ed_on_bls12_381_te_mul_projective(base: Vec, scalar: Vec) -> Vec { + fn ed_on_bls12_381_te_mul_projective(base: Vec, scalar: Vec) -> Result, ()> { sp_arkworks::ed_on_bls12_381::te_mul_projective(base, scalar) } /// Compute twisted edwards affine multiplication on ed_on_bls12_381 - fn ed_on_bls12_381_te_mul_affine(base: Vec, scalar: Vec) -> Vec { + fn ed_on_bls12_381_te_mul_affine(base: Vec, scalar: Vec) -> Result, ()> { sp_arkworks::ed_on_bls12_381::te_mul_affine(base, scalar) } /// Compute short weierstrass projective multiplication on ed_on_bls12_381 - fn ed_on_bls12_381_sw_mul_projective(base: Vec, scalar: Vec) -> Vec { + fn ed_on_bls12_381_sw_mul_projective(base: Vec, scalar: Vec) -> Result, ()> { sp_arkworks::ed_on_bls12_381::sw_mul_projective(base, scalar) } /// Compute twisted edwards msm on ed_on_bls12_381 - fn ed_on_bls12_381_te_msm(bases: Vec>, scalars: Vec>) -> Vec { + fn ed_on_bls12_381_te_msm(bases: Vec, scalars: Vec) -> Result, ()> { sp_arkworks::ed_on_bls12_381::te_msm(bases, scalars) } /// Compute short weierstrass msm on ed_on_bls12_381 - fn ed_on_bls12_381_sw_msm(bases: Vec>, scalars: Vec>) -> Vec { + fn ed_on_bls12_381_sw_msm(bases: Vec, scalars: Vec) -> Result, ()> { sp_arkworks::ed_on_bls12_381::sw_msm(bases, scalars) } /// Compute affine multiplication on ed_on_bls12_377 - fn ed_on_bls12_377_mul_affine(base: Vec, scalar: Vec) -> Vec { + fn ed_on_bls12_377_mul_affine(base: Vec, scalar: Vec) -> Result, ()> { sp_arkworks::ed_on_bls12_377::mul_affine(base, scalar) } /// Compute projective multiplication on ed_on_bls12_377 - fn ed_on_bls12_377_mul_projective(base: Vec, scalar: Vec) -> Vec { + fn ed_on_bls12_377_mul_projective(base: Vec, scalar: Vec) -> Result, ()> { sp_arkworks::ed_on_bls12_377::mul_projective(base, scalar) } /// Compute msm on ed_on_bls12_377 - fn ed_on_bls12_377_msm(bases: Vec>, scalars: Vec>) -> Vec { + fn ed_on_bls12_377_msm(bases: Vec, scalars: Vec) -> Result, ()> { sp_arkworks::ed_on_bls12_377::msm(bases, scalars) } }