From f1d06780cf39578274af163e35df2f0e46ddd44a Mon Sep 17 00:00:00 2001 From: Gavin Wood Date: Mon, 6 Jan 2020 17:45:28 +0000 Subject: [PATCH] Hotfix for Kusama (#724) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * cli: revert borked kusama chain on startup * Docs. * cli: fix reversal of bork kusama fork * cli: force always can author * Version bump * service: support setting fork blocks in config * service: add support for bad blocks extension * service: add badBlocks to kusama chainspec * Bump Substrate to hotfix version. * service: add bad block to kusama chain spec * cleanup kusama hotfix * add kusama grandpa hotfix * Bump substrate * Bump spec_version * Rebump * cli: remove unnecessary dependencies * service: revert can_author_with fix * service: remove unnecessary method * Don't try to track polkadot runtime verion yet * Versions * service: better grandpa fix detection Co-authored-by: André Silva --- Cargo.lock | 269 +++++++++++++++----------------- cli/src/lib.rs | 14 +- runtime/common/Cargo.toml | 4 +- runtime/kusama/Cargo.toml | 2 +- runtime/kusama/src/lib.rs | 2 +- runtime/polkadot/Cargo.toml | 2 +- runtime/polkadot/src/lib.rs | 3 - scripts/gitlab/check_runtime.sh | 4 +- service/res/kusama.json | 3 + service/src/chain_spec.rs | 2 + service/src/lib.rs | 60 ++++++- 11 files changed, 206 insertions(+), 159 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 37946dac1a2a..ca91083592d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1109,7 +1109,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "fork-tree" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1117,7 +1117,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -1131,7 +1131,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1142,7 +1142,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "frame-metadata 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -1166,7 +1166,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support-procedural-tools 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1177,7 +1177,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support-procedural-tools-derive 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1189,7 +1189,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1199,7 +1199,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1216,7 +1216,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -1529,7 +1529,7 @@ dependencies = [ [[package]] name = "grafana-data-source" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "async-std 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2068,7 +2068,7 @@ dependencies = [ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "polkadot-parachain 0.7.11", "polkadot-primitives 0.7.11", - "polkadot-runtime-common 0.7.10", + "polkadot-runtime-common 0.7.11", "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2092,7 +2092,7 @@ dependencies = [ "sp-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-wasm-builder-runner 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "trie-db 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "trie-db 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2139,23 +2139,6 @@ dependencies = [ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "kvdb-rocksdb" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", - "fs-swap 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "interleaved-ordered 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", - "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rocksdb 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "kvdb-rocksdb" version = "0.3.0" @@ -2735,12 +2718,13 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.15.2" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "ahash 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-util-mem 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-util-mem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3007,7 +2991,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3025,7 +3009,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3042,7 +3026,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3063,7 +3047,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3077,7 +3061,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3093,7 +3077,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3108,7 +3092,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3121,7 +3105,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3137,7 +3121,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3155,7 +3139,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "enumflags2 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3170,7 +3154,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3189,7 +3173,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3206,7 +3190,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3220,7 +3204,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3234,7 +3218,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3249,7 +3233,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3262,7 +3246,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3281,7 +3265,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3301,7 +3285,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3312,7 +3296,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3328,7 +3312,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3341,7 +3325,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3358,7 +3342,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3371,7 +3355,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3385,7 +3369,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3494,7 +3478,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "parity-util-mem" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3893,7 +3877,7 @@ dependencies = [ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "polkadot-parachain 0.7.11", "polkadot-primitives 0.7.11", - "polkadot-runtime-common 0.7.10", + "polkadot-runtime-common 0.7.11", "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3916,12 +3900,12 @@ dependencies = [ "sp-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-wasm-builder-runner 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "trie-db 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "trie-db 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "polkadot-runtime-common" -version = "0.7.10" +version = "0.7.11" dependencies = [ "bitvec 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3955,7 +3939,7 @@ dependencies = [ "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "trie-db 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "trie-db 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4587,7 +4571,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4598,6 +4582,7 @@ dependencies = [ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "prost 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "prost-build 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sc-keystore 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sc-network 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4611,7 +4596,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4625,7 +4610,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "sc-chain-spec-derive 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4640,7 +4625,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4651,7 +4636,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", "app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4686,14 +4671,14 @@ dependencies = [ [[package]] name = "sc-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4719,14 +4704,14 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4750,12 +4735,12 @@ dependencies = [ [[package]] name = "sc-client-db" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-rocksdb 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-memorydb 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-rocksdb 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4775,7 +4760,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4815,7 +4800,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures-timer 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4834,7 +4819,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4848,7 +4833,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4875,7 +4860,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4890,7 +4875,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4906,7 +4891,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4930,7 +4915,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "finality-grandpa 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4960,7 +4945,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4975,7 +4960,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5020,7 +5005,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5036,7 +5021,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5063,7 +5048,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "libp2p 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5074,7 +5059,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5103,7 +5088,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5125,7 +5110,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-http-server 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5140,7 +5125,7 @@ dependencies = [ [[package]] name = "sc-service" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "exit-future 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5187,7 +5172,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5198,7 +5183,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5220,7 +5205,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "erased-serde 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "grafana-data-source 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -5236,7 +5221,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5251,7 +5236,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5536,7 +5521,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "sp-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-api-proc-macro 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -5550,7 +5535,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5562,7 +5547,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5574,7 +5559,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5587,7 +5572,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -5599,7 +5584,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -5610,7 +5595,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -5622,7 +5607,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5638,7 +5623,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5657,7 +5642,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "schnorrkel 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5673,7 +5658,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5712,7 +5697,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5722,7 +5707,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "environmental 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -5732,7 +5717,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5745,7 +5730,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -5755,7 +5740,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5767,7 +5752,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "libsecp256k1 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5784,7 +5769,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -5795,7 +5780,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -5804,7 +5789,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5813,7 +5798,7 @@ dependencies = [ [[package]] name = "sp-phragmen" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -5823,7 +5808,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -5832,7 +5817,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5851,7 +5836,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "environmental 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5866,7 +5851,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "Inflector 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5878,7 +5863,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5887,7 +5872,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -5897,7 +5882,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -5907,7 +5892,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5919,19 +5904,19 @@ dependencies = [ "sp-externalities 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sp-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "trie-db 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "trie-db 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", "trie-root 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "sp-std" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" [[package]] name = "sp-storage" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5942,9 +5927,10 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -5955,7 +5941,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5969,21 +5955,21 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", - "memory-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", + "memory-db 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "trie-db 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "trie-db 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", "trie-root 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "sp-version" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5995,7 +5981,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "wasmi 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6099,7 +6085,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#b94464fb8ee3f72404de08e1589c552822da8d39" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" dependencies = [ "frame-system-rpc-runtime-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6603,14 +6589,14 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.16.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7446,7 +7432,6 @@ dependencies = [ "checksum kvdb 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cecee8d85a74f6b8284710d52a7d1196f09e31f8217e1f184a475b509d360554" "checksum kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "296c12309ed36cb74d59206406adbf1971c3baa56d5410efdb508d8f1c60a351" "checksum kvdb-memorydb 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0a5d70712b1fe0f02ce7ee36a962fcb0b15d0fe11262ba21a4aa839ef22cf60d" -"checksum kvdb-rocksdb 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d3f82177237c1ae67d6ab208a6f790cab569a1d81c1ba02348e0736a99510be3" "checksum kvdb-rocksdb 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54cc6b52f7e511de9f07fd77cda70247adfc6b8192e4b5a1b6dbca416dc425b5" "checksum kvdb-web 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a5dddd64e88162576fdfbffc5409be89e10f95d367203321c30f8466a7774258" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" @@ -7491,7 +7476,7 @@ dependencies = [ "checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" "checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" -"checksum memory-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ef49315991403ba5fa225a70399df5e115f57b274cb0b1b4bcd6e734fa5bd783" +"checksum memory-db 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "828bdf600636e90c56652689f7c3823ae2072104e4b0b5e83ea984f592f12ab9" "checksum memory_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" "checksum memrange 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cc29ba65898edc4fdc252cb31cd3925f37c1a8ba25bb46eec883569984976530" "checksum merlin 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "de2d16d3b15fec5943d1144f861f61f279d165fdd60998ca262913b9bf1c8adb" @@ -7555,7 +7540,7 @@ dependencies = [ "checksum parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f9f9d99dae413590a5f37e43cd99b94d4e62a244160562899126913ea7108673" "checksum parity-scale-codec-derive 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "492ac3aa93d6caa5d20e4e3e0b75d08e2dcd9dd8a50d19529548b6fe11b3f295" "checksum parity-send-wrapper 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" -"checksum parity-util-mem 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "570093f39f786beea92dcc09e45d8aae7841516ac19a50431953ac82a0e8f85c" +"checksum parity-util-mem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8174d85e62c4d615fddd1ef67966bdc5757528891d0742f15b131ad04667b3f9" "checksum parity-wasm 0.31.3 (registry+https://github.com/rust-lang/crates.io-index)" = "511379a8194230c2395d2f5fa627a5a7e108a9f976656ce723ae68fca4097bfc" "checksum parity-wasm 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc878dac00da22f8f61e7af3157988424567ab01d9920b962ef7dcbd7cd865" "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" @@ -7793,7 +7778,7 @@ dependencies = [ "checksum tracing 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ff4e4f59e752cb3beb5b61c6d5e11191c7946231ba84faec2902c9efdd8691c5" "checksum tracing-attributes 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a4263b12c3d3c403274493eb805966093b53214124796552d674ca1dd5d27c2b" "checksum tracing-core 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bc913647c520c959b6d21e35ed8fa6984971deca9f0a2fcb8c51207e0c56af1d" -"checksum trie-db 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "784a9813d23f18bccab728ab039c39b8a87d0d6956dcdece39e92f5cffe5076e" +"checksum trie-db 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "191fda5d0106f3ed35a8c6875428b213e15c516e48129cc263dd7ad16e9a665f" "checksum trie-root 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0b779f7c1c8fe9276365d9d5be5c4b5adeacf545117bb3f64c974305789c5c0b" "checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" "checksum twofish 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d261e83e727c8e2dbb75dacac67c36e35db36a958ee504f2164fc052434e1" diff --git a/cli/src/lib.rs b/cli/src/lib.rs index 5679dbed93a9..8109dafb0c44 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -140,11 +140,15 @@ where service::new_light::(config).map_err(|e| format!("{:?}", e))?, exit.into_exit(), ), - _ => run_until_exit( - runtime, - service::new_full::(config).map_err(|e| format!("{:?}", e))?, - exit.into_exit(), - ), + _ => { + service::kusama_chain_hotfix::(&config); + + run_until_exit( + runtime, + service::new_full::(config).map_err(|e| format!("{:?}", e))?, + exit.into_exit(), + ) + }, }.map_err(|e| format!("{:?}", e)) }), cli::ParseAndPrepare::BuildSpec(cmd) => cmd.run::(&load_spec), diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index a7b2eea716a8..e53c92036480 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-runtime-common" -version = "0.7.10" +version = "0.7.11" authors = ["Parity Technologies "] edition = "2018" @@ -41,7 +41,7 @@ babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -trie-db = "0.16.0" +trie-db = "0.18.0" serde_json = "1.0.41" [features] diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index 381a5e2986c7..2ae03b49ec31 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -68,7 +68,7 @@ libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -trie-db = "0.16.0" +trie-db = "0.18.0" serde_json = "1.0.41" [build-dependencies] diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 5a14b5aa14ef..45463321cf2e 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -79,7 +79,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_name: create_runtime_str!("parity-kusama"), authoring_version: 2, spec_version: 1034, - impl_version: 0, + impl_version: 1, apis: RUNTIME_API_VERSIONS, }; diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml index be595a2236d3..cb5412401f0c 100644 --- a/runtime/polkadot/Cargo.toml +++ b/runtime/polkadot/Cargo.toml @@ -66,7 +66,7 @@ libsecp256k1 = "0.3.2" tiny-keccak = "1.5.0" keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -trie-db = "0.16.0" +trie-db = "0.18.0" serde_json = "1.0.41" [build-dependencies] diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index e1bff59cd3c3..b3ce8c545fc8 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -273,11 +273,8 @@ pallet_staking_reward_curve::build! { parameter_types! { // Six sessions in an era (24 hours). -// pub const SessionsPerEra: SessionIndex = 6; pub const SessionsPerEra: SessionIndex = 6; // 28 eras for unbonding (28 days). - // KUSAMA: This value is 1/4 of what we expect for the mainnet, however session length is also - // a quarter, so the figure remains the same. pub const BondingDuration: staking::EraIndex = 28; pub const SlashDeferDuration: staking::EraIndex = 28; pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE; diff --git a/scripts/gitlab/check_runtime.sh b/scripts/gitlab/check_runtime.sh index 9513f6f008d3..cdb7538d1f2a 100755 --- a/scripts/gitlab/check_runtime.sh +++ b/scripts/gitlab/check_runtime.sh @@ -29,8 +29,8 @@ github_label () { } - -for VERSIONS_FILE in runtime/kusama/src/lib.rs runtime/polkadot/src/lib.rs +# Introduce runtime/polkadot/src/lib.rs once Polkadot mainnet is live. +for VERSIONS_FILE in runtime/kusama/src/lib.rs do # check if the wasm sources changed if ! git diff --name-only origin/master...${CI_COMMIT_SHA} \ diff --git a/service/res/kusama.json b/service/res/kusama.json index 12ea502915f6..d12786ec0705 100644 --- a/service/res/kusama.json +++ b/service/res/kusama.json @@ -26,6 +26,9 @@ }, "consensusEngine": null, "forkBlocks": null, + "badBlocks": [ + "0x15b1b925b0aa5cfe43c88cd024f74258cb5cfe3af424882c901014e8acd0d241" + ], "genesis": { "raw": [ { diff --git a/service/src/chain_spec.rs b/service/src/chain_spec.rs index 1bace1edadd1..d00ead0a6066 100644 --- a/service/src/chain_spec.rs +++ b/service/src/chain_spec.rs @@ -43,6 +43,8 @@ const DEFAULT_PROTOCOL_ID: &str = "dot"; pub struct Extensions { /// Block numbers with known hashes. pub fork_blocks: client::ForkBlocks, + /// Known bad block hashes. + pub bad_blocks: client::BadBlocks, } /// The `ChainSpec`. diff --git a/service/src/lib.rs b/service/src/lib.rs index 37db8cf423f1..5290f2877f8f 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -263,6 +263,57 @@ pub fn kusama_new_full(config: Configuration) new_full(config) } +pub fn kusama_chain_hotfix(config: &Configuration) where + Dispatch: NativeExecutionDispatch, + Runtime: Send + Sync, +{ + use std::str::FromStr; + use sp_blockchain::HeaderBackend; + + let client: service::TFullClient = + service::new_full_client(&config).unwrap(); + + let fork_block = 516510; // target_block - reverted_blocks + 1; + let fork_hash = primitives::H256::from_str( + "15b1b925b0aa5cfe43c88cd024f74258cb5cfe3af424882c901014e8acd0d241", + ).unwrap(); + + let best_number = client.info().best_number; + let target_hash = client.hash(fork_block).unwrap(); + + if target_hash == Some(fork_hash) { + let diff = best_number.saturating_sub(fork_block - 1); + client.unsafe_revert(diff).unwrap(); + } +} + +pub fn kusama_grandpa_hotfix( + client: &service::TFullClient, + persistent_data: &mut grandpa::PersistentData, +) where + Dispatch: NativeExecutionDispatch, + Runtime: Send + Sync, +{ + let authority_set = &persistent_data.authority_set; + + let finalized = { + use sp_blockchain::HeaderBackend; + let info = client.info(); + (info.finalized_hash, info.finalized_number) + }; + + let canon_finalized_height = 516509; + if authority_set.set_id() == 235 && finalized.1 == canon_finalized_height { + let set_state = grandpa::VoterSetState::::live( + authority_set.set_id(), + &authority_set.inner().read(), + finalized, + ); + + persistent_data.set_state = set_state.into(); + } +} + /// Builds a new service for a full client. pub fn new_full(config: Configuration) -> Result(config: Configuration) )? .build()?; - let (block_import, link_half, babe_link) = import_setup.take() + let (block_import, mut link_half, babe_link) = import_setup.take() .expect("Link Half and Block Import are present for Full Services or setup failed before. qed"); let client = service.client(); @@ -411,7 +462,6 @@ pub fn new_full(config: Configuration) let can_author_with = consensus_common::CanAuthorWithNativeVersion::new(client.executor().clone()); - let block_import = availability_store.block_import( block_import, client.clone(), @@ -477,6 +527,11 @@ pub fn new_full(config: Configuration) let enable_grandpa = !disable_grandpa; if enable_grandpa { + kusama_grandpa_hotfix( + &client, + &mut link_half.persistent_data, + ); + // start the full GRANDPA voter // NOTE: unlike in substrate we are currently running the full // GRANDPA voter protocol for all full nodes (regardless of whether @@ -493,6 +548,7 @@ pub fn new_full(config: Configuration) voting_rule: grandpa::VotingRulesBuilder::default().build(), executor: service.spawn_task_handle(), }; + service.spawn_essential_task(grandpa::run_grandpa_voter(grandpa_config)?); } else { grandpa::setup_disabled_grandpa(