diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4208b230a4a0..a6ebde20a866 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ variables: GIT_STRATEGY: fetch GIT_DEPTH: 100 CI_SERVER_NAME: "GitLab CI" - CI_IMAGE: "paritytech/ci-linux@sha256:7c76c3f9639f919447abbf9db535588178fde4df583d6926444d44cc20c094e6" # staging 2023-03-20 + CI_IMAGE: "paritytech/ci-linux:production" BUILDAH_IMAGE: "quay.io/buildah/stable:v1.27" DOCKER_OS: "debian:stretch" ARCH: "x86_64" diff --git a/Cargo.lock b/Cargo.lock index 11c0847f1a92..048a76afb9ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -270,7 +270,7 @@ checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "synstructure", ] @@ -282,7 +282,7 @@ checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "synstructure", ] @@ -294,7 +294,7 @@ checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -370,7 +370,7 @@ checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -436,6 +436,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + [[package]] name = "base58" version = "0.2.0" @@ -466,7 +472,7 @@ dependencies = [ [[package]] name = "binary-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "hash-db", "log", @@ -697,9 +703,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "bzip2-sys" @@ -959,7 +965,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1046,9 +1052,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "722e23542a15cea1f65d4a1419c4cfd7a26706c70871a13a04238ca3f40f1661" +checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" [[package]] name = "constant_time_eq" @@ -1355,6 +1361,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "crypto-bigint" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7" +dependencies = [ + "generic-array 0.14.6", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" version = "0.1.6" @@ -1402,7 +1420,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1486,7 +1504,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 1.0.109", ] [[package]] @@ -1503,7 +1521,7 @@ checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1527,7 +1545,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn", + "syn 1.0.109", ] [[package]] @@ -1538,7 +1556,7 @@ checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1564,7 +1582,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db" dependencies = [ "data-encoding", - "syn", + "syn 1.0.109", ] [[package]] @@ -1587,6 +1605,16 @@ dependencies = [ "zeroize", ] +[[package]] +name = "der" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc906908ea6458456e5eaa160a9c08543ec3d1e6f71e2235cedd660cb65f9df0" +dependencies = [ + "const-oid", + "zeroize", +] + [[package]] name = "der-parser" version = "7.0.0" @@ -1623,7 +1651,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1634,7 +1662,7 @@ checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1655,7 +1683,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1665,7 +1693,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" dependencies = [ "derive_builder_core", - "syn", + "syn 1.0.109", ] [[package]] @@ -1678,7 +1706,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn", + "syn 1.0.109", ] [[package]] @@ -1771,7 +1799,7 @@ checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1831,7 +1859,7 @@ checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1846,19 +1874,31 @@ version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ - "der", - "elliptic-curve", - "rfc6979", - "signature", + "der 0.6.0", + "elliptic-curve 0.12.3", + "rfc6979 0.3.1", + "signature 1.6.4", +] + +[[package]] +name = "ecdsa" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1b0a1222f8072619e8a6b667a854020a03d363738303203c09468b3424a420a" +dependencies = [ + "der 0.7.1", + "elliptic-curve 0.13.2", + "rfc6979 0.4.0", + "signature 2.0.0", ] [[package]] name = "ed25519" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ - "signature", + "signature 1.6.4", ] [[package]] @@ -1901,18 +1941,37 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ - "base16ct", - "crypto-bigint", - "der", + "base16ct 0.1.1", + "crypto-bigint 0.4.9", + "der 0.6.0", "digest 0.10.6", - "ff", + "ff 0.12.1", "generic-array 0.14.6", - "group", + "group 0.12.1", "hkdf", "pem-rfc7468", - "pkcs8", + "pkcs8 0.9.0", "rand_core 0.6.4", - "sec1", + "sec1 0.3.0", + "subtle", + "zeroize", +] + +[[package]] +name = "elliptic-curve" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea5a92946e8614bb585254898bb7dd1ddad241ace60c52149e3765e34cc039d" +dependencies = [ + "base16ct 0.2.0", + "crypto-bigint 0.5.1", + "digest 0.10.6", + "ff 0.13.0", + "generic-array 0.14.6", + "group 0.13.0", + "pkcs8 0.10.1", + "rand_core 0.6.4", + "sec1 0.7.1", "subtle", "zeroize", ] @@ -1935,7 +1994,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1955,7 +2014,7 @@ checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1966,7 +2025,7 @@ checksum = "038b1afa59052df211f9efd58f8b1d84c242935ede1c3dbaed26b018a9e06ae2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2074,7 +2133,7 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2087,7 +2146,7 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2142,7 +2201,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "thiserror", ] @@ -2181,6 +2240,16 @@ dependencies = [ "subtle", ] +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "file-per-thread-logger" version = "0.1.4" @@ -2295,7 +2364,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "parity-scale-codec", ] @@ -2318,7 +2387,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-support", "frame-support-procedural", @@ -2343,7 +2412,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "Inflector", "array-bytes", @@ -2390,18 +2459,18 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2418,7 +2487,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-support", "frame-system", @@ -2447,7 +2516,7 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "futures", "log", @@ -2463,7 +2532,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "bitflags", "environmental", @@ -2496,7 +2565,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "Inflector", "cfg-expr", @@ -2505,35 +2574,35 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -2557,7 +2626,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-support", "frame-system", @@ -2568,7 +2637,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-support", "log", @@ -2586,7 +2655,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -2601,7 +2670,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "parity-scale-codec", "sp-api", @@ -2610,7 +2679,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-support", "parity-scale-codec", @@ -2730,7 +2799,7 @@ checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2792,7 +2861,7 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "chrono", "frame-election-provider-support", @@ -2820,6 +2889,7 @@ checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] @@ -2929,7 +2999,18 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ - "ff", + "ff 0.12.1", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff 0.13.0", "rand_core 0.6.4", "subtle", ] @@ -3304,7 +3385,7 @@ checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3513,7 +3594,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3566,13 +3647,14 @@ dependencies = [ [[package]] name = "k256" -version = "0.11.6" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" +checksum = "955890845095ccf31ef83ad41a05aabb4d8cc23dc3cac5a9f5c89cf26dd0da75" dependencies = [ "cfg-if", - "ecdsa", - "elliptic-curve", + "ecdsa 0.16.1", + "elliptic-curve 0.13.2", + "once_cell", "sha2 0.10.2", ] @@ -3847,7 +3929,7 @@ dependencies = [ "prost-build", "rand 0.8.5", "rw-stream-sink", - "sec1", + "sec1 0.3.0", "sha2 0.10.2", "smallvec", "thiserror", @@ -4079,7 +4161,7 @@ checksum = "9d527d5827582abd44a6d80c07ff8b50b4ee238a8979e05998474179e79dc400" dependencies = [ "heck", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4571,7 +4653,7 @@ dependencies = [ [[package]] name = "mmr-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "futures", "log", @@ -4590,7 +4672,7 @@ dependencies = [ [[package]] name = "mmr-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "anyhow", "jsonrpsee", @@ -4627,7 +4709,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4686,7 +4768,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "synstructure", ] @@ -4734,7 +4816,7 @@ checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -5094,7 +5176,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -5133,8 +5215,8 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ - "ecdsa", - "elliptic-curve", + "ecdsa 0.14.8", + "elliptic-curve 0.12.3", "sha2 0.10.2", ] @@ -5144,15 +5226,15 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" dependencies = [ - "ecdsa", - "elliptic-curve", + "ecdsa 0.14.8", + "elliptic-curve 0.12.3", "sha2 0.10.2", ] [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5167,7 +5249,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-support", "frame-system", @@ -5183,7 +5265,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-support", "frame-system", @@ -5197,7 +5279,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5221,7 +5303,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5241,7 +5323,7 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-election-provider-support", "frame-remote-externalities", @@ -5260,7 +5342,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5275,7 +5357,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-support", "frame-system", @@ -5294,7 +5376,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "array-bytes", "binary-merkle-tree", @@ -5318,7 +5400,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5336,7 +5418,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5355,7 +5437,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5372,7 +5454,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "assert_matches", "frame-benchmarking", @@ -5389,7 +5471,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5407,7 +5489,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5430,7 +5512,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5443,7 +5525,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5461,7 +5543,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5479,7 +5561,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5502,7 +5584,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5518,7 +5600,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5538,7 +5620,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5555,7 +5637,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5572,7 +5654,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5589,7 +5671,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5605,7 +5687,7 @@ dependencies = [ [[package]] name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5621,7 +5703,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-support", "frame-system", @@ -5638,7 +5720,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5658,7 +5740,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", @@ -5669,7 +5751,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-support", "frame-system", @@ -5686,7 +5768,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5710,7 +5792,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5727,7 +5809,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5742,7 +5824,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5760,7 +5842,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5775,7 +5857,7 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "assert_matches", "frame-benchmarking", @@ -5794,7 +5876,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5811,7 +5893,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-support", "frame-system", @@ -5832,7 +5914,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5848,7 +5930,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-support", "frame-system", @@ -5862,7 +5944,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5885,18 +5967,18 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "log", "sp-arithmetic", @@ -5905,7 +5987,7 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "parity-scale-codec", "sp-api", @@ -5914,7 +5996,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5931,7 +6013,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-support", "frame-system", @@ -5945,7 +6027,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5963,7 +6045,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -5982,7 +6064,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-support", "frame-system", @@ -5998,7 +6080,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -6014,7 +6096,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6026,7 +6108,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -6043,7 +6125,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -6058,7 +6140,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -6074,7 +6156,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -6089,7 +6171,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-benchmarking", "frame-support", @@ -6172,9 +6254,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3840933452adf7b3b9145e27086a5a3376c619dca1a21b1e5a5af0d54979bed" +checksum = "637935964ff85a605d114591d4d2c13c5d1ba2806dae97cea6bf180238a749ac" dependencies = [ "arrayvec 0.7.2", "bitvec", @@ -6194,7 +6276,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -6346,7 +6428,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -6387,7 +6469,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -6414,8 +6496,18 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" dependencies = [ - "der", - "spki", + "der 0.6.0", + "spki 0.6.0", +] + +[[package]] +name = "pkcs8" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d2820d87d2b008616e5c27212dd9e0e694fb4c6b522de06094106813328cb49" +dependencies = [ + "der 0.7.1", + "spki 0.7.0", ] [[package]] @@ -8128,12 +8220,12 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.1.3" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ - "thiserror", - "toml", + "once_cell", + "toml_edit", ] [[package]] @@ -8145,7 +8237,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -8162,9 +8254,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.51" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" dependencies = [ "unicode-ident", ] @@ -8203,7 +8295,7 @@ checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -8270,7 +8362,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -8348,9 +8440,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.23" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -8546,7 +8638,7 @@ checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -8680,11 +8772,21 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ - "crypto-bigint", + "crypto-bigint 0.4.9", "hmac 0.12.1", "zeroize", ] +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac 0.12.1", + "subtle", +] + [[package]] name = "ring" version = "0.16.20" @@ -9020,7 +9122,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "log", "sp-core", @@ -9031,7 +9133,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "async-trait", "futures", @@ -9059,7 +9161,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "futures", "futures-timer", @@ -9082,7 +9184,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -9097,7 +9199,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -9116,18 +9218,18 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "array-bytes", "chrono", @@ -9167,7 +9269,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "fnv", "futures", @@ -9193,7 +9295,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "hash-db", "kvdb", @@ -9219,7 +9321,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "async-trait", "futures", @@ -9244,7 +9346,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "async-trait", "fork-tree", @@ -9283,7 +9385,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "futures", "jsonrpsee", @@ -9305,7 +9407,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "array-bytes", "async-trait", @@ -9340,7 +9442,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "futures", "jsonrpsee", @@ -9359,7 +9461,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9372,7 +9474,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "ahash 0.8.2", "array-bytes", @@ -9412,7 +9514,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "finality-grandpa", "futures", @@ -9432,7 +9534,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "async-trait", "futures", @@ -9455,7 +9557,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "lru 0.8.1", "parity-scale-codec", @@ -9479,7 +9581,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -9492,7 +9594,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "log", "sc-allocator", @@ -9505,7 +9607,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "anyhow", "cfg-if", @@ -9523,7 +9625,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "ansi_term", "futures", @@ -9539,7 +9641,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "array-bytes", "async-trait", @@ -9554,7 +9656,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "array-bytes", "async-channel", @@ -9598,7 +9700,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "cid", "futures", @@ -9618,7 +9720,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "array-bytes", "async-trait", @@ -9646,7 +9748,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "ahash 0.8.2", "futures", @@ -9665,7 +9767,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "array-bytes", "futures", @@ -9687,7 +9789,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "array-bytes", "async-trait", @@ -9721,7 +9823,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "array-bytes", "futures", @@ -9741,7 +9843,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "array-bytes", "bytes", @@ -9772,7 +9874,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "futures", "libp2p", @@ -9785,7 +9887,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9794,7 +9896,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "futures", "jsonrpsee", @@ -9824,7 +9926,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -9843,7 +9945,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "http", "jsonrpsee", @@ -9858,7 +9960,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "array-bytes", "futures", @@ -9884,7 +9986,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "async-trait", "directories", @@ -9950,7 +10052,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "log", "parity-scale-codec", @@ -9961,7 +10063,7 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "clap 4.0.15", "fs4", @@ -9977,7 +10079,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -9996,7 +10098,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "futures", "libc", @@ -10015,7 +10117,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "chrono", "futures", @@ -10034,7 +10136,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "ansi_term", "atty", @@ -10065,18 +10167,18 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "async-trait", "futures", @@ -10103,7 +10205,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "async-trait", "futures", @@ -10117,7 +10219,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "async-channel", "futures", @@ -10152,7 +10254,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -10244,10 +10346,24 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ - "base16ct", - "der", + "base16ct 0.1.1", + "der 0.6.0", "generic-array 0.14.6", - "pkcs8", + "pkcs8 0.9.0", + "subtle", + "zeroize", +] + +[[package]] +name = "sec1" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e" +dependencies = [ + "base16ct 0.2.0", + "der 0.7.1", + "generic-array 0.14.6", + "pkcs8 0.10.1", "subtle", "zeroize", ] @@ -10334,22 +10450,22 @@ checksum = "f97841a747eef040fcd2e7b3b9a220a7205926e60488e673d9e4926d27772ce5" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.8", ] [[package]] @@ -10522,6 +10638,16 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "signature" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d" +dependencies = [ + "digest 0.10.6", + "rand_core 0.6.4", +] + [[package]] name = "simba" version = "0.8.0" @@ -10632,7 +10758,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "hash-db", "log", @@ -10650,7 +10776,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "Inflector", "blake2", @@ -10658,13 +10784,13 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "parity-scale-codec", "scale-info", @@ -10677,7 +10803,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "integer-sqrt", "num-traits", @@ -10691,7 +10817,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "parity-scale-codec", "scale-info", @@ -10704,7 +10830,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "parity-scale-codec", "sp-api", @@ -10716,7 +10842,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "futures", "log", @@ -10734,7 +10860,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "async-trait", "futures", @@ -10749,7 +10875,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "async-trait", "parity-scale-codec", @@ -10767,7 +10893,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "async-trait", "merlin", @@ -10790,7 +10916,7 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "lazy_static", "parity-scale-codec", @@ -10809,7 +10935,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "finality-grandpa", "log", @@ -10827,7 +10953,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "parity-scale-codec", "scale-info", @@ -10839,7 +10965,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "parity-scale-codec", "scale-info", @@ -10852,7 +10978,7 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "array-bytes", "base58", @@ -10895,7 +11021,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "blake2b_simd", "byteorder", @@ -10909,18 +11035,18 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "proc-macro2", "quote", "sp-core-hashing", - "syn", + "syn 1.0.109", ] [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -10929,17 +11055,17 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "environmental", "parity-scale-codec", @@ -10950,7 +11076,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10965,7 +11091,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "bytes", "ed25519", @@ -10990,7 +11116,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "lazy_static", "sp-core", @@ -11001,7 +11127,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "futures", "merlin", @@ -11017,7 +11143,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "thiserror", "zstd", @@ -11026,7 +11152,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -11044,7 +11170,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "parity-scale-codec", "scale-info", @@ -11058,7 +11184,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "sp-api", "sp-core", @@ -11068,7 +11194,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "backtrace", "lazy_static", @@ -11078,7 +11204,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "rustc-hash", "serde", @@ -11088,7 +11214,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "either", "hash256-std-hasher", @@ -11110,7 +11236,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -11128,19 +11254,19 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "parity-scale-codec", "scale-info", @@ -11154,7 +11280,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "parity-scale-codec", "scale-info", @@ -11166,7 +11292,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "hash-db", "log", @@ -11186,12 +11312,12 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11204,7 +11330,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "async-trait", "futures-timer", @@ -11219,7 +11345,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "parity-scale-codec", "sp-std", @@ -11231,7 +11357,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "sp-api", "sp-runtime", @@ -11240,7 +11366,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "async-trait", "log", @@ -11256,7 +11382,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "ahash 0.8.2", "hash-db", @@ -11279,7 +11405,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11296,18 +11422,18 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -11321,7 +11447,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "parity-scale-codec", "scale-info", @@ -11346,7 +11472,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" dependencies = [ "base64ct", - "der", + "der 0.6.0", +] + +[[package]] +name = "spki" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0445c905640145c7ea8c1993555957f65e7c46d0535b91ba501bc9bfc85522f" +dependencies = [ + "base64ct", + "der 0.7.1", ] [[package]] @@ -11454,7 +11590,7 @@ dependencies = [ "memchr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -11467,7 +11603,7 @@ dependencies = [ "memchr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -11495,7 +11631,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.109", ] [[package]] @@ -11541,7 +11677,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "platforms", ] @@ -11549,7 +11685,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -11568,7 +11704,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "hyper", "log", @@ -11580,7 +11716,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "async-trait", "jsonrpsee", @@ -11593,7 +11729,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "jsonrpsee", "log", @@ -11612,7 +11748,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "array-bytes", "async-trait", @@ -11638,7 +11774,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "futures", "substrate-test-utils-derive", @@ -11648,18 +11784,18 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "ansi_term", "build-helper", @@ -11731,6 +11867,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "synstructure" version = "0.12.6" @@ -11739,7 +11886,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "unicode-xid", ] @@ -11923,22 +12070,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.8", ] [[package]] @@ -12129,7 +12276,7 @@ checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -12207,13 +12354,30 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" + +[[package]] +name = "toml_edit" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + [[package]] name = "tower" version = "0.4.13" @@ -12276,7 +12440,7 @@ checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -12318,7 +12482,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -12460,7 +12624,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#9d2d020c5134d8c7870396cb04bca63a674abfd5" +source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" dependencies = [ "async-trait", "clap 4.0.15", @@ -12598,9 +12762,9 @@ checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" [[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" @@ -12807,7 +12971,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] @@ -12841,7 +13005,7 @@ checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -13250,7 +13414,7 @@ dependencies = [ "ccm", "curve25519-dalek 3.2.0", "der-parser 8.1.0", - "elliptic-curve", + "elliptic-curve 0.12.3", "hkdf", "hmac 0.10.1", "log", @@ -13262,11 +13426,11 @@ dependencies = [ "rcgen 0.9.3", "ring", "rustls 0.19.1", - "sec1", + "sec1 0.3.0", "serde", "sha-1 0.9.8", "sha2 0.9.8", - "signature", + "signature 1.6.4", "subtle", "thiserror", "tokio", @@ -13711,6 +13875,15 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +[[package]] +name = "winnow" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deac0939bd6e4f24ab5919fbf751c97a8cfc8543bb083a305ed5c0c10bb241d1" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.7.0" @@ -13731,9 +13904,9 @@ dependencies = [ [[package]] name = "wyz" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] @@ -13886,7 +14059,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -13996,7 +14169,7 @@ checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "synstructure", ] diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml index a03c71847c6b..7ebc8b389c9c 100644 --- a/core-primitives/Cargo.toml +++ b/core-primitives/Cargo.toml @@ -9,7 +9,7 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } -parity-scale-codec = { version = "3.3.0", default-features = false, features = [ "derive" ] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = [ "derive" ] } [features] default = [ "std" ] diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml index b38bc13d8028..d7a9236b93cd 100644 --- a/erasure-coding/Cargo.toml +++ b/erasure-coding/Cargo.toml @@ -8,7 +8,7 @@ edition.workspace = true polkadot-primitives = { path = "../primitives" } polkadot-node-primitives = { package = "polkadot-node-primitives", path = "../node/primitives" } novelpoly = { package = "reed-solomon-novelpoly", version = "1.0.0" } -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["std", "derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["std", "derive"] } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } thiserror = "1.0.31" diff --git a/node/collation-generation/Cargo.toml b/node/collation-generation/Cargo.toml index 5ec843b224ec..68410c2cecbe 100644 --- a/node/collation-generation/Cargo.toml +++ b/node/collation-generation/Cargo.toml @@ -15,7 +15,7 @@ polkadot-primitives = { path = "../../primitives" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "master" } thiserror = "1.0.31" -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["bit-vec", "derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["bit-vec", "derive"] } [dev-dependencies] polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" } diff --git a/node/core/approval-voting/Cargo.toml b/node/core/approval-voting/Cargo.toml index 5264c9f335cb..e35a3610b82e 100644 --- a/node/core/approval-voting/Cargo.toml +++ b/node/core/approval-voting/Cargo.toml @@ -7,7 +7,7 @@ edition.workspace = true [dependencies] futures = "0.3.21" futures-timer = "3.0.2" -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["bit-vec", "derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["bit-vec", "derive"] } gum = { package = "tracing-gum", path = "../../gum" } bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } lru = "0.9" diff --git a/node/core/av-store/Cargo.toml b/node/core/av-store/Cargo.toml index 2f1637cd6ec3..4f47ac14539d 100644 --- a/node/core/av-store/Cargo.toml +++ b/node/core/av-store/Cargo.toml @@ -12,7 +12,7 @@ thiserror = "1.0.31" gum = { package = "tracing-gum", path = "../../gum" } bitvec = "1.0.0" -parity-scale-codec = { version = "3.3.0", features = ["derive"] } +parity-scale-codec = { version = "3.4.0", features = ["derive"] } erasure = { package = "polkadot-erasure-coding", path = "../../../erasure-coding" } polkadot-node-subsystem = {path = "../../subsystem" } polkadot-node-subsystem-util = { path = "../../subsystem-util" } diff --git a/node/core/backing/src/error.rs b/node/core/backing/src/error.rs index 36d4f859a0a8..bbe89c0afcb9 100644 --- a/node/core/backing/src/error.rs +++ b/node/core/backing/src/error.rs @@ -70,6 +70,10 @@ pub enum Error { #[error(transparent)] SubsystemError(#[from] SubsystemError), + + #[fatal] + #[error(transparent)] + OverseerExited(SubsystemError), } /// Utility for eating top level errors and log them. diff --git a/node/core/backing/src/lib.rs b/node/core/backing/src/lib.rs index 32a6bb79037b..078eb1d8d618 100644 --- a/node/core/backing/src/lib.rs +++ b/node/core/backing/src/lib.rs @@ -199,7 +199,8 @@ async fn run_iteration( } } from_overseer = ctx.recv().fuse() => { - match from_overseer? { + // Map the error to ensure that the subsystem exits when the overseer is gone. + match from_overseer.map_err(Error::OverseerExited)? { FromOrchestra::Signal(OverseerSignal::ActiveLeaves(update)) => handle_active_leaves_update( &mut *ctx, update, diff --git a/node/core/candidate-validation/Cargo.toml b/node/core/candidate-validation/Cargo.toml index e46d44033bad..18826f7e2376 100644 --- a/node/core/candidate-validation/Cargo.toml +++ b/node/core/candidate-validation/Cargo.toml @@ -11,7 +11,7 @@ futures-timer = "3.0.2" gum = { package = "tracing-gum", path = "../../gum" } sp-maybe-compressed-blob = { package = "sp-maybe-compressed-blob", git = "https://github.com/paritytech/substrate", branch = "master" } -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["bit-vec", "derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["bit-vec", "derive"] } polkadot-primitives = { path = "../../../primitives" } polkadot-parachain = { path = "../../../parachain" } diff --git a/node/core/chain-api/Cargo.toml b/node/core/chain-api/Cargo.toml index f8f378f87f22..5051e96c6352 100644 --- a/node/core/chain-api/Cargo.toml +++ b/node/core/chain-api/Cargo.toml @@ -17,7 +17,7 @@ sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = [dev-dependencies] futures = { version = "0.3.21", features = ["thread-pool"] } maplit = "1.0.2" -parity-scale-codec = "3.3.0" +parity-scale-codec = "3.4.0" polkadot-node-primitives = { path = "../../primitives" } polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/core/chain-selection/Cargo.toml b/node/core/chain-selection/Cargo.toml index 3a5e360f8990..750b0b5976bb 100644 --- a/node/core/chain-selection/Cargo.toml +++ b/node/core/chain-selection/Cargo.toml @@ -15,7 +15,7 @@ polkadot-node-subsystem = { path = "../../subsystem" } polkadot-node-subsystem-util = { path = "../../subsystem-util" } kvdb = "0.13.0" thiserror = "1.0.31" -parity-scale-codec = "3.3.0" +parity-scale-codec = "3.4.0" [dev-dependencies] polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } diff --git a/node/core/dispute-coordinator/Cargo.toml b/node/core/dispute-coordinator/Cargo.toml index 128c59a02230..c6f5b6d2f362 100644 --- a/node/core/dispute-coordinator/Cargo.toml +++ b/node/core/dispute-coordinator/Cargo.toml @@ -7,7 +7,7 @@ edition.workspace = true [dependencies] futures = "0.3.21" gum = { package = "tracing-gum", path = "../../gum" } -parity-scale-codec = "3.3.0" +parity-scale-codec = "3.4.0" kvdb = "0.13.0" thiserror = "1.0.31" lru = "0.9.0" diff --git a/node/core/provisioner/src/error.rs b/node/core/provisioner/src/error.rs index de520fc1fe04..c049a326a735 100644 --- a/node/core/provisioner/src/error.rs +++ b/node/core/provisioner/src/error.rs @@ -75,6 +75,10 @@ pub enum Error { #[error(transparent)] SubsystemError(#[from] SubsystemError), + + #[fatal] + #[error(transparent)] + OverseerExited(SubsystemError), } /// Used by `get_onchain_disputes` to represent errors related to fetching on-chain disputes from the Runtime diff --git a/node/core/provisioner/src/lib.rs b/node/core/provisioner/src/lib.rs index be0b051a107c..0c9853e90191 100644 --- a/node/core/provisioner/src/lib.rs +++ b/node/core/provisioner/src/lib.rs @@ -144,7 +144,8 @@ async fn run_iteration( loop { futures::select! { from_overseer = ctx.recv().fuse() => { - match from_overseer? { + // Map the error to ensure that the subsystem exits when the overseer is gone. + match from_overseer.map_err(Error::OverseerExited)? { FromOrchestra::Signal(OverseerSignal::ActiveLeaves(update)) => handle_active_leaves_update(update, per_relay_parent, inherent_delays), FromOrchestra::Signal(OverseerSignal::BlockFinalized(..)) => {}, diff --git a/node/core/pvf/Cargo.toml b/node/core/pvf/Cargo.toml index a810c3887c96..b6c56c65951b 100644 --- a/node/core/pvf/Cargo.toml +++ b/node/core/pvf/Cargo.toml @@ -23,7 +23,7 @@ tempfile = "3.3.0" tikv-jemalloc-ctl = { version = "0.5.0", optional = true } tokio = { version = "1.24.2", features = ["fs", "process"] } -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } polkadot-parachain = { path = "../../../parachain" } polkadot-core-primitives = { path = "../../../core-primitives" } diff --git a/node/jaeger/Cargo.toml b/node/jaeger/Cargo.toml index 8d851977a910..fccdaff79a4e 100644 --- a/node/jaeger/Cargo.toml +++ b/node/jaeger/Cargo.toml @@ -16,4 +16,4 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } thiserror = "1.0.31" tokio = "1.24.2" log = "0.4.17" -parity-scale-codec = { version = "3.3.0", default-features = false } +parity-scale-codec = { version = "3.4.0", default-features = false } diff --git a/node/metrics/Cargo.toml b/node/metrics/Cargo.toml index 8a6938190887..ced0fbb315b0 100644 --- a/node/metrics/Cargo.toml +++ b/node/metrics/Cargo.toml @@ -18,7 +18,7 @@ sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" } -codec = { package = "parity-scale-codec", version = "3.3.0" } +codec = { package = "parity-scale-codec", version = "3.4.0" } primitives = { package = "polkadot-primitives", path = "../../primitives/" } bs58 = { version = "0.4.0", features = ["alloc"] } log = "0.4.17" diff --git a/node/network/availability-distribution/Cargo.toml b/node/network/availability-distribution/Cargo.toml index a2ffd82bb005..3cb5fdbef9c7 100644 --- a/node/network/availability-distribution/Cargo.toml +++ b/node/network/availability-distribution/Cargo.toml @@ -7,7 +7,7 @@ edition.workspace = true [dependencies] futures = "0.3.21" gum = { package = "tracing-gum", path = "../../gum" } -parity-scale-codec = { version = "3.3.0", features = ["std"] } +parity-scale-codec = { version = "3.4.0", features = ["std"] } polkadot-primitives = { path = "../../../primitives" } polkadot-erasure-coding = { path = "../../../erasure-coding" } polkadot-node-network-protocol = { path = "../../network/protocol" } diff --git a/node/network/availability-recovery/Cargo.toml b/node/network/availability-recovery/Cargo.toml index f43205bfe1b2..9107fec17d7f 100644 --- a/node/network/availability-recovery/Cargo.toml +++ b/node/network/availability-recovery/Cargo.toml @@ -18,7 +18,7 @@ polkadot-node-primitives = { path = "../../primitives" } polkadot-node-subsystem = {path = "../../subsystem" } polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-network-protocol = { path = "../../network/protocol" } -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] diff --git a/node/network/bridge/Cargo.toml b/node/network/bridge/Cargo.toml index a91918af2647..bba32588b275 100644 --- a/node/network/bridge/Cargo.toml +++ b/node/network/bridge/Cargo.toml @@ -10,7 +10,7 @@ async-trait = "0.1.57" futures = "0.3.21" gum = { package = "tracing-gum", path = "../../gum" } polkadot-primitives = { path = "../../../primitives" } -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-node-metrics = { path = "../../metrics"} diff --git a/node/network/collator-protocol/Cargo.toml b/node/network/collator-protocol/Cargo.toml index 2e28299ade6a..7eea0a0972e9 100644 --- a/node/network/collator-protocol/Cargo.toml +++ b/node/network/collator-protocol/Cargo.toml @@ -31,7 +31,7 @@ assert_matches = "1.4.0" sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] } sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -parity-scale-codec = { version = "3.3.0", features = ["std"] } +parity-scale-codec = { version = "3.4.0", features = ["std"] } polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } polkadot-primitives-test-helpers = { path = "../../../primitives/test-helpers" } diff --git a/node/network/dispute-distribution/Cargo.toml b/node/network/dispute-distribution/Cargo.toml index 9f973994c6b1..3e5dc7e44b6a 100644 --- a/node/network/dispute-distribution/Cargo.toml +++ b/node/network/dispute-distribution/Cargo.toml @@ -9,7 +9,7 @@ futures = "0.3.21" futures-timer = "3.0.2" gum = { package = "tracing-gum", path = "../../gum" } derive_more = "0.99.17" -parity-scale-codec = { version = "3.3.0", features = ["std"] } +parity-scale-codec = { version = "3.4.0", features = ["std"] } polkadot-primitives = { path = "../../../primitives" } polkadot-erasure-coding = { path = "../../../erasure-coding" } polkadot-node-subsystem = {path = "../../subsystem" } diff --git a/node/network/protocol/Cargo.toml b/node/network/protocol/Cargo.toml index 4b015619260f..94f13aba67db 100644 --- a/node/network/protocol/Cargo.toml +++ b/node/network/protocol/Cargo.toml @@ -11,7 +11,7 @@ hex = "0.4.3" polkadot-primitives = { path = "../../../primitives" } polkadot-node-primitives = { path = "../../primitives" } polkadot-node-jaeger = { path = "../../jaeger" } -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" } strum = { version = "0.24", features = ["derive"] } diff --git a/node/network/statement-distribution/Cargo.toml b/node/network/statement-distribution/Cargo.toml index 5dcb2a75d3f5..7ca5fe1624cb 100644 --- a/node/network/statement-distribution/Cargo.toml +++ b/node/network/statement-distribution/Cargo.toml @@ -17,7 +17,7 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-network-protocol = { path = "../../network/protocol" } arrayvec = "0.5.2" indexmap = "1.9.1" -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } thiserror = "1.0.31" fatality = "0.0.6" diff --git a/node/primitives/Cargo.toml b/node/primitives/Cargo.toml index 9b165a2e7330..196230014908 100644 --- a/node/primitives/Cargo.toml +++ b/node/primitives/Cargo.toml @@ -9,7 +9,7 @@ edition.workspace = true bounded-vec = "0.7" futures = "0.3.21" polkadot-primitives = { path = "../../primitives" } -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-consensus-vrf = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/subsystem-util/Cargo.toml b/node/subsystem-util/Cargo.toml index 983061e6a52a..3dc2270970c9 100644 --- a/node/subsystem-util/Cargo.toml +++ b/node/subsystem-util/Cargo.toml @@ -10,7 +10,7 @@ async-trait = "0.1.57" futures = "0.3.21" futures-channel = "0.3.23" itertools = "0.10" -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } parking_lot = "0.11.2" pin-project = "1.0.9" rand = "0.8.5" diff --git a/node/test/client/Cargo.toml b/node/test/client/Cargo.toml index 09ec4e81dc81..950662a8c72c 100644 --- a/node/test/client/Cargo.toml +++ b/node/test/client/Cargo.toml @@ -5,7 +5,7 @@ authors.workspace = true edition.workspace = true [dependencies] -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } # Polkadot dependencies polkadot-test-runtime = { path = "../../../runtime/test-runtime" } diff --git a/node/zombienet-backchannel/Cargo.toml b/node/zombienet-backchannel/Cargo.toml index 05c08501d0bd..cd48ed4601ed 100644 --- a/node/zombienet-backchannel/Cargo.toml +++ b/node/zombienet-backchannel/Cargo.toml @@ -14,7 +14,7 @@ url = "2.3.1" tokio-tungstenite = "0.17" futures-util = "0.3.23" lazy_static = "1.4.0" -parity-scale-codec = { version = "3.3.0", features = ["derive"] } +parity-scale-codec = { version = "3.4.0", features = ["derive"] } reqwest = "0.11" thiserror = "1.0.31" gum = { package = "tracing-gum", path = "../gum/" } diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml index 3e750e9df3b9..3a58843ad0ad 100644 --- a/parachain/Cargo.toml +++ b/parachain/Cargo.toml @@ -9,7 +9,7 @@ version.workspace = true # note: special care is taken to avoid inclusion of `sp-io` externals when compiling # this crate for WASM. This is critical to avoid forcing all parachain WASM into implementing # various unnecessary Substrate-specific endpoints. -parity-scale-codec = { version = "3.3.0", default-features = false, features = [ "derive" ] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = [ "derive" ] } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } diff --git a/parachain/test-parachains/Cargo.toml b/parachain/test-parachains/Cargo.toml index 5970c797bcf1..3065d682e9f9 100644 --- a/parachain/test-parachains/Cargo.toml +++ b/parachain/test-parachains/Cargo.toml @@ -7,7 +7,7 @@ edition.workspace = true [dependencies] tiny-keccak = { version = "2.0.2", features = ["keccak"] } -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } adder = { package = "test-parachain-adder", path = "adder" } halt = { package = "test-parachain-halt", path = "halt" } diff --git a/parachain/test-parachains/adder/Cargo.toml b/parachain/test-parachains/adder/Cargo.toml index 8edebc0d8633..fc48e056134f 100644 --- a/parachain/test-parachains/adder/Cargo.toml +++ b/parachain/test-parachains/adder/Cargo.toml @@ -8,7 +8,7 @@ authors.workspace = true [dependencies] parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] } -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } tiny-keccak = { version = "2.0.2", features = ["keccak"] } dlmalloc = { version = "0.2.4", features = [ "global" ] } diff --git a/parachain/test-parachains/adder/collator/Cargo.toml b/parachain/test-parachains/adder/collator/Cargo.toml index 5db446a9c395..7fe4aefc688d 100644 --- a/parachain/test-parachains/adder/collator/Cargo.toml +++ b/parachain/test-parachains/adder/collator/Cargo.toml @@ -14,7 +14,7 @@ name = "adder_collator_puppet_worker" path = "bin/puppet_worker.rs" [dependencies] -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } clap = { version = "4.0.9", features = ["derive"] } futures = "0.3.21" futures-timer = "3.0.2" diff --git a/parachain/test-parachains/undying/Cargo.toml b/parachain/test-parachains/undying/Cargo.toml index 20b0ec933f99..848e48ec623b 100644 --- a/parachain/test-parachains/undying/Cargo.toml +++ b/parachain/test-parachains/undying/Cargo.toml @@ -8,7 +8,7 @@ edition.workspace = true [dependencies] parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] } -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } tiny-keccak = { version = "2.0.2", features = ["keccak"] } dlmalloc = { version = "0.2.4", features = [ "global" ] } diff --git a/parachain/test-parachains/undying/collator/Cargo.toml b/parachain/test-parachains/undying/collator/Cargo.toml index 8d3c3ddf0ec5..2b9d80401f5d 100644 --- a/parachain/test-parachains/undying/collator/Cargo.toml +++ b/parachain/test-parachains/undying/collator/Cargo.toml @@ -14,7 +14,7 @@ name = "undying_collator_puppet_worker" path = "bin/puppet_worker.rs" [dependencies] -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } clap = { version = "4.0.9", features = ["derive"] } futures = "0.3.19" futures-timer = "3.0.2" diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index dc4b2e059a46..8fa54543c28d 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -7,7 +7,7 @@ edition.workspace = true [dependencies] bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } hex-literal = "0.3.4" -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["bit-vec", "derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["bit-vec", "derive"] } scale-info = { version = "2.1.2", default-features = false, features = ["bit-vec", "derive"] } serde = { version = "1.0.137", optional = true, features = ["derive"] } diff --git a/primitives/src/v4/mod.rs b/primitives/src/v4/mod.rs index efd6db836c21..4319aba53e1d 100644 --- a/primitives/src/v4/mod.rs +++ b/primitives/src/v4/mod.rs @@ -1609,13 +1609,13 @@ where /// The maximum number of validators `f` which may safely be faulty. /// /// The total number of validators is `n = 3f + e` where `e in { 1, 2, 3 }`. -pub fn byzantine_threshold(n: usize) -> usize { +pub const fn byzantine_threshold(n: usize) -> usize { n.saturating_sub(1) / 3 } /// The supermajority threshold of validators which represents a subset /// guaranteed to have at least f+1 honest validators. -pub fn supermajority_threshold(n: usize) -> usize { +pub const fn supermajority_threshold(n: usize) -> usize { n - byzantine_threshold(n) } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 881f0cc9ccbd..b8738a36f85e 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -7,7 +7,7 @@ edition.workspace = true [dependencies] impl-trait-for-tuples = "0.2.2" bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } log = { version = "0.4.17", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } diff --git a/runtime/common/slot_range_helper/Cargo.toml b/runtime/common/slot_range_helper/Cargo.toml index e76002436cf1..fabc73f664ae 100644 --- a/runtime/common/slot_range_helper/Cargo.toml +++ b/runtime/common/slot_range_helper/Cargo.toml @@ -7,7 +7,7 @@ edition.workspace = true [dependencies] paste = "1.0" enumn = "0.1.5" -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index 91fdad9c4c8f..7d944090dfa5 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -7,7 +7,7 @@ edition.workspace = true [dependencies] bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive", "max-encoded-len"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } log = { version = "0.4.17", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 3101feb24483..626e439eb48c 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -2107,6 +2107,12 @@ sp_api::impl_runtime_apis! { // Kusama doesn't support asset locking Err(BenchmarkError::Skip) } + + fn export_message_origin_and_destination( + ) -> Result<(MultiLocation, NetworkId, InteriorMultiLocation), BenchmarkError> { + // Kusama doesn't support exporting messages + Err(BenchmarkError::Skip) + } } let whitelist: Vec = vec![ diff --git a/runtime/kusama/src/weights/xcm/mod.rs b/runtime/kusama/src/weights/xcm/mod.rs index 1a3630ac243e..09c6bfa3a37a 100644 --- a/runtime/kusama/src/weights/xcm/mod.rs +++ b/runtime/kusama/src/weights/xcm/mod.rs @@ -243,7 +243,8 @@ impl XcmWeightInfo for KusamaXcmWeight { Weight::MAX } fn export_message(_: &NetworkId, _: &Junctions, _: &Xcm<()>) -> Weight { - Weight::MAX // todo fix + // Kusama relay should not support export message operations + Weight::MAX } fn lock_asset(_: &MultiAsset, _: &MultiLocation) -> Weight { // Kusama does not currently support asset locking operations diff --git a/runtime/kusama/src/xcm_config.rs b/runtime/kusama/src/xcm_config.rs index 06bb829b042b..5a8495ca7998 100644 --- a/runtime/kusama/src/xcm_config.rs +++ b/runtime/kusama/src/xcm_config.rs @@ -25,6 +25,7 @@ use frame_support::{ traits::{Contains, Everything, Nothing}, weights::Weight, }; +use frame_system::EnsureRoot; use runtime_common::{paras_registrar, xcm_sender, ToAuthor}; use sp_core::ConstU32; use xcm::latest::prelude::*; @@ -398,6 +399,7 @@ impl pallet_xcm::Config for Runtime { type WeightInfo = crate::weights::pallet_xcm::WeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; + type AdminOrigin = EnsureRoot; } #[test] diff --git a/runtime/metrics/Cargo.toml b/runtime/metrics/Cargo.toml index 598fb62f36f0..ada3398313c6 100644 --- a/runtime/metrics/Cargo.toml +++ b/runtime/metrics/Cargo.toml @@ -7,7 +7,7 @@ edition.workspace = true [dependencies] sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false} sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -parity-scale-codec = { version = "3.3.0", default-features = false } +parity-scale-codec = { version = "3.4.0", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } bs58 = { version = "0.4.0", default-features = false, features = ["alloc"] } diff --git a/runtime/parachains/Cargo.toml b/runtime/parachains/Cargo.toml index 2bd485c7fa55..2b71e583c738 100644 --- a/runtime/parachains/Cargo.toml +++ b/runtime/parachains/Cargo.toml @@ -6,7 +6,7 @@ edition.workspace = true [dependencies] bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive", "max-encoded-len"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive", "max-encoded-len"] } log = { version = "0.4.17", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } diff --git a/runtime/parachains/src/inclusion/mod.rs b/runtime/parachains/src/inclusion/mod.rs index e2bd5f8511d7..4f2f530e1211 100644 --- a/runtime/parachains/src/inclusion/mod.rs +++ b/runtime/parachains/src/inclusion/mod.rs @@ -28,10 +28,10 @@ use bitvec::{order::Lsb0 as BitOrderLsb0, vec::BitVec}; use frame_support::pallet_prelude::*; use parity_scale_codec::{Decode, Encode}; use primitives::{ - AvailabilityBitfield, BackedCandidate, CandidateCommitments, CandidateDescriptor, - CandidateHash, CandidateReceipt, CommittedCandidateReceipt, CoreIndex, GroupIndex, Hash, - HeadData, Id as ParaId, SigningContext, UncheckedSignedAvailabilityBitfields, ValidatorId, - ValidatorIndex, ValidityAttestation, + supermajority_threshold, AvailabilityBitfield, BackedCandidate, CandidateCommitments, + CandidateDescriptor, CandidateHash, CandidateReceipt, CommittedCandidateReceipt, CoreIndex, + GroupIndex, Hash, HeadData, Id as ParaId, SigningContext, UncheckedSignedAvailabilityBitfields, + ValidatorId, ValidatorIndex, ValidityAttestation, }; use scale_info::TypeInfo; use sp_runtime::{traits::One, DispatchError}; @@ -899,9 +899,7 @@ impl Pallet { } const fn availability_threshold(n_validators: usize) -> usize { - let mut threshold = (n_validators * 2) / 3; - threshold += (n_validators * 2) % 3; - threshold + supermajority_threshold(n_validators) } #[derive(derive_more::From, Debug)] diff --git a/runtime/parachains/src/inclusion/tests.rs b/runtime/parachains/src/inclusion/tests.rs index 17ef7f7beac7..e0b341258307 100644 --- a/runtime/parachains/src/inclusion/tests.rs +++ b/runtime/parachains/src/inclusion/tests.rs @@ -710,6 +710,13 @@ fn bitfield_checks() { }); } +#[test] +fn availability_threshold_is_supermajority() { + assert_eq!(3, availability_threshold(4)); + assert_eq!(5, availability_threshold(6)); + assert_eq!(7, availability_threshold(9)); +} + #[test] fn supermajority_bitfields_trigger_availability() { let chain_a = ParaId::from(1_u32); diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml index 69bde56eae3d..0fcf5efd6d5f 100644 --- a/runtime/polkadot/Cargo.toml +++ b/runtime/polkadot/Cargo.toml @@ -7,7 +7,7 @@ edition.workspace = true [dependencies] bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive", "max-encoded-len"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } log = { version = "0.4.17", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } diff --git a/runtime/polkadot/src/xcm_config.rs b/runtime/polkadot/src/xcm_config.rs index d853b27132c7..585197a475fb 100644 --- a/runtime/polkadot/src/xcm_config.rs +++ b/runtime/polkadot/src/xcm_config.rs @@ -26,6 +26,7 @@ use frame_support::{ traits::{Contains, Everything, Nothing}, weights::Weight, }; +use frame_system::EnsureRoot; use pallet_xcm::XcmPassthrough; use polkadot_runtime_constants::{system_parachain::*, xcm::body::FELLOWSHIP_ADMIN_INDEX}; use runtime_common::{paras_registrar, xcm_sender, ToAuthor}; @@ -425,4 +426,5 @@ impl pallet_xcm::Config for Runtime { type WeightInfo = crate::weights::pallet_xcm::WeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; + type AdminOrigin = EnsureRoot; } diff --git a/runtime/rococo/Cargo.toml b/runtime/rococo/Cargo.toml index ee8b86311b81..25bd679d4d35 100644 --- a/runtime/rococo/Cargo.toml +++ b/runtime/rococo/Cargo.toml @@ -6,7 +6,7 @@ authors.workspace = true edition.workspace = true [dependencies] -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive", "max-encoded-len"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } log = { version = "0.4.17", default-features = false } serde = { version = "1.0.139", default-features = false } diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index 86c62d1e6bd5..7751eeb42abf 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -2144,6 +2144,12 @@ sp_api::impl_runtime_apis! { // Rococo doesn't support asset locking Err(BenchmarkError::Skip) } + + fn export_message_origin_and_destination( + ) -> Result<(MultiLocation, NetworkId, InteriorMultiLocation), BenchmarkError> { + // Rococo doesn't support exporting messages + Err(BenchmarkError::Skip) + } } let whitelist: Vec = vec![ diff --git a/runtime/rococo/src/weights/xcm/mod.rs b/runtime/rococo/src/weights/xcm/mod.rs index fc430805b5b8..fe894d3ad2e8 100644 --- a/runtime/rococo/src/weights/xcm/mod.rs +++ b/runtime/rococo/src/weights/xcm/mod.rs @@ -243,7 +243,8 @@ impl XcmWeightInfo for RococoXcmWeight { Weight::MAX } fn export_message(_: &NetworkId, _: &Junctions, _: &Xcm<()>) -> Weight { - Weight::MAX // todo fix + // Rococo relay should not support export message operations + Weight::MAX } fn lock_asset(_: &MultiAsset, _: &MultiLocation) -> Weight { // Rococo does not currently support asset locking operations diff --git a/runtime/rococo/src/xcm_config.rs b/runtime/rococo/src/xcm_config.rs index 229df3a5df95..73408566b408 100644 --- a/runtime/rococo/src/xcm_config.rs +++ b/runtime/rococo/src/xcm_config.rs @@ -25,6 +25,7 @@ use frame_support::{ traits::{Contains, Everything, Nothing}, weights::Weight, }; +use frame_system::EnsureRoot; use runtime_common::{paras_registrar, xcm_sender, ToAuthor}; use sp_core::ConstU32; use xcm::latest::prelude::*; @@ -364,4 +365,5 @@ impl pallet_xcm::Config for Runtime { type WeightInfo = crate::weights::pallet_xcm::WeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; + type AdminOrigin = EnsureRoot; } diff --git a/runtime/test-runtime/Cargo.toml b/runtime/test-runtime/Cargo.toml index a15d9553a5af..8f3dd69f3aa6 100644 --- a/runtime/test-runtime/Cargo.toml +++ b/runtime/test-runtime/Cargo.toml @@ -7,7 +7,7 @@ edition.workspace = true [dependencies] bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } log = { version = "0.4.17", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } diff --git a/runtime/test-runtime/src/xcm_config.rs b/runtime/test-runtime/src/xcm_config.rs index bfe9c6ad1ad8..e346f54a1575 100644 --- a/runtime/test-runtime/src/xcm_config.rs +++ b/runtime/test-runtime/src/xcm_config.rs @@ -19,6 +19,7 @@ use frame_support::{ traits::{Everything, Nothing}, weights::Weight, }; +use frame_system::EnsureRoot; use xcm::latest::prelude::*; use xcm_builder::{ AllowUnpaidExecutionFrom, EnsureXcmOrigin, FixedWeightBounds, SignedAccountId32AsNative, @@ -146,4 +147,5 @@ impl pallet_xcm::Config for crate::Runtime { type WeightInfo = pallet_xcm::TestWeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; + type AdminOrigin = EnsureRoot; } diff --git a/runtime/westend/Cargo.toml b/runtime/westend/Cargo.toml index d90124516c6e..58b79e3889ec 100644 --- a/runtime/westend/Cargo.toml +++ b/runtime/westend/Cargo.toml @@ -7,7 +7,7 @@ edition.workspace = true [dependencies] bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive", "max-encoded-len"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } log = { version = "0.4.17", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 79204ad5e08e..3d2fcf8fc966 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -1785,8 +1785,8 @@ sp_api::impl_runtime_apis! { impl runtime_parachains::disputes::slashing::benchmarking::Config for Runtime {} use xcm::latest::{ - AssetId::*, Fungibility::*, Junction, Junctions::*, MultiAsset, MultiAssets, - MultiLocation, Response, + AssetId::*, Fungibility::*, InteriorMultiLocation, Junction, Junctions::*, + MultiAsset, MultiAssets, MultiLocation, NetworkId, Response, }; use xcm_config::{Westmint, TokenLocation}; @@ -1862,6 +1862,12 @@ sp_api::impl_runtime_apis! { // Westend doesn't support asset locking Err(BenchmarkError::Skip) } + + fn export_message_origin_and_destination( + ) -> Result<(MultiLocation, NetworkId, InteriorMultiLocation), BenchmarkError> { + // Westend doesn't support exporting messages + Err(BenchmarkError::Skip) + } } type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::; diff --git a/runtime/westend/src/weights/xcm/mod.rs b/runtime/westend/src/weights/xcm/mod.rs index 8b8c5339702d..4fb27c12096a 100644 --- a/runtime/westend/src/weights/xcm/mod.rs +++ b/runtime/westend/src/weights/xcm/mod.rs @@ -246,7 +246,7 @@ impl XcmWeightInfo for WestendXcmWeight { Weight::MAX } fn export_message(_: &NetworkId, _: &Junctions, _: &Xcm<()>) -> Weight { - // Westend does not currently support export message operations + // Westend relay should not support export message operations Weight::MAX } fn lock_asset(_: &MultiAsset, _: &MultiLocation) -> Weight { diff --git a/runtime/westend/src/xcm_config.rs b/runtime/westend/src/xcm_config.rs index ef38ca5d2970..411291c3e7f8 100644 --- a/runtime/westend/src/xcm_config.rs +++ b/runtime/westend/src/xcm_config.rs @@ -24,6 +24,7 @@ use frame_support::{ parameter_types, traits::{Contains, Everything, Nothing}, }; +use frame_system::EnsureRoot; use runtime_common::{paras_registrar, xcm_sender, ToAuthor}; use sp_core::ConstU32; use xcm::latest::prelude::*; @@ -279,4 +280,5 @@ impl pallet_xcm::Config for Runtime { type WeightInfo = crate::weights::pallet_xcm::WeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; + type AdminOrigin = EnsureRoot; } diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml index 0a028596cedf..8ac120c237df 100644 --- a/statement-table/Cargo.toml +++ b/statement-table/Cargo.toml @@ -5,6 +5,6 @@ authors.workspace = true edition.workspace = true [dependencies] -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } primitives = { package = "polkadot-primitives", path = "../primitives" } diff --git a/utils/staking-miner/Cargo.toml b/utils/staking-miner/Cargo.toml index 1e117f493eb5..e34b29a285a3 100644 --- a/utils/staking-miner/Cargo.toml +++ b/utils/staking-miner/Cargo.toml @@ -5,7 +5,7 @@ authors.workspace = true edition.workspace = true [dependencies] -codec = { package = "parity-scale-codec", version = "3.3.0" } +codec = { package = "parity-scale-codec", version = "3.4.0" } clap = { version = "4.0.9", features = ["derive", "env"] } tracing-subscriber = { version = "0.3.11", features = ["env-filter"] } jsonrpsee = { version = "0.16.2", features = ["ws-client", "macros"] } diff --git a/xcm/Cargo.toml b/xcm/Cargo.toml index 0dad0400320f..93e70330b42f 100644 --- a/xcm/Cargo.toml +++ b/xcm/Cargo.toml @@ -10,7 +10,7 @@ bounded-collections = { version = "0.1.5", default-features = false } derivative = { version = "2.2.0", default-features = false, features = [ "use_core" ] } impl-trait-for-tuples = "0.2.2" log = { version = "0.4.17", default-features = false } -parity-scale-codec = { version = "3.3.0", default-features = false, features = [ "derive", "max-encoded-len" ] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = [ "derive", "max-encoded-len" ] } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } sp-weights = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } serde = { version = "1.0.136", optional = true, features = ["derive"] } diff --git a/xcm/pallet-xcm-benchmarks/Cargo.toml b/xcm/pallet-xcm-benchmarks/Cargo.toml index ce9d8cb4c972..f2943be7e712 100644 --- a/xcm/pallet-xcm-benchmarks/Cargo.toml +++ b/xcm/pallet-xcm-benchmarks/Cargo.toml @@ -8,7 +8,7 @@ version.workspace = true targets = ["x86_64-unknown-linux-gnu"] [dependencies] -codec = { package = "parity-scale-codec", version = "3.3.0", default-features = false } +codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } frame-support = { default-features = false, branch = "master", git = "https://github.com/paritytech/substrate" } frame-system = { default-features = false, branch = "master", git = "https://github.com/paritytech/substrate" } diff --git a/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs b/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs index 3976c482eb8d..19aecdd47c89 100644 --- a/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs +++ b/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs @@ -496,6 +496,27 @@ benchmarks! { assert_eq!(executor.origin(), &Some(X1(alias).relative_to(&universal_location))); } + export_message { + let x in 1 .. 1000; + // The `inner_xcm` influences `ExportMessage` total weight based on + // `inner_xcm.encoded_size()`, so for this benchmark use smallest encoded instruction + // to approximate weight per "unit" of encoded size; then actual weight can be estimated + // to be `inner_xcm.encoded_size() * benchmarked_unit`. + // Use `ClearOrigin` as the small encoded instruction. + let inner_xcm = Xcm(vec![ClearOrigin; x as usize]); + // Get `origin`, `network` and `destination` from configured runtime. + let (origin, network, destination) = T::export_message_origin_and_destination()?; + let mut executor = new_executor::(origin); + let xcm = Xcm(vec![ExportMessage { + network, destination, xcm: inner_xcm, + }]); + }: { + executor.bench_process(xcm)?; + } verify { + // The execute completing successfully is as good as we can check. + // TODO: Potentially add new trait to XcmSender to detect a queued outgoing message. #4426 + } + set_fees_mode { let mut executor = new_executor::(Default::default()); executor.set_fees_mode(FeesMode { jit_withdraw: false }); diff --git a/xcm/pallet-xcm-benchmarks/src/generic/mock.rs b/xcm/pallet-xcm-benchmarks/src/generic/mock.rs index 79f9f28e32f5..c76a9f275983 100644 --- a/xcm/pallet-xcm-benchmarks/src/generic/mock.rs +++ b/xcm/pallet-xcm-benchmarks/src/generic/mock.rs @@ -186,6 +186,12 @@ impl generic::Config for Test { let assets: MultiAsset = (Concrete(Here.into()), 100).into(); Ok((Default::default(), Default::default(), assets)) } + + fn export_message_origin_and_destination( + ) -> Result<(MultiLocation, NetworkId, InteriorMultiLocation), BenchmarkError> { + // No MessageExporter in tests + Err(BenchmarkError::Skip) + } } pub fn new_test_ext() -> sp_io::TestExternalities { diff --git a/xcm/pallet-xcm-benchmarks/src/generic/mod.rs b/xcm/pallet-xcm-benchmarks/src/generic/mod.rs index 8fee41142fa8..b12ac0ba2308 100644 --- a/xcm/pallet-xcm-benchmarks/src/generic/mod.rs +++ b/xcm/pallet-xcm-benchmarks/src/generic/mod.rs @@ -28,7 +28,10 @@ pub mod pallet { dispatch::{Dispatchable, GetDispatchInfo}, pallet_prelude::Encode, }; - use xcm::latest::{Junction, MultiAsset, MultiAssets, MultiLocation, Response}; + use xcm::latest::{ + InteriorMultiLocation, Junction, MultiAsset, MultiAssets, MultiLocation, NetworkId, + Response, + }; #[pallet::config] pub trait Config: frame_system::Config + crate::Config { @@ -71,6 +74,12 @@ pub mod pallet { /// Return an unlocker, owner and assets that can be locked and unlocked. fn unlockable_asset() -> Result<(MultiLocation, MultiLocation, MultiAsset), BenchmarkError>; + + /// A `(MultiLocation, NetworkId, InteriorMultiLocation)` we can successfully export message to. + /// + /// If set to `Err`, benchmarks which rely on `export_message` will be skipped. + fn export_message_origin_and_destination( + ) -> Result<(MultiLocation, NetworkId, InteriorMultiLocation), BenchmarkError>; } #[pallet::pallet] diff --git a/xcm/pallet-xcm/Cargo.toml b/xcm/pallet-xcm/Cargo.toml index 8aaeb522aa5d..626224dcb9fc 100644 --- a/xcm/pallet-xcm/Cargo.toml +++ b/xcm/pallet-xcm/Cargo.toml @@ -7,7 +7,7 @@ version.workspace = true [dependencies] bounded-collections = { version = "0.1.5", default-features = false } -codec = { package = "parity-scale-codec", version = "3.3.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false, features = ["derive"] } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.137", optional = true, features = ["derive"] } log = { version = "0.4.17", default-features = false } diff --git a/xcm/pallet-xcm/src/lib.rs b/xcm/pallet-xcm/src/lib.rs index 47a9d7d75d0a..f84c94a063e8 100644 --- a/xcm/pallet-xcm/src/lib.rs +++ b/xcm/pallet-xcm/src/lib.rs @@ -231,6 +231,9 @@ pub mod pallet { /// `pallet_xcm::CurrentXcmVersion`. type AdvertisedXcmVersion: Get; + /// The origin that is allowed to call privileged operations on the XCM pallet + type AdminOrigin: EnsureOrigin<::RuntimeOrigin>; + /// The assets which we consider a given origin is trusted if they claim to have placed a /// lock. type TrustedLockers: ContainsPair; @@ -915,7 +918,7 @@ pub mod pallet { location: Box, xcm_version: XcmVersion, ) -> DispatchResult { - ensure_root(origin)?; + T::AdminOrigin::ensure_origin(origin)?; let location = *location; SupportedVersion::::insert( XCM_VERSION, @@ -937,7 +940,7 @@ pub mod pallet { origin: OriginFor, maybe_xcm_version: Option, ) -> DispatchResult { - ensure_root(origin)?; + T::AdminOrigin::ensure_origin(origin)?; SafeXcmVersion::::set(maybe_xcm_version); Ok(()) } @@ -952,7 +955,7 @@ pub mod pallet { origin: OriginFor, location: Box, ) -> DispatchResult { - ensure_root(origin)?; + T::AdminOrigin::ensure_origin(origin)?; let location: MultiLocation = (*location).try_into().map_err(|()| Error::::BadLocation)?; Self::request_version_notify(location).map_err(|e| { @@ -976,7 +979,7 @@ pub mod pallet { origin: OriginFor, location: Box, ) -> DispatchResult { - ensure_root(origin)?; + T::AdminOrigin::ensure_origin(origin)?; let location: MultiLocation = (*location).try_into().map_err(|()| Error::::BadLocation)?; Self::unrequest_version_notify(location).map_err(|e| { diff --git a/xcm/pallet-xcm/src/mock.rs b/xcm/pallet-xcm/src/mock.rs index 1e23af66b2fc..9544538ef280 100644 --- a/xcm/pallet-xcm/src/mock.rs +++ b/xcm/pallet-xcm/src/mock.rs @@ -20,6 +20,7 @@ use frame_support::{ traits::{ConstU32, Everything, Nothing}, weights::Weight, }; +use frame_system::EnsureRoot; use polkadot_parachain::primitives::Id as ParaId; use polkadot_runtime_parachains::origin; use sp_core::H256; @@ -344,6 +345,7 @@ impl pallet_xcm::Config for Test { type WeightInfo = TestWeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; + type AdminOrigin = EnsureRoot; } impl origin::Config for Test {} diff --git a/xcm/xcm-builder/Cargo.toml b/xcm/xcm-builder/Cargo.toml index 337c6e961e05..85f98552dbf1 100644 --- a/xcm/xcm-builder/Cargo.toml +++ b/xcm/xcm-builder/Cargo.toml @@ -7,7 +7,7 @@ version.workspace = true [dependencies] impl-trait-for-tuples = "0.2.1" -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } xcm = { path = "..", default-features = false } xcm-executor = { path = "../xcm-executor", default-features = false } diff --git a/xcm/xcm-builder/tests/mock/mod.rs b/xcm/xcm-builder/tests/mock/mod.rs index 450ef181869d..9c0086e34c90 100644 --- a/xcm/xcm-builder/tests/mock/mod.rs +++ b/xcm/xcm-builder/tests/mock/mod.rs @@ -19,6 +19,7 @@ use frame_support::{ traits::{ConstU32, Everything, Nothing}, weights::Weight, }; +use frame_system::EnsureRoot; use parity_scale_codec::Encode; use primitive_types::H256; use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32}; @@ -235,6 +236,7 @@ impl pallet_xcm::Config for Runtime { type WeightInfo = pallet_xcm::TestWeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; + type AdminOrigin = EnsureRoot; } impl origin::Config for Runtime {} diff --git a/xcm/xcm-executor/Cargo.toml b/xcm/xcm-executor/Cargo.toml index a1104f6db813..f91626eec359 100644 --- a/xcm/xcm-executor/Cargo.toml +++ b/xcm/xcm-executor/Cargo.toml @@ -8,7 +8,7 @@ version.workspace = true [dependencies] impl-trait-for-tuples = "0.2.2" environmental = { version = "1.1.4", default-features = false } -parity-scale-codec = { version = "3.3.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } xcm = { path = "..", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } diff --git a/xcm/xcm-executor/src/lib.rs b/xcm/xcm-executor/src/lib.rs index c4d3e2768aae..4e63ad91479f 100644 --- a/xcm/xcm-executor/src/lib.rs +++ b/xcm/xcm-executor/src/lib.rs @@ -820,7 +820,7 @@ impl XcmExecutor { Ok(()) }, ExportMessage { network, destination, xcm } => { - // The actual message send to the bridge for forwarding is prepended with `UniversalOrigin` + // The actual message sent to the bridge for forwarding is prepended with `UniversalOrigin` // and `DescendOrigin` in order to ensure that the message is executed with this Origin. // // Prepend the desired message with instructions which effectively rewrite the origin. diff --git a/xcm/xcm-executor/src/traits/export.rs b/xcm/xcm-executor/src/traits/export.rs index 61b76addfe4c..ef8daa3c828d 100644 --- a/xcm/xcm-executor/src/traits/export.rs +++ b/xcm/xcm-executor/src/traits/export.rs @@ -31,7 +31,7 @@ use xcm::latest::prelude::*; /// destination must accept the local location to represent that location or the operation will /// fail. pub trait ExportXcm { - /// Intermediate value which connects the two phaases of the export operation. + /// Intermediate value which connects the two phases of the export operation. type Ticket; /// Check whether the given `message` is deliverable to the given `destination` on `network`, diff --git a/xcm/xcm-simulator/Cargo.toml b/xcm/xcm-simulator/Cargo.toml index 0c2999321f96..62674ed638d5 100644 --- a/xcm/xcm-simulator/Cargo.toml +++ b/xcm/xcm-simulator/Cargo.toml @@ -6,7 +6,7 @@ authors.workspace = true edition.workspace = true [dependencies] -codec = { package = "parity-scale-codec", version = "3.3.0" } +codec = { package = "parity-scale-codec", version = "3.4.0" } paste = "1.0.7" frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/xcm/xcm-simulator/example/Cargo.toml b/xcm/xcm-simulator/example/Cargo.toml index 476f3077b1d8..e90d3ba31272 100644 --- a/xcm/xcm-simulator/example/Cargo.toml +++ b/xcm/xcm-simulator/example/Cargo.toml @@ -6,7 +6,7 @@ edition.workspace = true version.workspace = true [dependencies] -codec = { package = "parity-scale-codec", version = "3.3.0" } +codec = { package = "parity-scale-codec", version = "3.4.0" } scale-info = { version = "2.1.2", features = ["derive"] } log = { version = "0.4.14", default-features = false } diff --git a/xcm/xcm-simulator/example/src/parachain.rs b/xcm/xcm-simulator/example/src/parachain.rs index 344ccfb9dbcc..4cd4094b3328 100644 --- a/xcm/xcm-simulator/example/src/parachain.rs +++ b/xcm/xcm-simulator/example/src/parachain.rs @@ -22,6 +22,8 @@ use frame_support::{ traits::{EnsureOrigin, EnsureOriginWithArg, Everything, EverythingBut, Nothing}, weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight}, }; + +use frame_system::EnsureRoot; use sp_core::{ConstU32, H256}; use sp_runtime::{ testing::Header, @@ -424,6 +426,7 @@ impl pallet_xcm::Config for Runtime { type WeightInfo = pallet_xcm::TestWeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; + type AdminOrigin = EnsureRoot; } type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; diff --git a/xcm/xcm-simulator/example/src/relay_chain.rs b/xcm/xcm-simulator/example/src/relay_chain.rs index b44200378a8b..5db399717fc1 100644 --- a/xcm/xcm-simulator/example/src/relay_chain.rs +++ b/xcm/xcm-simulator/example/src/relay_chain.rs @@ -21,6 +21,8 @@ use frame_support::{ traits::{AsEnsureOriginWithArg, Everything, Nothing}, weights::Weight, }; + +use frame_system::EnsureRoot; use sp_core::{ConstU32, H256}; use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32}; @@ -221,6 +223,7 @@ impl pallet_xcm::Config for Runtime { type WeightInfo = pallet_xcm::TestWeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; + type AdminOrigin = EnsureRoot; } parameter_types! { diff --git a/xcm/xcm-simulator/fuzzer/Cargo.toml b/xcm/xcm-simulator/fuzzer/Cargo.toml index c058cda3b5fc..438e772d9675 100644 --- a/xcm/xcm-simulator/fuzzer/Cargo.toml +++ b/xcm/xcm-simulator/fuzzer/Cargo.toml @@ -6,7 +6,7 @@ authors.workspace = true edition.workspace = true [dependencies] -codec = { package = "parity-scale-codec", version = "3.3.0" } +codec = { package = "parity-scale-codec", version = "3.4.0" } honggfuzz = "0.5.55" arbitrary = "1.2.0" scale-info = { version = "2.1.2", features = ["derive"] } diff --git a/xcm/xcm-simulator/fuzzer/src/parachain.rs b/xcm/xcm-simulator/fuzzer/src/parachain.rs index 66e9673394af..8480713347c0 100644 --- a/xcm/xcm-simulator/fuzzer/src/parachain.rs +++ b/xcm/xcm-simulator/fuzzer/src/parachain.rs @@ -22,6 +22,8 @@ use frame_support::{ traits::{Everything, Nothing}, weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight}, }; + +use frame_system::EnsureRoot; use sp_core::{ConstU32, H256}; use sp_runtime::{ testing::Header, @@ -339,6 +341,7 @@ impl pallet_xcm::Config for Runtime { type WeightInfo = pallet_xcm::TestWeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; + type AdminOrigin = EnsureRoot; } type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; diff --git a/xcm/xcm-simulator/fuzzer/src/relay_chain.rs b/xcm/xcm-simulator/fuzzer/src/relay_chain.rs index 3d49a71cc98a..962c22297a8e 100644 --- a/xcm/xcm-simulator/fuzzer/src/relay_chain.rs +++ b/xcm/xcm-simulator/fuzzer/src/relay_chain.rs @@ -21,6 +21,8 @@ use frame_support::{ traits::{Everything, Nothing}, weights::Weight, }; + +use frame_system::EnsureRoot; use sp_core::{ConstU32, H256}; use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32}; @@ -185,6 +187,7 @@ impl pallet_xcm::Config for Runtime { type WeightInfo = pallet_xcm::TestWeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; + type AdminOrigin = EnsureRoot; } parameter_types! {