From 3646202110b3810027f9d7fd0b45cb1bcb9678f4 Mon Sep 17 00:00:00 2001 From: Andronik Date: Thu, 6 Oct 2022 00:36:51 +0200 Subject: [PATCH] update kvdb & co (#6111) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * toml changes * REVERTME: patch * adapt parachains db interface * fix Cargo.toml patch after master rebase * fix av-store * fix chain-selection * fix parachains-db? * Revert "fix Cargo.toml patch after master rebase" This reverts commit 3afcbf033c86027b3f2b909d83ec703591bdd287. * Revert "REVERTME: patch" This reverts commit 464b717cf4142d3d09c3d77b83700b632d8c5f54. * Use `Ok` imported from prelude Co-authored-by: Bastian Köcher * update lockfile for {"substrate"} * Revert "update lockfile for {"substrate"}" This reverts commit fdc623de226f7645741b86c4b1a7d030fed2172d. * cargo update -p sp-io Co-authored-by: Bastian Köcher Co-authored-by: parity-processbot <> --- Cargo.lock | 442 +++++++++--------- Cargo.toml | 2 +- core-primitives/Cargo.toml | 2 +- node/core/approval-voting/Cargo.toml | 4 +- node/core/av-store/Cargo.toml | 4 +- node/core/av-store/src/lib.rs | 28 +- node/core/chain-selection/Cargo.toml | 4 +- .../core/chain-selection/src/db_backend/v1.rs | 26 +- node/core/dispute-coordinator/Cargo.toml | 4 +- node/core/runtime-api/Cargo.toml | 2 +- node/malus/Cargo.toml | 2 +- node/overseer/Cargo.toml | 2 +- node/service/Cargo.toml | 4 +- node/service/src/parachains_db/upgrade.rs | 2 +- node/subsystem-util/Cargo.toml | 6 +- node/subsystem-util/src/database.rs | 79 ++-- parachain/Cargo.toml | 2 +- primitives/Cargo.toml | 2 +- 18 files changed, 294 insertions(+), 323 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c23829c0751c..3bd1c69b5584 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -435,7 +435,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "array-bytes", "async-trait", @@ -472,7 +472,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -492,7 +492,7 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "beefy-primitives", "sp-api", @@ -502,7 +502,7 @@ dependencies = [ [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "parity-scale-codec", "scale-info", @@ -530,9 +530,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.59.2" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" dependencies = [ "bitflags", "cexpr", @@ -915,7 +915,7 @@ checksum = "fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90" dependencies = [ "glob", "libc", - "libloading 0.7.2", + "libloading", ] [[package]] @@ -1946,9 +1946,9 @@ dependencies = [ [[package]] name = "fixed-hash" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" +checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", "rand 0.8.5", @@ -1999,7 +1999,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "parity-scale-codec", ] @@ -2017,7 +2017,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-support", "frame-system", @@ -2040,7 +2040,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "Inflector", "array-bytes", @@ -2091,7 +2091,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2102,7 +2102,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2118,7 +2118,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-support", "frame-system", @@ -2147,7 +2147,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "bitflags", "frame-metadata", @@ -2179,7 +2179,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "Inflector", "cfg-expr", @@ -2193,7 +2193,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2205,7 +2205,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "proc-macro2", "quote", @@ -2215,7 +2215,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-support", "frame-support-test-pallet", @@ -2238,7 +2238,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-support", "frame-system", @@ -2249,7 +2249,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-support", "log", @@ -2267,7 +2267,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -2282,7 +2282,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "parity-scale-codec", "sp-api", @@ -2291,7 +2291,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-support", "parity-scale-codec", @@ -2306,18 +2306,6 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ebd3504ad6116843b8375ad70df74e7bfe83cac77a1f3fe73200c844d43bfe0" -[[package]] -name = "fs-swap" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d47dad3685eceed8488986cad3d5027165ea5edb164331770e2059555f10a5" -dependencies = [ - "lazy_static", - "libc", - "libloading 0.5.2", - "winapi", -] - [[package]] name = "fs2" version = "0.4.3" @@ -2474,7 +2462,7 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "chrono", "frame-election-provider-support", @@ -2910,9 +2898,9 @@ dependencies = [ [[package]] name = "impl-serde" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c" +checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd" dependencies = [ "serde", ] @@ -3327,9 +3315,9 @@ dependencies = [ [[package]] name = "kvdb" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a301d8ecb7989d4a6e2c57a49baca77d353bdbf879909debe3f375fe25d61f86" +checksum = "585089ceadba0197ffe9af6740ab350b325e3c1f5fccfbc3522e0250c750409b" dependencies = [ "parity-util-mem", "smallvec", @@ -3337,9 +3325,9 @@ dependencies = [ [[package]] name = "kvdb-memorydb" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece7e668abd21387aeb6628130a6f4c802787f014fa46bc83221448322250357" +checksum = "40d109c87bfb7759edd2a49b2649c1afe25af785d930ad6a38479b4dc70dd873" dependencies = [ "kvdb", "parity-util-mem", @@ -3348,15 +3336,13 @@ dependencies = [ [[package]] name = "kvdb-rocksdb" -version = "0.15.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca7fbdfd71cd663dceb0faf3367a99f8cf724514933e9867cec4995b6027cbc1" +checksum = "c076cc2cdbac89b9910c853a36c957d3862a779f31c2661174222cefb49ee597" dependencies = [ - "fs-swap", "kvdb", "log", "num_cpus", - "owning_ref", "parity-util-mem", "parking_lot 0.12.1", "regex", @@ -3366,9 +3352,9 @@ dependencies = [ [[package]] name = "kvdb-shared-tests" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9001edd3459aa1503ea84215cf4618a6e2e020f51682494cc6f5ab1150e68e" +checksum = "de82a1adb7ade192c0090dd56d059a626191c0638c795eb68aff4b0bd2c1f9be" dependencies = [ "kvdb", ] @@ -3403,16 +3389,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "libloading" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" -dependencies = [ - "cc", - "winapi", -] - [[package]] name = "libloading" version = "0.7.2" @@ -3946,9 +3922,9 @@ dependencies = [ [[package]] name = "librocksdb-sys" -version = "0.6.1+6.28.2" +version = "0.8.0+7.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" +checksum = "611804e4666a25136fcc5f8cf425ab4d26c7f74ea245ffe92ea23b85b6420b5d" dependencies = [ "bindgen", "bzip2-sys", @@ -4225,9 +4201,9 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a" +checksum = "34ac11bb793c28fa095b7554466f53b3a60a2cd002afdac01bcf135cbd73a269" dependencies = [ "hash-db", "hashbrown", @@ -4835,7 +4811,7 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4" [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -4849,7 +4825,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-support", "frame-system", @@ -4865,7 +4841,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-support", "frame-system", @@ -4880,7 +4856,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -4904,7 +4880,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4924,7 +4900,7 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-election-provider-support", "frame-support", @@ -4943,7 +4919,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -4958,7 +4934,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "beefy-primitives", "frame-support", @@ -4974,7 +4950,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "array-bytes", "beefy-merkle-tree", @@ -4997,7 +4973,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5015,7 +4991,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5034,7 +5010,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5051,7 +5027,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "assert_matches", "frame-benchmarking", @@ -5068,7 +5044,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5086,7 +5062,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5110,7 +5086,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5123,7 +5099,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5141,7 +5117,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5162,7 +5138,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5177,7 +5153,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5200,7 +5176,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5216,7 +5192,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5236,7 +5212,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5253,7 +5229,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5270,7 +5246,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5288,7 +5264,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -5303,7 +5279,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5319,7 +5295,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-support", "frame-system", @@ -5336,7 +5312,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5356,7 +5332,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "parity-scale-codec", "sp-api", @@ -5366,7 +5342,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-support", "frame-system", @@ -5383,7 +5359,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5406,7 +5382,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5423,7 +5399,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5438,7 +5414,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5456,7 +5432,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5471,7 +5447,7 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "assert_matches", "frame-benchmarking", @@ -5489,7 +5465,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5505,7 +5481,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-support", "frame-system", @@ -5526,7 +5502,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5542,7 +5518,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-support", "frame-system", @@ -5556,7 +5532,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5579,7 +5555,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5590,7 +5566,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "log", "sp-arithmetic", @@ -5599,7 +5575,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-support", "frame-system", @@ -5613,7 +5589,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5631,7 +5607,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5650,7 +5626,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-support", "frame-system", @@ -5666,7 +5642,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -5681,7 +5657,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5692,7 +5668,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5709,7 +5685,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5725,7 +5701,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5740,7 +5716,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-benchmarking", "frame-support", @@ -5853,9 +5829,9 @@ checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" [[package]] name = "parity-util-mem" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" +checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8" dependencies = [ "cfg-if 1.0.0", "hashbrown", @@ -7731,9 +7707,9 @@ dependencies = [ [[package]] name = "primitive-types" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" +checksum = "5cfd65aea0c5fa0bfcc7c9e7ca828c921ef778f43d325325ec84bda371bfa75a" dependencies = [ "fixed-hash", "impl-codec", @@ -8273,7 +8249,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "env_logger 0.9.0", "jsonrpsee", @@ -8371,9 +8347,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" +checksum = "7e9562ea1d70c0cc63a34a22d977753b50cca91cc6b6527750463bd5dd8697bc" dependencies = [ "libc", "librocksdb-sys", @@ -8621,7 +8597,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "log", "sp-core", @@ -8632,7 +8608,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "async-trait", "futures", @@ -8659,7 +8635,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "futures", "futures-timer", @@ -8682,7 +8658,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8698,7 +8674,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -8715,7 +8691,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8726,7 +8702,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "array-bytes", "chrono", @@ -8766,7 +8742,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "fnv", "futures", @@ -8794,7 +8770,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "hash-db", "kvdb", @@ -8819,7 +8795,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "async-trait", "futures", @@ -8843,7 +8819,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "async-trait", "fork-tree", @@ -8885,7 +8861,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "futures", "jsonrpsee", @@ -8907,7 +8883,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8920,7 +8896,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "async-trait", "futures", @@ -8944,7 +8920,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "lazy_static", "lru 0.7.8", @@ -8971,7 +8947,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "environmental", "parity-scale-codec", @@ -8987,7 +8963,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "log", "parity-scale-codec", @@ -9002,7 +8978,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "cfg-if 1.0.0", "libc", @@ -9022,7 +8998,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "ahash", "array-bytes", @@ -9063,7 +9039,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "finality-grandpa", "futures", @@ -9084,7 +9060,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "ansi_term", "futures", @@ -9101,7 +9077,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "array-bytes", "async-trait", @@ -9116,7 +9092,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "array-bytes", "async-trait", @@ -9163,7 +9139,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "cid", "futures", @@ -9183,7 +9159,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "async-trait", "bitflags", @@ -9209,7 +9185,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "ahash", "futures", @@ -9227,7 +9203,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "array-bytes", "futures", @@ -9248,7 +9224,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "array-bytes", "fork-tree", @@ -9276,7 +9252,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "array-bytes", "futures", @@ -9295,7 +9271,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "array-bytes", "bytes", @@ -9325,7 +9301,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "futures", "libp2p", @@ -9338,7 +9314,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9347,7 +9323,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "futures", "hash-db", @@ -9377,7 +9353,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "futures", "jsonrpsee", @@ -9400,7 +9376,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "futures", "jsonrpsee", @@ -9413,7 +9389,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "async-trait", "directories", @@ -9483,7 +9459,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "log", "parity-scale-codec", @@ -9497,7 +9473,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -9516,7 +9492,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "futures", "libc", @@ -9535,7 +9511,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "chrono", "futures", @@ -9553,7 +9529,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "ansi_term", "atty", @@ -9584,7 +9560,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9595,7 +9571,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "futures", "futures-timer", @@ -9621,7 +9597,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "futures", "log", @@ -9634,7 +9610,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "futures", "futures-timer", @@ -10120,7 +10096,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "hash-db", "log", @@ -10138,7 +10114,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "blake2", "proc-macro-crate", @@ -10150,7 +10126,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "parity-scale-codec", "scale-info", @@ -10163,7 +10139,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "integer-sqrt", "num-traits", @@ -10178,7 +10154,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "parity-scale-codec", "scale-info", @@ -10191,7 +10167,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "async-trait", "parity-scale-codec", @@ -10203,7 +10179,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "parity-scale-codec", "sp-api", @@ -10215,7 +10191,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "futures", "log", @@ -10233,7 +10209,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "async-trait", "futures", @@ -10252,7 +10228,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "async-trait", "merlin", @@ -10275,7 +10251,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "parity-scale-codec", "scale-info", @@ -10289,7 +10265,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "parity-scale-codec", "scale-info", @@ -10302,7 +10278,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "array-bytes", "base58", @@ -10348,7 +10324,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "blake2", "byteorder", @@ -10362,7 +10338,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "proc-macro2", "quote", @@ -10373,7 +10349,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -10382,7 +10358,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "proc-macro2", "quote", @@ -10392,7 +10368,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "environmental", "parity-scale-codec", @@ -10403,7 +10379,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "finality-grandpa", "log", @@ -10421,7 +10397,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10435,7 +10411,7 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "bytes", "futures", @@ -10461,7 +10437,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "lazy_static", "sp-core", @@ -10472,7 +10448,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "async-trait", "futures", @@ -10489,7 +10465,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "thiserror", "zstd", @@ -10498,7 +10474,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "log", "parity-scale-codec", @@ -10514,7 +10490,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "parity-scale-codec", "scale-info", @@ -10528,7 +10504,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "sp-api", "sp-core", @@ -10538,7 +10514,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "backtrace", "lazy_static", @@ -10548,7 +10524,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "rustc-hash", "serde", @@ -10558,7 +10534,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "either", "hash256-std-hasher", @@ -10581,7 +10557,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -10599,7 +10575,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "Inflector", "proc-macro-crate", @@ -10611,7 +10587,7 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "log", "parity-scale-codec", @@ -10625,7 +10601,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "parity-scale-codec", "scale-info", @@ -10639,7 +10615,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "parity-scale-codec", "scale-info", @@ -10650,7 +10626,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "hash-db", "log", @@ -10672,12 +10648,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10690,7 +10666,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "log", "sp-core", @@ -10703,7 +10679,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "async-trait", "futures-timer", @@ -10719,7 +10695,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "parity-scale-codec", "sp-std", @@ -10731,7 +10707,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "sp-api", "sp-runtime", @@ -10740,7 +10716,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "async-trait", "log", @@ -10756,7 +10732,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "ahash", "hash-db", @@ -10779,7 +10755,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10796,7 +10772,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10807,7 +10783,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "impl-trait-for-tuples", "log", @@ -10820,7 +10796,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -11035,7 +11011,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "platforms", ] @@ -11043,7 +11019,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -11064,7 +11040,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "futures-util", "hyper", @@ -11077,7 +11053,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "jsonrpsee", "log", @@ -11098,7 +11074,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "array-bytes", "async-trait", @@ -11124,7 +11100,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "futures", "substrate-test-utils-derive", @@ -11134,7 +11110,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11145,7 +11121,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "ansi_term", "build-helper", @@ -11455,9 +11431,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-ctl" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb833c46ecbf8b6daeccb347cefcabf9c1beb5c9b0f853e1cec45632d9963e69" +checksum = "e37706572f4b151dff7a0146e040804e9c26fe3a3118591112f05cf12a4216c1" dependencies = [ "libc", "paste", @@ -11466,9 +11442,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.4.2+5.2.1-patched.2" +version = "0.5.2+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5844e429d797c62945a566f8da4e24c7fe3fbd5d6617fd8bf7a0b7dc1ee0f22e" +checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3" dependencies = [ "cc", "fs_extra", @@ -11477,9 +11453,9 @@ dependencies = [ [[package]] name = "tikv-jemallocator" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c14a5a604eb8715bc5785018a37d00739b180bcf609916ddf4393d33d49ccdf" +checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979" dependencies = [ "libc", "tikv-jemalloc-sys", @@ -11858,7 +11834,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" +source = "git+https://github.com/paritytech/substrate?branch=master#fc67cbb66d8c484bc7b7506fc1300344d12ecbad" dependencies = [ "clap", "frame-try-runtime", diff --git a/Cargo.toml b/Cargo.toml index c7edd0621319..0ed0892593d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ readme = "README.md" [dependencies] polkadot-cli = { path = "cli", features = [ "kusama-native", "westend-native", "rococo-native" ] } color-eyre = { version = "0.6.1", default-features = false } -parity-util-mem = { version = "0.11.0", default-features = false, features = ["jemalloc-global"] } +parity-util-mem = { version = "0.12.0", default-features = false, features = ["jemalloc-global"] } [dev-dependencies] assert_cmd = "2.0.4" diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml index 9bbe8f516afb..a10b80b0c30f 100644 --- a/core-primitives/Cargo.toml +++ b/core-primitives/Cargo.toml @@ -10,7 +10,7 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", d 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.1.5", default-features = false, features = [ "derive" ] } -parity-util-mem = { version = "0.11.0", default-features = false, optional = true } +parity-util-mem = { version = "0.12.0", default-features = false, optional = true } [features] default = [ "std" ] diff --git a/node/core/approval-voting/Cargo.toml b/node/core/approval-voting/Cargo.toml index e39a589b5675..25fb51eb712b 100644 --- a/node/core/approval-voting/Cargo.toml +++ b/node/core/approval-voting/Cargo.toml @@ -13,7 +13,7 @@ bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } lru = "0.8" merlin = "2.0" schnorrkel = "0.9.1" -kvdb = "0.11.0" +kvdb = "0.12.0" derive_more = "0.99.17" thiserror = "1.0.31" @@ -40,5 +40,5 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } assert_matches = "1.4.0" -kvdb-memorydb = "0.11.0" +kvdb-memorydb = "0.12.0" test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../../primitives/test-helpers" } diff --git a/node/core/av-store/Cargo.toml b/node/core/av-store/Cargo.toml index 9cea9f1bdc24..4cec2cb637b9 100644 --- a/node/core/av-store/Cargo.toml +++ b/node/core/av-store/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] futures = "0.3.21" futures-timer = "3.0.2" -kvdb = "0.11.0" +kvdb = "0.12.0" thiserror = "1.0.31" gum = { package = "tracing-gum", path = "../../gum" } bitvec = "1.0.0" @@ -24,7 +24,7 @@ polkadot-node-primitives = { path = "../../primitives" } log = "0.4.17" env_logger = "0.9.0" assert_matches = "1.4.0" -kvdb-memorydb = "0.11.0" +kvdb-memorydb = "0.12.0" sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-node-subsystem-util = { path = "../../subsystem-util" } diff --git a/node/core/av-store/src/lib.rs b/node/core/av-store/src/lib.rs index cd1685e32ea8..4fbbf3740ab0 100644 --- a/node/core/av-store/src/lib.rs +++ b/node/core/av-store/src/lib.rs @@ -792,8 +792,9 @@ fn note_block_included( macro_rules! peek_num { ($iter:ident) => { match $iter.peek() { - Some((k, _)) => decode_unfinalized_key(&k[..]).ok().map(|(b, _, _)| b), - None => None, + Some(Ok((k, _))) => Ok(decode_unfinalized_key(&k[..]).ok().map(|(b, _, _)| b)), + Some(Err(_)) => Err($iter.next().expect("peek returned Some(Err); qed").unwrap_err()), + None => Ok(None), } }; } @@ -819,10 +820,10 @@ async fn process_block_finalized( let mut iter = subsystem .db .iter_with_prefix(subsystem.config.col_meta, &start_prefix) - .take_while(|(k, _)| &k[..] < &end_prefix[..]) + .take_while(|r| r.as_ref().map_or(true, |(k, _v)| &k[..] < &end_prefix[..])) .peekable(); - match peek_num!(iter) { + match peek_num!(iter)? { None => break, // end of iterator. Some(n) => n, } @@ -867,10 +868,10 @@ async fn process_block_finalized( let iter = subsystem .db .iter_with_prefix(subsystem.config.col_meta, &start_prefix) - .take_while(|(k, _)| &k[..] < &end_prefix[..]) + .take_while(|r| r.as_ref().map_or(true, |(k, _v)| &k[..] < &end_prefix[..])) .peekable(); - let batch = load_all_at_finalized_height(iter, batch_num, batch_finalized_hash); + let batch = load_all_at_finalized_height(iter, batch_num, batch_finalized_hash)?; // Now that we've iterated over the entire batch at this finalized height, // update the meta. @@ -890,22 +891,22 @@ async fn process_block_finalized( // loads all candidates at the finalized height and maps them to `true` if finalized // and `false` if unfinalized. fn load_all_at_finalized_height( - mut iter: std::iter::Peekable, Box<[u8]>)>>, + mut iter: std::iter::Peekable>>, block_number: BlockNumber, finalized_hash: Hash, -) -> impl IntoIterator { +) -> io::Result> { // maps candidate hashes to true if finalized, false otherwise. let mut candidates = HashMap::new(); // Load all candidates that were included at this height. loop { - match peek_num!(iter) { + match peek_num!(iter)? { None => break, // end of iterator. Some(n) if n != block_number => break, // end of batch. _ => {}, } - let (k, _v) = iter.next().expect("`peek` used to check non-empty; qed"); + let (k, _v) = iter.next().expect("`peek` used to check non-empty; qed")?; let (_, block_hash, candidate_hash) = decode_unfinalized_key(&k[..]).expect("`peek_num` checks validity of key; qed"); @@ -916,7 +917,7 @@ fn load_all_at_finalized_height( } } - candidates + Ok(candidates) } fn update_blocks_at_finalized_height( @@ -1214,9 +1215,10 @@ fn prune_all(db: &Arc, config: &Config, clock: &dyn Clock) -> Resu let mut tx = DBTransaction::new(); let iter = db .iter_with_prefix(config.col_meta, &range_start[..]) - .take_while(|(k, _)| &k[..] < &range_end[..]); + .take_while(|r| r.as_ref().map_or(true, |(k, _v)| &k[..] < &range_end[..])); - for (k, _v) in iter { + for r in iter { + let (k, _v) = r?; tx.delete(config.col_meta, &k[..]); let (_, candidate_hash) = match decode_pruning_key(&k[..]) { diff --git a/node/core/chain-selection/Cargo.toml b/node/core/chain-selection/Cargo.toml index 8d9875b6f389..df6a5c24f10e 100644 --- a/node/core/chain-selection/Cargo.toml +++ b/node/core/chain-selection/Cargo.toml @@ -13,7 +13,7 @@ polkadot-primitives = { path = "../../../primitives" } polkadot-node-primitives = { path = "../../primitives" } polkadot-node-subsystem = { path = "../../subsystem" } polkadot-node-subsystem-util = { path = "../../subsystem-util" } -kvdb = "0.11.0" +kvdb = "0.12.0" thiserror = "1.0.31" parity-scale-codec = "3.1.5" @@ -22,4 +22,4 @@ polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } parking_lot = "0.12.0" assert_matches = "1" -kvdb-memorydb = "0.11.0" +kvdb-memorydb = "0.12.0" diff --git a/node/core/chain-selection/src/db_backend/v1.rs b/node/core/chain-selection/src/db_backend/v1.rs index db117ff945df..a037d27baaea 100644 --- a/node/core/chain-selection/src/db_backend/v1.rs +++ b/node/core/chain-selection/src/db_backend/v1.rs @@ -235,16 +235,21 @@ impl Backend for DbBackend { self.inner.iter_with_prefix(self.config.col_data, &STAGNANT_AT_PREFIX[..]); let val = stagnant_at_iter - .filter_map(|(k, v)| { - match (decode_stagnant_at_key(&mut &k[..]), >::decode(&mut &v[..]).ok()) { - (Some(at), Some(stagnant_at)) => Some((at, stagnant_at)), - _ => None, - } + .filter_map(|r| match r { + Ok((k, v)) => + match (decode_stagnant_at_key(&mut &k[..]), >::decode(&mut &v[..]).ok()) + { + (Some(at), Some(stagnant_at)) => Some(Ok((at, stagnant_at))), + _ => None, + }, + Err(e) => Some(Err(e)), }) .enumerate() - .take_while(|(idx, (at, _))| *at <= up_to.into() && *idx < max_elements) + .take_while(|(idx, r)| { + r.as_ref().map_or(true, |(at, _)| *at <= up_to.into() && *idx < max_elements) + }) .map(|(_, v)| v) - .collect::>(); + .collect::, _>>()?; Ok(val) } @@ -254,10 +259,13 @@ impl Backend for DbBackend { self.inner.iter_with_prefix(self.config.col_data, &BLOCK_HEIGHT_PREFIX[..]); let val = blocks_at_height_iter - .filter_map(|(k, _)| decode_block_height_key(&k[..])) + .filter_map(|r| match r { + Ok((k, _)) => decode_block_height_key(&k[..]).map(Ok), + Err(e) => Some(Err(e)), + }) .next(); - Ok(val) + val.transpose().map_err(Error::from) } fn load_blocks_by_number(&self, number: BlockNumber) -> Result, Error> { diff --git a/node/core/dispute-coordinator/Cargo.toml b/node/core/dispute-coordinator/Cargo.toml index 7d7bc25e91d4..fd89b599f63c 100644 --- a/node/core/dispute-coordinator/Cargo.toml +++ b/node/core/dispute-coordinator/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" futures = "0.3.21" gum = { package = "tracing-gum", path = "../../gum" } parity-scale-codec = "3.1.5" -kvdb = "0.11.0" +kvdb = "0.12.0" thiserror = "1.0.31" lru = "0.8.0" fatality = "0.0.6" @@ -22,7 +22,7 @@ sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "maste [dev-dependencies] -kvdb-memorydb = "0.11.0" +kvdb-memorydb = "0.12.0" polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/core/runtime-api/Cargo.toml b/node/core/runtime-api/Cargo.toml index 9ef6af06c5c2..b7a9895e0c67 100644 --- a/node/core/runtime-api/Cargo.toml +++ b/node/core/runtime-api/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" futures = "0.3.21" gum = { package = "tracing-gum", path = "../../gum" } memory-lru = "0.1.1" -parity-util-mem = { version = "0.11.0", default-features = false } +parity-util-mem = { version = "0.12.0", default-features = false } sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/malus/Cargo.toml b/node/malus/Cargo.toml index cfc56307b146..c32fce56e4c8 100644 --- a/node/malus/Cargo.toml +++ b/node/malus/Cargo.toml @@ -23,7 +23,7 @@ polkadot-node-core-backing = { path = "../core/backing" } polkadot-node-primitives = { path = "../primitives" } polkadot-primitives = { path = "../../primitives" } polkadot-node-core-pvf = { path = "../core/pvf" } -parity-util-mem = { version = "0.11.0", default-features = false, features = ["jemalloc-global"] } +parity-util-mem = { version = "0.12.0", default-features = false, features = ["jemalloc-global"] } color-eyre = { version = "0.6.1", default-features = false } assert_matches = "1.5" async-trait = "0.1.57" diff --git a/node/overseer/Cargo.toml b/node/overseer/Cargo.toml index 4bc360df47e3..8ee3fc6fb3cd 100644 --- a/node/overseer/Cargo.toml +++ b/node/overseer/Cargo.toml @@ -18,7 +18,7 @@ polkadot-primitives = { path = "../../primitives" } orchestra = "0.0.2" gum = { package = "tracing-gum", path = "../gum" } lru = "0.8" -parity-util-mem = { version = "0.11.0", default-features = false } +parity-util-mem = { version = "0.12.0", default-features = false } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } async-trait = "0.1.57" diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 1d2613537814..63a5f189a32a 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -69,8 +69,8 @@ gum = { package = "tracing-gum", path = "../gum/" } serde = { version = "1.0.137", features = ["derive"] } serde_json = "1.0.81" thiserror = "1.0.31" -kvdb = "0.11.0" -kvdb-rocksdb = { version = "0.15.2", optional = true } +kvdb = "0.12.0" +kvdb-rocksdb = { version = "0.16.0", optional = true } parity-db = { version = "0.3.16", optional = true } async-trait = "0.1.57" lru = "0.8" diff --git a/node/service/src/parachains_db/upgrade.rs b/node/service/src/parachains_db/upgrade.rs index ad995f41ed82..73321ae04c09 100644 --- a/node/service/src/parachains_db/upgrade.rs +++ b/node/service/src/parachains_db/upgrade.rs @@ -121,7 +121,7 @@ fn rocksdb_migrate_from_version_0_to_1(path: &Path) -> Result<(), Error> { .to_str() .ok_or_else(|| super::other_io_error("Invalid database path".into()))?; let db_cfg = DatabaseConfig::with_columns(super::columns::v0::NUM_COLUMNS); - let db = Database::open(&db_cfg, db_path)?; + let mut db = Database::open(&db_cfg, db_path)?; db.add_column()?; db.add_column()?; diff --git a/node/subsystem-util/Cargo.toml b/node/subsystem-util/Cargo.toml index 6f120beec7cb..26eca7aa8f1f 100644 --- a/node/subsystem-util/Cargo.toml +++ b/node/subsystem-util/Cargo.toml @@ -32,8 +32,8 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } -kvdb = "0.11.0" -parity-util-mem = { version = "0.11", default-features = false } +kvdb = "0.12.0" +parity-util-mem = { version = "0.12.0", default-features = false } parity-db = { version = "0.3.13" } [dev-dependencies] @@ -44,5 +44,5 @@ log = "0.4.17" polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" } lazy_static = "1.4.0" polkadot-primitives-test-helpers = { path = "../../primitives/test-helpers" } -kvdb-shared-tests = "0.9.0" +kvdb-shared-tests = "0.10.0" tempfile = "3.1.0" diff --git a/node/subsystem-util/src/database.rs b/node/subsystem-util/src/database.rs index a6b31043302f..6f338b5d6440 100644 --- a/node/subsystem-util/src/database.rs +++ b/node/subsystem-util/src/database.rs @@ -16,7 +16,7 @@ //! Database trait for polkadot db. -pub use kvdb::{DBTransaction, DBValue, KeyValueDB}; +pub use kvdb::{DBKeyValue, DBTransaction, DBValue, KeyValueDB}; /// Database trait with ordered key capacity. pub trait Database: KeyValueDB { @@ -27,7 +27,7 @@ pub trait Database: KeyValueDB { /// Implementation for database supporting `KeyValueDB` already. pub mod kvdb_impl { - use super::{DBTransaction, DBValue, Database, KeyValueDB}; + use super::{DBKeyValue, DBTransaction, DBValue, Database, KeyValueDB}; use kvdb::{DBOp, IoStats, IoStatsKind}; use parity_util_mem::{MallocSizeOf, MallocSizeOfOps}; use std::{collections::BTreeSet, io::Result}; @@ -86,7 +86,7 @@ pub mod kvdb_impl { self.db.get(col, key) } - fn get_by_prefix(&self, col: u32, prefix: &[u8]) -> Option> { + fn get_by_prefix(&self, col: u32, prefix: &[u8]) -> Result> { self.ensure_is_indexed(col); self.db.get_by_prefix(col, prefix) } @@ -96,7 +96,7 @@ pub mod kvdb_impl { self.db.write(transaction) } - fn iter<'a>(&'a self, col: u32) -> Box, Box<[u8]>)> + 'a> { + fn iter<'a>(&'a self, col: u32) -> Box> + 'a> { self.ensure_is_indexed(col); self.db.iter(col) } @@ -105,15 +105,11 @@ pub mod kvdb_impl { &'a self, col: u32, prefix: &'a [u8], - ) -> Box, Box<[u8]>)> + 'a> { + ) -> Box> + 'a> { self.ensure_is_indexed(col); self.db.iter_with_prefix(col, prefix) } - fn restore(&self, _new_db: &str) -> Result<()> { - unimplemented!("restore is unsupported") - } - fn io_stats(&self, kind: IoStatsKind) -> IoStats { self.db.io_stats(kind) } @@ -122,7 +118,7 @@ pub mod kvdb_impl { self.db.has_key(col, key) } - fn has_prefix(&self, col: u32, prefix: &[u8]) -> bool { + fn has_prefix(&self, col: u32, prefix: &[u8]) -> Result { self.ensure_is_indexed(col); self.db.has_prefix(col, prefix) } @@ -138,8 +134,8 @@ pub mod kvdb_impl { /// Utilities for using parity-db database. pub mod paritydb_impl { - use super::{DBTransaction, DBValue, Database, KeyValueDB}; - use kvdb::{DBOp, IoStats, IoStatsKind}; + use super::{DBKeyValue, DBTransaction, DBValue, Database, KeyValueDB}; + use kvdb::DBOp; use parity_db::Db; use parking_lot::Mutex; use std::{collections::BTreeSet, io::Result, sync::Arc}; @@ -179,18 +175,20 @@ pub mod paritydb_impl { map_err(self.db.get(col as u8, key)) } - fn get_by_prefix(&self, col: u32, prefix: &[u8]) -> Option> { - self.iter_with_prefix(col, prefix).next().map(|(_, v)| v) + fn get_by_prefix(&self, col: u32, prefix: &[u8]) -> Result> { + self.iter_with_prefix(col, prefix) + .next() + .transpose() + .map(|mb| mb.map(|(_, v)| v)) } - fn iter<'a>(&'a self, col: u32) -> Box, Box<[u8]>)> + 'a> { - let mut iter = handle_err(self.db.iter(col as u8)); + fn iter<'a>(&'a self, col: u32) -> Box> + 'a> { + let mut iter = match self.db.iter(col as u8) { + Ok(iter) => iter, + Err(e) => return Box::new(std::iter::once(map_err(Err(e)))), + }; Box::new(std::iter::from_fn(move || { - if let Some((key, value)) = handle_err(iter.next()) { - Some((key.into_boxed_slice(), value.into_boxed_slice())) - } else { - None - } + iter.next().transpose().map(|r| map_err(r.map(|(k, v)| (k.into(), v)))) })) } @@ -198,39 +196,26 @@ pub mod paritydb_impl { &'a self, col: u32, prefix: &'a [u8], - ) -> Box, Box<[u8]>)> + 'a> { + ) -> Box> + 'a> { if prefix.len() == 0 { return self.iter(col) } - let mut iter = handle_err(self.db.iter(col as u8)); - handle_err(iter.seek(prefix)); + let mut iter = match self.db.iter(col as u8) { + Ok(iter) => iter, + Err(e) => return Box::new(std::iter::once(map_err(Err(e)))), + }; + if let Err(e) = iter.seek(prefix) { + return Box::new(std::iter::once(map_err(Err(e)))) + } Box::new(std::iter::from_fn(move || { - if let Some((key, value)) = handle_err(iter.next()) { - key.starts_with(prefix) - .then(|| (key.into_boxed_slice(), value.into_boxed_slice())) - } else { - None - } + iter.next().transpose().and_then(|r| { + map_err(r.map(|(k, v)| k.starts_with(prefix).then(|| (k.into(), v)))) + .transpose() + }) })) } - fn restore(&self, _new_db: &str) -> Result<()> { - unimplemented!("restore is unsupported") - } - - fn io_stats(&self, _kind: IoStatsKind) -> IoStats { - unimplemented!("io_stats not supported by parity_db"); - } - - fn has_key(&self, col: u32, key: &[u8]) -> Result { - map_err(self.db.get_size(col as u8, key).map(|r| r.is_some())) - } - - fn has_prefix(&self, col: u32, prefix: &[u8]) -> bool { - self.get_by_prefix(col, prefix).is_some() - } - - fn write(&self, transaction: DBTransaction) -> std::io::Result<()> { + fn write(&self, transaction: DBTransaction) -> Result<()> { let mut ops = transaction.ops.into_iter(); // TODO using a key iterator or native delete here would be faster. let mut current_prefix_iter: Option<(parity_db::BTreeIterator, u8, Vec)> = None; diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml index 42ffbfab1fa6..c07ec98d7cb9 100644 --- a/parachain/Cargo.toml +++ b/parachain/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" # 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.1.5", default-features = false, features = [ "derive" ] } -parity-util-mem = { version = "0.11.0", default-features = false, optional = true } +parity-util-mem = { version = "0.12.0", default-features = false, optional = true } 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/primitives/Cargo.toml b/primitives/Cargo.toml index d018cfdf9e54..67fc2d31cee8 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -27,7 +27,7 @@ trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", b bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } hex-literal = "0.3.4" -parity-util-mem = { version = "0.11.0", default-features = false, optional = true } +parity-util-mem = { version = "0.12.0", default-features = false, optional = true } [features] default = ["std"]