From 39397abb75770534d5fcdc21109b59f1a8d623de Mon Sep 17 00:00:00 2001 From: Gavin Wood Date: Tue, 29 Oct 2019 22:41:06 +0100 Subject: [PATCH] Backport of Substrate update (#515) * Update Substrate (#514) * Update Substrate * Attempt a fix * Update substrate again * Fix compilation * update substrate add support for sentry * Fixes tests * Actually update substrate --- Cargo.lock | 279 +++++++++++++++++++------------------- cli/src/lib.rs | 4 +- runtime/src/lib.rs | 28 +--- runtime/src/parachains.rs | 16 ++- runtime/src/registrar.rs | 2 +- service/src/lib.rs | 13 +- 6 files changed, 170 insertions(+), 172 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 31cdcdf931bb..313a12f01b12 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -152,7 +152,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -765,9 +765,9 @@ name = "failure_derive" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -849,7 +849,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#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1281,7 +1281,7 @@ dependencies = [ [[package]] name = "impl-serde" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1289,12 +1289,12 @@ dependencies = [ [[package]] name = "impl-trait-for-tuples" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2061,8 +2061,8 @@ name = "malloc_size_of_derive" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2589,9 +2589,9 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2960,7 +2960,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fixed-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "impl-codec 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "impl-serde 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "uint 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2977,9 +2977,9 @@ name = "proc-macro-error" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2987,9 +2987,9 @@ name = "proc-macro-hack" version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3002,7 +3002,7 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3079,7 +3079,7 @@ name = "quote" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3508,9 +3508,9 @@ name = "serde_derive" version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3708,7 +3708,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "sr-api-macros" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" 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)", @@ -3720,7 +3720,7 @@ dependencies = [ [[package]] name = "sr-arithmetic" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3733,7 +3733,7 @@ dependencies = [ [[package]] name = "sr-io" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "libsecp256k1 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3751,9 +3751,9 @@ dependencies = [ [[package]] name = "sr-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ - "impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "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.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3769,7 +3769,7 @@ dependencies = [ [[package]] name = "sr-staking-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3779,7 +3779,7 @@ dependencies = [ [[package]] name = "sr-std" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3787,9 +3787,9 @@ dependencies = [ [[package]] name = "sr-version" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ - "impl-serde 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3799,7 +3799,7 @@ dependencies = [ [[package]] name = "srml-authority-discovery" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3816,9 +3816,9 @@ dependencies = [ [[package]] name = "srml-authorship" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ - "impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3832,7 +3832,7 @@ dependencies = [ [[package]] name = "srml-babe" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3852,7 +3852,7 @@ dependencies = [ [[package]] name = "srml-balances" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3867,7 +3867,7 @@ dependencies = [ [[package]] name = "srml-collective" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3883,7 +3883,7 @@ dependencies = [ [[package]] name = "srml-democracy" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3898,23 +3898,20 @@ dependencies = [ [[package]] name = "srml-elections-phragmen" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-phragmen 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", ] [[package]] name = "srml-executive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3928,9 +3925,9 @@ dependencies = [ [[package]] name = "srml-finality-tracker" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ - "impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3943,7 +3940,7 @@ dependencies = [ [[package]] name = "srml-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3961,7 +3958,7 @@ dependencies = [ [[package]] name = "srml-im-online" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3979,7 +3976,7 @@ dependencies = [ [[package]] name = "srml-indices" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3996,7 +3993,7 @@ dependencies = [ [[package]] name = "srml-membership" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4010,7 +4007,7 @@ dependencies = [ [[package]] name = "srml-metadata" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4021,7 +4018,7 @@ dependencies = [ [[package]] name = "srml-nicks" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4035,7 +4032,7 @@ dependencies = [ [[package]] name = "srml-offences" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4050,7 +4047,7 @@ dependencies = [ [[package]] name = "srml-randomness-collective-flip" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4063,9 +4060,9 @@ dependencies = [ [[package]] name = "srml-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ - "impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (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.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4082,7 +4079,7 @@ dependencies = [ [[package]] name = "srml-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4102,18 +4099,18 @@ dependencies = [ [[package]] name = "srml-staking-reward-curve" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "srml-sudo" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4127,10 +4124,10 @@ dependencies = [ [[package]] name = "srml-support" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", "once_cell 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4148,7 +4145,7 @@ dependencies = [ [[package]] name = "srml-support-procedural" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4160,7 +4157,7 @@ dependencies = [ [[package]] name = "srml-support-procedural-tools" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4172,7 +4169,7 @@ dependencies = [ [[package]] name = "srml-support-procedural-tools-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4182,9 +4179,9 @@ dependencies = [ [[package]] name = "srml-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ - "impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (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.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4199,7 +4196,7 @@ dependencies = [ [[package]] name = "srml-system-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "jsonrpc-core 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core-client 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4217,7 +4214,7 @@ dependencies = [ [[package]] name = "srml-system-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4226,9 +4223,9 @@ dependencies = [ [[package]] name = "srml-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ - "impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4241,7 +4238,7 @@ dependencies = [ [[package]] name = "srml-transaction-payment" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4254,7 +4251,7 @@ dependencies = [ [[package]] name = "srml-transaction-payment-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "jsonrpc-core 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core-client 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4271,7 +4268,7 @@ dependencies = [ [[package]] name = "srml-transaction-payment-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4283,7 +4280,7 @@ dependencies = [ [[package]] name = "srml-treasury" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4346,9 +4343,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4370,7 +4367,7 @@ dependencies = [ [[package]] name = "substrate-application-crypto" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4382,7 +4379,7 @@ dependencies = [ [[package]] name = "substrate-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4404,7 +4401,7 @@ dependencies = [ [[package]] name = "substrate-authority-discovery-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4426,9 +4423,9 @@ dependencies = [ [[package]] name = "substrate-chain-spec" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ - "impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4441,18 +4438,18 @@ dependencies = [ [[package]] name = "substrate-chain-spec-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-cli" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" 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)", @@ -4488,7 +4485,7 @@ dependencies = [ [[package]] name = "substrate-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4518,7 +4515,7 @@ dependencies = [ [[package]] name = "substrate-client-db" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", @@ -4542,7 +4539,7 @@ dependencies = [ [[package]] name = "substrate-consensus-babe" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4580,7 +4577,7 @@ dependencies = [ [[package]] name = "substrate-consensus-babe-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "schnorrkel 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4594,7 +4591,7 @@ dependencies = [ [[package]] name = "substrate-consensus-common" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4613,7 +4610,7 @@ dependencies = [ [[package]] name = "substrate-consensus-slots" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "futures-timer 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4631,7 +4628,7 @@ dependencies = [ [[package]] name = "substrate-consensus-uncles" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4645,17 +4642,17 @@ dependencies = [ [[package]] name = "substrate-debug-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-executor" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4679,7 +4676,7 @@ dependencies = [ [[package]] name = "substrate-externalities" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "environmental 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "primitive-types 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4690,7 +4687,7 @@ dependencies = [ [[package]] name = "substrate-finality-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "finality-grandpa 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4719,7 +4716,7 @@ dependencies = [ [[package]] name = "substrate-finality-grandpa-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4732,7 +4729,7 @@ dependencies = [ [[package]] name = "substrate-header-metadata" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4742,7 +4739,7 @@ dependencies = [ [[package]] name = "substrate-inherents" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4753,7 +4750,7 @@ dependencies = [ [[package]] name = "substrate-keyring" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4765,7 +4762,7 @@ dependencies = [ [[package]] name = "substrate-keystore" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4780,7 +4777,7 @@ dependencies = [ [[package]] name = "substrate-network" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" 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)", @@ -4822,7 +4819,7 @@ dependencies = [ [[package]] name = "substrate-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" 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)", @@ -4849,7 +4846,7 @@ dependencies = [ [[package]] name = "substrate-offchain-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4858,7 +4855,7 @@ dependencies = [ [[package]] name = "substrate-panic-handler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" 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)", @@ -4867,7 +4864,7 @@ dependencies = [ [[package]] name = "substrate-peerset" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "libp2p 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4880,7 +4877,7 @@ dependencies = [ [[package]] name = "substrate-phragmen" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4889,7 +4886,7 @@ dependencies = [ [[package]] name = "substrate-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" 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)", @@ -4898,7 +4895,7 @@ dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "hash256-std-hasher 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "impl-serde 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libsecp256k1 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4927,9 +4924,9 @@ dependencies = [ [[package]] name = "substrate-primitives-storage" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ - "impl-serde 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-debug-derive 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4938,7 +4935,7 @@ dependencies = [ [[package]] name = "substrate-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4964,7 +4961,7 @@ dependencies = [ [[package]] name = "substrate-rpc-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4986,7 +4983,7 @@ dependencies = [ [[package]] name = "substrate-rpc-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4995,7 +4992,7 @@ dependencies = [ [[package]] name = "substrate-rpc-servers" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "jsonrpc-core 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-http-server 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5010,7 +5007,7 @@ dependencies = [ [[package]] name = "substrate-serializer" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5019,7 +5016,7 @@ dependencies = [ [[package]] name = "substrate-service" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5059,7 +5056,7 @@ dependencies = [ [[package]] name = "substrate-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -5070,7 +5067,7 @@ dependencies = [ [[package]] name = "substrate-state-db" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5081,7 +5078,7 @@ dependencies = [ [[package]] name = "substrate-state-machine" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" 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)", @@ -5100,7 +5097,7 @@ dependencies = [ [[package]] name = "substrate-telemetry" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" 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)", @@ -5122,7 +5119,7 @@ dependencies = [ [[package]] name = "substrate-transaction-graph" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5136,7 +5133,7 @@ dependencies = [ [[package]] name = "substrate-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5152,7 +5149,7 @@ dependencies = [ [[package]] name = "substrate-trie" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" 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)", @@ -5171,7 +5168,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "substrate-wasm-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#93123cc63eac37fed7a6cc6cc58e7e43d666ee03" dependencies = [ "wasmi 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5198,10 +5195,10 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5222,9 +5219,9 @@ name = "synstructure" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5746,9 +5743,9 @@ dependencies = [ "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "wasm-bindgen-shared 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5778,9 +5775,9 @@ name = "wasm-bindgen-macro-support" version = "0.2.51" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "wasm-bindgen-backend 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", "wasm-bindgen-shared 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5798,9 +5795,9 @@ dependencies = [ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "wasm-bindgen-backend 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", "weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -6177,8 +6174,8 @@ dependencies = [ "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" "checksum impl-codec 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3fa0086251524c50fd53b32e7b05eb6d79e2f97221eaf0c53c0ca9c3096f21d3" -"checksum impl-serde 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bbb1ea6188aca47a0eaeeb330d8a82f16cd500f30b897062d23922568727333a" -"checksum impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6947b372790f8948f439bb6aaa6baabdf80be1a207a477ff072f83fb793e428f" +"checksum impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "58e3cae7e99c7ff5a995da2cf78dd0a5383740eda71d98cf7b1910c301ac69b8" +"checksum impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d" "checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2" "checksum integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ea155abb3ba6f382a75f1418988c05fe82959ed9ce727de427f9cfd425b0c903" "checksum interleaved-ordered 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "141340095b15ed7491bd3d4ced9d20cebfb826174b6bb03386381f62b01e3d77" @@ -6313,7 +6310,7 @@ dependencies = [ "checksum proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097" "checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -"checksum proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "90cf5f418035b98e655e9cdb225047638296b862b42411c4e45bb88d700f7fc0" +"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" "checksum prost 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96d14b1c185652833d24aaad41c5832b0be5616a590227c1fbff57c616754b23" "checksum prost-build 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eb788126ea840817128183f8f603dce02cb7aea25c2a0b764359d8e20010702e" "checksum prost-derive 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5e7dc378b94ac374644181a2247cebf59a6ec1c88b49ac77f3a94b86b79d0e11" @@ -6489,7 +6486,7 @@ dependencies = [ "checksum subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" "checksum subtle 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab3af2eb31c42e8f0ccf43548232556c42737e01a96db6e1777b0be108e79799" "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf" +"checksum syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0e7bedb3320d0f3035594b0b723c8a28d7d336a3eda3881db79e61d676fb644c" "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" "checksum synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f085a5855930c0441ca1288cf044ea4aecf4f43a91668abdb870b4ba546a203" "checksum sysinfo 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d5bd3b813d94552a8033c650691645f8dd5a63d614dddd62428a95d3931ef7b6" diff --git a/cli/src/lib.rs b/cli/src/lib.rs index 8bbd38280e32..cf14c756d534 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -34,7 +34,7 @@ pub use service::{ }; pub use cli::{VersionInfo, IntoExit, NoCustom}; -pub use cli::error; +pub use cli::{display_role, error}; /// Abstraction over an executor that lets you spawn tasks in the background. pub type TaskExecutor = Arc + Send>> + Send + Sync>; @@ -98,7 +98,7 @@ pub fn run(worker: W, version: cli::VersionInfo) -> error::Result<()> where info!(" by {}, 2017-2019", version.author); info!("Chain specification: {}", config.chain_spec.name()); info!("Node name: {}", config.name); - info!("Roles: {:?}", config.roles); + info!("Roles: {}", display_role(&config)); config.custom = worker.configuration(); let runtime = Runtime::new().map_err(|e| format!("{:?}", e))?; match config.roles { diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 19502ea82cdf..5c0e16ccc1b5 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -40,15 +40,14 @@ use client::{ runtime_api as client_api, impl_runtime_apis, }; use sr_primitives::{ - create_runtime_str, generic, impl_opaque_keys, key_types, + create_runtime_str, generic, impl_opaque_keys, ApplyResult, Permill, Perbill, RuntimeDebug, transaction_validity::{TransactionValidity, InvalidTransaction, TransactionValidityError}, weights::{Weight, DispatchInfo}, curve::PiecewiseLinear, - traits::{BlakeTwo256, Block as BlockT, StaticLookup, SignedExtension}, + traits::{BlakeTwo256, Block as BlockT, StaticLookup, SignedExtension, OpaqueKeys}, }; use version::RuntimeVersion; use grandpa::{AuthorityId as GrandpaId, fg_primitives}; -use babe_primitives::{AuthorityId as BabeId}; #[cfg(any(feature = "std", test))] use version::NativeVersion; use substrate_primitives::OpaqueMetadata; @@ -256,27 +255,14 @@ parameter_types! { pub const Offset: BlockNumber = 0; } -// !!!!!!!!!!!!! -// WARNING!!!!!! SEE NOTE BELOW BEFORE TOUCHING THIS CODE -// !!!!!!!!!!!!! -type SessionHandlers = (Grandpa, Babe, ImOnline, Parachains); impl_opaque_keys! { pub struct SessionKeys { - #[id(key_types::GRANDPA)] - pub grandpa: GrandpaId, - #[id(key_types::BABE)] - pub babe: BabeId, - #[id(key_types::IM_ONLINE)] - pub im_online: ImOnlineId, - #[id(parachain::PARACHAIN_KEY_TYPE_ID)] - pub parachain_validator: parachain::ValidatorId, + pub grandpa: Grandpa, + pub babe: Babe, + pub im_online: ImOnline, + pub parachain_validator: Parachains, } } -// NOTE: `SessionHandler` and `SessionKeys` are co-dependent: One key will be used for each handler. -// The number and order of items in `SessionHandler` *MUST* be the same number and order of keys in -// `SessionKeys`. -// TODO: Introduce some structure to tie these together to make it a bit less of a footgun. This -// should be easy, since OneSessionHandler trait provides the `Key` as an associated type. #2858 parameter_types! { pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(17); @@ -284,7 +270,7 @@ parameter_types! { impl session::Trait for Runtime { type OnSessionEnding = Staking; - type SessionHandler = SessionHandlers; + type SessionHandler = ::KeyTypeIdProviders; type ShouldEndSession = Babe; type Event = Event; type Keys = SessionKeys; diff --git a/runtime/src/parachains.rs b/runtime/src/parachains.rs index 75514b7b07c8..7b06b13c8fbf 100644 --- a/runtime/src/parachains.rs +++ b/runtime/src/parachains.rs @@ -842,6 +842,10 @@ impl Module { */ } +impl sr_primitives::BoundToRuntimeAppPublic for Module { + type Public = ValidatorId; +} + impl session::OneSessionHandler for Module { type Key = ValidatorId; @@ -902,13 +906,14 @@ mod tests { use substrate_primitives::{H256, Blake2Hasher}; use substrate_trie::NodeCodec; use sr_primitives::{ - Perbill, + Perbill, curve::PiecewiseLinear, testing::{UintAuthorityId, Header}, traits::{BlakeTwo256, IdentityLookup, OnInitialize, OnFinalize}, - testing::{UintAuthorityId, Header}, - curve::PiecewiseLinear, }; use primitives::{ - parachain::{CandidateReceipt, HeadData, ValidityAttestation, ValidatorId, Info as ParaInfo, Scheduling}, + parachain::{ + CandidateReceipt, HeadData, ValidityAttestation, ValidatorId, Info as ParaInfo, + Scheduling, + }, BlockNumber, }; use crate::constants::time::*; @@ -940,6 +945,7 @@ mod tests { pub const MaximumBlockLength: u32 = 4 * 1024 * 1024; pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); } + impl system::Trait for Test { type Origin = Origin; type Call = Call; @@ -968,7 +974,7 @@ mod tests { type OnSessionEnding = (); type Keys = UintAuthorityId; type ShouldEndSession = session::PeriodicSessions; - type SessionHandler = (); + type SessionHandler = session::TestSessionHandler; type Event = (); type SelectInitialValidators = staking::Module; type ValidatorId = u64; diff --git a/runtime/src/registrar.rs b/runtime/src/registrar.rs index 97dd7e5e62cc..baa8bc02a04b 100644 --- a/runtime/src/registrar.rs +++ b/runtime/src/registrar.rs @@ -688,7 +688,7 @@ mod tests { type OnSessionEnding = (); type Keys = UintAuthorityId; type ShouldEndSession = session::PeriodicSessions; - type SessionHandler = (); + type SessionHandler = session::TestSessionHandler; type Event = (); type SelectInitialValidators = (); type ValidatorId = u64; diff --git a/service/src/lib.rs b/service/src/lib.rs index c0b459131e6d..451a046de392 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -150,6 +150,11 @@ pub fn new_full(config: Configuration) let disable_grandpa = config.disable_grandpa; let name = config.name.clone(); + // sentry nodes announce themselves as authorities to the network + // and should run the same protocols authorities do, but it should + // never actively participate in any consensus process. + let participates_in_consensus = is_authority && !config.sentry_mode; + let (builder, mut import_setup, inherent_data_providers) = new_full_start!(config); // Dht event channel from the network to the authority discovery module. Use @@ -204,7 +209,7 @@ pub fn new_full(config: Configuration) (is_known, client.clone()), ); - if is_authority { + if participates_in_consensus { let availability_store = { use std::path::PathBuf; @@ -264,7 +269,9 @@ pub fn new_full(config: Configuration) service.spawn_essential_task(babe); } - let keystore = if is_authority { + // if the node isn't actively participating in consensus then it doesn't + // need a keystore, regardless of which protocol we use below. + let keystore = if participates_in_consensus { Some(service.keystore()) } else { None @@ -275,7 +282,9 @@ pub fn new_full(config: Configuration) gossip_duration: Duration::from_millis(333), justification_period: 512, name: Some(name), + observer_enabled: false, keystore, + is_authority, }; let enable_grandpa = !disable_grandpa;