From afc1dc071124ad52a65b96c7701dc07343a68ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Mon, 6 Jan 2020 22:46:55 +0000 Subject: [PATCH 1/4] service: reset grandpa into a future round (not past) --- service/src/lib.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/service/src/lib.rs b/service/src/lib.rs index 5290f2877f8f..4a0c137c7d77 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -295,6 +295,10 @@ pub fn kusama_grandpa_hotfix( Runtime: Send + Sync, { let authority_set = &persistent_data.authority_set; + let last_completed_round = persistent_data.set_state + .read() + .last_completed_round() + .number; let finalized = { use sp_blockchain::HeaderBackend; @@ -303,9 +307,13 @@ pub fn kusama_grandpa_hotfix( }; let canon_finalized_height = 516509; - if authority_set.set_id() == 235 && finalized.1 == canon_finalized_height { - let set_state = grandpa::VoterSetState::::live( + if authority_set.set_id() == 235 && + last_completed_round < 999999 && + finalized.1 == canon_finalized_height { + + let set_state = grandpa::VoterSetState::::live_at( authority_set.set_id(), + 999999, &authority_set.inner().read(), finalized, ); From ee8c8acca41ddd1084300c53e69bb6872f3c381c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Mon, 6 Jan 2020 22:49:33 +0000 Subject: [PATCH 2/4] update substrate version --- Cargo.lock | 204 ++++++++++++++++++++++++++--------------------------- 1 file changed, 102 insertions(+), 102 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ca91083592d6..3f1afb07c07f 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#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -2991,7 +2991,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3009,7 +3009,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3026,7 +3026,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3047,7 +3047,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3061,7 +3061,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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 +3077,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3092,7 +3092,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3105,7 +3105,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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 +3121,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3139,7 +3139,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3154,7 +3154,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3173,7 +3173,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3190,7 +3190,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3204,7 +3204,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3218,7 +3218,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3233,7 +3233,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3246,7 +3246,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3265,7 +3265,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3285,7 +3285,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3296,7 +3296,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3312,7 +3312,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3325,7 +3325,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3342,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#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3355,7 +3355,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -3369,7 +3369,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -4571,7 +4571,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -4596,7 +4596,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -4610,7 +4610,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -4625,7 +4625,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -4636,7 +4636,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -4671,7 +4671,7 @@ dependencies = [ [[package]] name = "sc-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -4704,7 +4704,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -4735,7 +4735,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4760,7 +4760,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -4800,7 +4800,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -4819,7 +4819,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -4833,7 +4833,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -4860,7 +4860,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -4875,7 +4875,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -4891,7 +4891,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -4915,7 +4915,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -4945,7 +4945,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -4960,7 +4960,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5005,7 +5005,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5021,7 +5021,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5048,7 +5048,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5059,7 +5059,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5088,7 +5088,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5110,7 +5110,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5125,7 +5125,7 @@ dependencies = [ [[package]] name = "sc-service" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5172,7 +5172,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5183,7 +5183,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5205,7 +5205,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5221,7 +5221,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5236,7 +5236,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5521,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#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5535,7 +5535,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5547,7 +5547,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5559,7 +5559,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5572,7 +5572,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5584,7 +5584,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5595,7 +5595,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5607,7 +5607,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5623,7 +5623,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5642,7 +5642,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5658,7 +5658,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5697,7 +5697,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5707,7 +5707,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5717,7 +5717,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5730,7 +5730,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5740,7 +5740,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5752,7 +5752,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5769,7 +5769,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5780,7 +5780,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5789,7 +5789,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5798,7 +5798,7 @@ dependencies = [ [[package]] name = "sp-phragmen" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5808,7 +5808,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5817,7 +5817,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5836,7 +5836,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5851,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#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5863,7 +5863,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5872,7 +5872,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5882,7 +5882,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5892,7 +5892,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5911,12 +5911,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" [[package]] name = "sp-storage" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5927,7 +5927,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5941,7 +5941,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5955,7 +5955,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" dependencies = [ "hash-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)", @@ -5969,7 +5969,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -5981,7 +5981,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", @@ -6085,7 +6085,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#1a78c8831daf77574a0905f3528f00fe4d153416" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#02860ec6ba13d1aafc5b04d5a9e5ee60e6e76613" 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)", From 6a76b2a3c9dca9f29dc2b1aebc9b4e485840f13c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Mon, 6 Jan 2020 22:50:18 +0000 Subject: [PATCH 3/4] service: create grandpa reset round variable --- service/src/lib.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/service/src/lib.rs b/service/src/lib.rs index 4a0c137c7d77..3a485b6344f6 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -307,13 +307,14 @@ pub fn kusama_grandpa_hotfix( }; let canon_finalized_height = 516509; + let grandpa_reset_round = 999999; if authority_set.set_id() == 235 && - last_completed_round < 999999 && + last_completed_round < grandpa_reset_round && finalized.1 == canon_finalized_height { let set_state = grandpa::VoterSetState::::live_at( authority_set.set_id(), - 999999, + grandpa_reset_round, &authority_set.inner().read(), finalized, ); From 069cd690e8831033b511449939d740d383844823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Mon, 6 Jan 2020 23:10:09 +0000 Subject: [PATCH 4/4] service: fine grained grandpa reset on startup --- service/src/lib.rs | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/service/src/lib.rs b/service/src/lib.rs index 3a485b6344f6..a92cc7e7ca39 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -294,29 +294,50 @@ pub fn kusama_grandpa_hotfix( Dispatch: NativeExecutionDispatch, Runtime: Send + Sync, { + use std::str::FromStr; + use sp_blockchain::HeaderBackend; + let authority_set = &persistent_data.authority_set; let last_completed_round = persistent_data.set_state .read() .last_completed_round() .number; + let canon_finalized_block = 516509; + let canon_finalized_hash = primitives::H256::from_str( + "f432b7655a848094e6c67f8064ea642bd18f5cf184e1cf9f05a1a9886dd8b9cc", + ).unwrap(); + let finalized = { - use sp_blockchain::HeaderBackend; let info = client.info(); (info.finalized_hash, info.finalized_number) }; - let canon_finalized_height = 516509; + // our finalized block is lower than the fork block, nothing to do + if finalized.1 < canon_finalized_block { + return; + } + + // we have finalized past the fork block, we need to make sure we're on the + // correct fork (should be guaranteed by the previous chain revert) + if finalized.1 >= canon_finalized_block { + assert_eq!( + client.hash(canon_finalized_block).unwrap().unwrap(), + canon_finalized_hash, + ); + } + + // assuming the previous preconditions, if we are in any previous grandpa + // round then we restart at the given reset round. let grandpa_reset_round = 999999; if authority_set.set_id() == 235 && - last_completed_round < grandpa_reset_round && - finalized.1 == canon_finalized_height { - + last_completed_round < grandpa_reset_round + { let set_state = grandpa::VoterSetState::::live_at( authority_set.set_id(), grandpa_reset_round, &authority_set.inner().read(), - finalized, + (canon_finalized_hash, canon_finalized_block), ); persistent_data.set_state = set_state.into();